doc/产业数据模型及服务/养殖大户数据填报/养殖大户数据填报前端技术方案.md

@@ -0,0 +1,121 @@
+# 养殖大户数据填报 — 前端技术方案
+
+> 依据：同目录功能需求、技术方案；交互对齐家庭牧场村级填报；字段 **小驼峰**。
+
+---
+
+## 1. 页面与路由
+
+| 项 | 说明 |
+| --- | --- |
+| **Vue 路径** | `ruoyi-ui/src/views/dataModel/largeLivestockFarmer/index.vue` |
+| **组件名** | `LargeLivestockFarmer` |
+| **菜单配置** | 组件路径：`dataModel/largeLivestockFarmer/index` |
+| **权限前缀** | `dataModel:largeLivestockFarmer:list\|query\|add\|edit\|remove\|import\|export` |
+
+---
+
+## 2. API 模块
+
+| 项 | 说明 |
+| --- | --- |
+| **文件** | `ruoyi-ui/src/api/dataModel/largeLivestockFarmer.js` |
+| **Base** | `/dataModel/largeLivestockFarmer` |
+
+CRUD、`yearOptions` / `monthOptions` / `townOptions` / `villageTree`、导入 `importData`、模板 `importTemplate`、导出 `export`（可选 `townDeptId`）与家庭牧场模块同构；模板/导出均为 **GET + blob**。
+
+| 方法 | 路径 | 说明 |
+| --- | --- | --- |
+| `listLargeLivestockFarmer` | GET `/list` | 分页；筛选年、月、乡镇、企业名称 |
+| `getLargeLivestockFarmer` | GET `/{id}` | 详情 |
+| `addLargeLivestockFarmer` | POST `/` | 新增 |
+| `updateLargeLivestockFarmer` | PUT `/` | 修改 |
+| `delLargeLivestockFarmer` | DELETE `/{ids}` | 删除 |
+| `listLargeLivestockFarmerYearOptions` | GET `/yearOptions` | 年份下拉 |
+| `listLargeLivestockFarmerMonthOptions` | GET `/monthOptions` | 月份下拉 |
+| `listLargeLivestockFarmerTownOptions` | GET `/townOptions` | 乡镇下拉 |
+| `listLargeLivestockFarmerVillageTree` | GET `/villageTree` | 县→乡镇→村树 |
+| `importLargeLivestockFarmer` | POST `/importData` | FormData：`file` + `statYear` + `statMonth` |
+| `downloadLargeLivestockFarmerTemplate` | GET `/importTemplate` | 模板 blob |
+| `exportLargeLivestockFarmer` | GET `/export` | 参数：`statYear`、`statMonth`、可选 `townDeptId` |
+
+---
+
+## 3. 页面结构
+
+1. **筛选**：年、月、乡镇、企业名称（无村筛选，与需求一致）。  
+2. **列表**：年、月、乡镇、村、企业、法人、类型、注册资本、成立时间、牛存栏、牛出栏、草场面积（`grasslandAreaSubtotal`）、操作。  
+3. **新增/编辑**：选村（可搜索，标签「乡镇 / 村」）；企业类型默认「个体工商户」、销售渠道默认「其他」；成立时间 `el-date-picker`（`yyyy-MM-dd`）；补助资金年份 `type="year"`（`yyyy`）；派生字段只读展示。  
+4. **详情**：全部字段含派生 + 乡镇只读；数值用 `formatWithUnit` 带单位。  
+5. **导入**：选年月 → upsert 摘要（insert/update/fail）。  
+6. **导出**：选年月；所属乡镇与列表共用选项与文案，打开时带入列表当前乡镇，清空=全部。
+
+### 表单分区
+
+| 分区 | 内容 |
+| --- | --- |
+| 基本信息 | 年月、村、企业名称、法人、类型、注册资本、成立时间、劳力人数 |
+| 存栏与出栏 | 牛/羊存栏与能繁、牛/羊出栏；只读存栏小计 |
+| 草场与草畜平衡 | 草畜平衡面积、流转面积、核定载畜量、存栏绵羊单位；只读草场面积小计、是否草畜平衡户 |
+| 经营与补助 | 收入、支出、只读利润；补助年份/是否/金额 |
+| 其他 | 商标、质量认证、销售渠道、带动人数、工资、备注 |
+
+---
+
+## 4. 业务规则
+
+| 规则 | 实现 |
+| --- | --- |
+| 必填 | 年、月、村、企业名称 |
+| 提交 | 只传 `villageDeptId` 与录入项；乡镇与派生由后端计算 |
+| 前端只读派生 | 存栏小计、草场面积小计、利润、是否草畜平衡户（与后端公式一致，便于预览） |
+| 是/否 | `hasSubsidy` / `hasTrademark` / `hasQualityCert` 单选「是」「否」 |
+| 枚举 | 企业类型、销售渠道与后端 `LargeLivestockFarmerValidation` 一致 |
+| 不可未来月 | 表单 / 导入 / 导出校验 |
+| 草畜失衡预警 | 由后端写入 `biz_yak_disease_warning`；前端不单独处理 |
+
+### 枚举取值
+
+- **企业类型**：个体工商户 / 个人独资企业 / 有限责任公司 / 合伙企业 / 其他（默认个体工商户）  
+- **销售渠道**：其他 / 线上销售 / 线下集市 / 企事业单位 / 商超门店（默认其他）
+
+### 派生预览公式（与后端一致）
+
+- 存栏小计 = 牛年底存栏 + 羊年底存栏  
+- 草场面积小计 = 草畜平衡面积 + 流转经营草地面积  
+- 利润 = 收入 − 支出（任一侧为空则不展示）  
+- 是否草畜平衡户：核定载畜量 ≥ 年底存栏绵羊单位 →「是」，否则「否」（缺一侧则「—」）
+
+---
+
+## 5. 国际化
+
+`dataModel.largeLivestockFarmer`（`lang/zh|bo/dataModel.js`）；页面 `dmNs = 'largeLivestockFarmer'`，复用 `dataModelLocaleMixin`（`dmT` / `dmCommon` / `formatWithUnit`）。
+
+---
+
+## 6. 联调说明
+
+1. 执行 `sql/biz_large_livestock_farmer.sql`。  
+2. 菜单组件 `dataModel/largeLivestockFarmer/index`，权限见 §1。  
+3. 验证：默认类型/渠道、派生只读、导出乡镇带入列表筛选、草畜失衡写入疾病预警（后端）。
+
+---
+
+## 7. 文件清单
+
+| 类型 | 路径 |
+| --- | --- |
+| 页面 | `ruoyi-ui/src/views/dataModel/largeLivestockFarmer/index.vue` |
+| API | `ruoyi-ui/src/api/dataModel/largeLivestockFarmer.js` |
+| i18n | `lang/zh/dataModel.js`、`lang/bo/dataModel.js` → `largeLivestockFarmer` |
+| 前端技术方案 | 本文档 |
+
+---
+
+## 8. 修订记录
+
+| 版本 | 说明 |
+| --- | --- |
+| 1.0 | 初版：村×年月×企业；CRUD + 导入 upsert + 导出乡镇与列表联动；对齐家庭牧场前端交互 |
+| 1.1 | 与需求 1.1 一致：导出所属乡镇打开带入列表筛选、可清空表示全部 |

doc/产业数据模型及服务/养殖大户数据填报/养殖大户数据填报技术方案.md

@@ -43,7 +43,8 @@ Base Path：`/dataModel/largeLivestockFarmer`
 - 页面：`ruoyi-ui/src/views/dataModel/largeLivestockFarmer/index.vue`
 - API：`ruoyi-ui/src/api/dataModel/largeLivestockFarmer.js`
 - 菜单组件：`dataModel/largeLivestockFarmer/index`
-- 村选择：级联树（县→乡镇→村），仅选叶子村
+- i18n：`dataModel.largeLivestockFarmer`（详见同目录《养殖大户数据填报前端技术方案》）
+- 村选择：可搜索下拉（县→乡镇→村树展平），仅选叶子村
 - **导出弹窗所属乡镇**：
   - 与列表共用 `townOptions`、文案「所属乡镇」、占位「请选择」
   - 打开导出时带入列表当前 `queryParams.townDeptId`；清空则不传 `townDeptId`（导出全部乡镇）

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

@@ -0,0 +1,114 @@
+# 农牧户数据填报 — 前端技术方案
+
+> 依据：同目录功能需求、技术方案；交互对齐畜牧产品产量等村×年月填报；字段 **小驼峰**。
+
+---
+
+## 1. 页面与路由
+
+| 项 | 说明 |
+| --- | --- |
+| **Vue 路径** | `ruoyi-ui/src/views/dataModel/farmerHousehold/index.vue` |
+| **组件名** | `FarmerHousehold` |
+| **菜单配置** | 组件路径：`dataModel/farmerHousehold/index` |
+| **权限前缀** | `dataModel:farmerHousehold:list\|query\|add\|edit\|remove\|import\|export` |
+
+---
+
+## 2. API 模块
+
+| 项 | 说明 |
+| --- | --- |
+| **文件** | `ruoyi-ui/src/api/dataModel/farmerHousehold.js` |
+| **Base** | `/dataModel/farmerHousehold` |
+
+CRUD、`yearOptions` / `monthOptions` / `townOptions` / `villageTree`、导入 `importData`、模板 `importTemplate`、导出 `export`（可选 `townDeptId`）与同类村级填报模块同构；模板/导出均为 **GET + blob**。
+
+| 方法 | 路径 | 说明 |
+| --- | --- | --- |
+| `listFarmerHousehold` | GET `/list` | 分页；筛选年、月、乡镇 |
+| `getFarmerHousehold` | GET `/{id}` | 详情（含派生） |
+| `addFarmerHousehold` | POST `/` | 新增 |
+| `updateFarmerHousehold` | PUT `/` | 修改 |
+| `delFarmerHousehold` | DELETE `/{ids}` | 删除 |
+| `listFarmerHouseholdYearOptions` | GET `/yearOptions` | 年份下拉 |
+| `listFarmerHouseholdMonthOptions` | GET `/monthOptions` | 月份下拉 |
+| `listFarmerHouseholdTownOptions` | GET `/townOptions` | 乡镇下拉 |
+| `listFarmerHouseholdVillageTree` | GET `/villageTree` | 县→乡镇→村树 |
+| `importFarmerHousehold` | POST `/importData` | FormData：`file` + `statYear` + `statMonth` |
+| `downloadFarmerHouseholdTemplate` | GET `/importTemplate` | 模板 blob |
+| `exportFarmerHousehold` | GET `/export` | 参数：`statYear`、`statMonth`、可选 `townDeptId` |
+
+---
+
+## 3. 页面结构
+
+1. **筛选**：年、月、乡镇（与需求一致，无村筛选）。  
+2. **列表**：年、月、乡镇、村、农牧户数、农牧人数、草场承包总面积（`pastureContractArea`）、操作。  
+3. **新增/编辑**：选村（可搜索，标签「乡镇 / 村」）；新增默认本年本月；派生字段只读展示。  
+4. **详情**：与表单同分区标题；含派生只读值 + 乡镇；数值用 `formatWithUnit` 带单位。  
+5. **导入**：选年月 → upsert 摘要（insert/update/fail）；任一行失败整批不写（后端）。  
+6. **导出**：选年月；所属乡镇与列表共用选项，打开时带入列表当前乡镇，清空=全部。
+
+### 表单 / 查看分区
+
+| 分区 | 内容 |
+| --- | --- |
+| 基本信息 | 年月、村（查看含乡镇）；农牧户数、农牧人数 |
+| 草畜平衡情况 | 禁牧面积、草畜平衡面积；只读草场承包总面积（=禁牧+草畜平衡）；核定载畜量、年底存栏绵羊单位 |
+| 封顶保底情况 | 纯牧户 / 无畜户 / 绝户 / 超载 / 需封顶 / 需保底（是/否） |
+| 本年受助情况 | 禁牧补助、草畜平衡奖励；只读补助奖励总资金（=二者之和）；封顶保底后补助、村级监督员补助；只读补助合计金额（=封顶保底后+村级监督员）；备注 |
+
+---
+
+## 4. 业务规则
+
+| 规则 | 实现 |
+| --- | --- |
+| 唯一键 | 年 + 月 + 村（前端提交只传 `villageDeptId`；乡镇由后端反推） |
+| 必填 | 年、月、村 |
+| 前端只读派生 | 草场承包总面积、补助奖励总资金、补助合计金额（表单禁用预览；详情同公式） |
+| 是/否 | 六项封顶保底字段单选「是」「否」 |
+| 不可未来月 | 表单 / 导入 / 导出校验 |
+| 草畜失衡预警 | 后端写入 `biz_yak_disease_warning`（type=6）；前端不单独处理 |
+
+### 派生预览公式
+
+- 草场承包总面积 = 禁牧面积 + 草畜平衡面积  
+- 补助奖励总资金 = 禁牧补助 + 草畜平衡奖励  
+- 补助合计金额（前端展示）= 封顶保底后享受补助奖励总资金 + 村级草原监督员补助  
+
+> 说明：后端落库的 `subsidyTotal` 另含「补助奖励总资金」三项合计；前端「补助合计金额」按本次产品口径仅展示后两项之和。
+
+---
+
+## 5. 国际化
+
+`dataModel.farmerHousehold`（`lang/zh|bo/dataModel.js`）；页面 `dmNs = 'farmerHousehold'`，复用 `dataModelLocaleMixin`（`dmT` / `dmCommon` / `formatWithUnit`）。查看表单使用 `dm-view-form` 高亮。
+
+---
+
+## 6. 联调说明
+
+1. 执行 `sql/biz_farmer_household.sql`。  
+2. 菜单组件 `dataModel/farmerHousehold/index`，权限见 §1。  
+3. 验证：新增默认年月、表单无派生列、详情有派生、导出乡镇带入列表筛选、草畜失衡写入疾病预警（后端）。
+
+---
+
+## 7. 文件清单
+
+| 类型 | 路径 |
+| --- | --- |
+| 页面 | `ruoyi-ui/src/views/dataModel/farmerHousehold/index.vue` |
+| API | `ruoyi-ui/src/api/dataModel/farmerHousehold.js` |
+| i18n | `lang/zh/dataModel.js`、`lang/bo/dataModel.js` → `farmerHousehold` |
+| 前端技术方案 | 本文档 |
+
+---
+
+## 8. 修订记录
+
+| 版本 | 说明 |
+| --- | --- |
+| 1.0 | 初版：村×年月；CRUD + upsert 导入 + 导出乡镇与列表联动；表单不展示派生、详情展示；分区对齐其它产业填报页 |

doc/产业数据模型及服务/农牧户数据填报/农牧户数据填报技术方案.md

@@ -47,6 +47,7 @@ Base Path：`/dataModel/farmerHousehold`
 - 菜单组件：`dataModel/farmerHousehold/index`
 - 村选择：级联树（县→乡镇→村），仅选叶子村；提交只传 `villageDeptId`
 - 导出弹窗所属乡镇：与列表共用选项；打开时带入列表 `townDeptId`；清空则不传
+- 前端技术方案：同目录 `农牧户数据填报前端技术方案.md`
 
 ## 5. 主要类
 

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

@@ -53,7 +53,7 @@
 | 必填 | `statYear`、`ruralDisposableIncome`、`povertyNetIncome`（≥0） |
 | 增幅 / 增速表单 | **普通 `el-input`**（非 `el-input-number`），支持空值；提交空 → 不传/后端按 `null` 补齐 |
 | 改年份或人均可支配收入 | 编辑态清空增幅、增速输入，与后端 `recalculateGrowth` 一致 |
-| 列表 / 详情展示 | `formatIncrease`：`null` → `0.00`；`formatGrowthRate`：`null` → `0.00%`，有值则按小数×100 显示百分比 |
+| 列表 / 详情展示 | `formatIncrease`：`null` → `0.00`；`formatGrowthRate`：`null` → `0.00%`，有值则按库值直接 `toFixed(2)+%`（不再 ×100） |
 | 收入金额展示 | `formatMoney` → 两位小数；空值 `—` |
 | 唯一性 | 同年重复由后端拦截「该年份数据已存在」 |
 | 删除 | `$modal.confirm` 后物理删除 |
@@ -106,3 +106,4 @@
 | --- | --- |
 | 1.0 | 初版：县级年度 CRUD；增幅/增速选填；列表详情 null 显示为 0；无导入导出 |
 | 1.2 | 与需求对齐：改年份/可支配收入清空增幅增速；增速百分比展示 |
+| 1.3 | 增速展示不再 ×100，按库值直接显示 |

doc/产业数据模型及服务/疫苗接种数据填报/疫苗接种数据填报前端技术方案.md

@@ -0,0 +1,226 @@
+# 疫苗接种数据填报 — 前端技术方案
+
+
+
+> 依据：同目录功能需求、技术方案；交互对齐畜牧产品产量等村×年月填报；字段 **小驼峰**。
+
+
+
+---
+
+
+
+## 1. 页面与路由
+
+
+
+| 项 | 说明 |
+
+| --- | --- |
+
+| **Vue 路径** | `ruoyi-ui/src/views/dataModel/vaccinationData/index.vue` |
+
+| **组件名** | `VaccinationData` |
+
+| **菜单配置** | 组件路径：`dataModel/vaccinationData/index` |
+
+| **权限前缀** | `dataModel:vaccinationData:list\|query\|add\|edit\|remove\|import\|export` |
+
+
+
+---
+
+
+
+## 2. API 模块
+
+
+
+| 项 | 说明 |
+
+| --- | --- |
+
+| **文件** | `ruoyi-ui/src/api/dataModel/vaccinationData.js` |
+
+| **Base** | `/dataModel/vaccinationData` |
+
+
+
+CRUD、`yearOptions` / `monthOptions` / `townOptions` / `villageTree`、导入 `importData`、模板 `importTemplate`、导出 `export`（可选 `townDeptId`）与同类村级填报模块同构；模板/导出均为 **GET + blob**。
+
+
+
+| 方法 | 路径 | 说明 |
+
+| --- | --- | --- |
+
+| `listVaccinationData` | GET `/list` | 分页；筛选年、月、乡镇、村 |
+
+| `getVaccinationData` | GET `/{id}` | 详情（含免疫率） |
+
+| `addVaccinationData` | POST `/` | 新增 |
+
+| `updateVaccinationData` | PUT `/` | 修改 |
+
+| `delVaccinationData` | DELETE `/{ids}` | 删除 |
+
+| `listVaccinationDataYearOptions` | GET `/yearOptions` | 年份下拉 |
+
+| `listVaccinationDataMonthOptions` | GET `/monthOptions` | 月份下拉 |
+
+| `listVaccinationDataTownOptions` | GET `/townOptions` | 乡镇下拉 |
+
+| `listVaccinationDataVillageTree` | GET `/villageTree` | 县→乡镇→村树 |
+
+| `importVaccinationData` | POST `/importData` | FormData：`file` + `statYear` + `statMonth` |
+
+| `downloadVaccinationDataTemplate` | GET `/importTemplate` | 模板 blob |
+
+| `exportVaccinationData` | GET `/export` | 参数：`statYear`、`statMonth`、可选 `townDeptId` |
+
+
+
+---
+
+
+
+## 3. 页面结构
+
+
+
+1. **筛选**：年、月、乡镇、村（村为可搜索下拉，选项来自村树扁平化）。  
+
+2. **列表**：年、月、乡镇、村、应免数、实免数、免疫率（`xx.xx%`）、操作。  
+
+3. **新增/编辑**：选村（可搜索，标签「乡镇 / 村」）；新增默认本年本月；免疫率只读预览。  
+
+4. **详情**：与表单同分区；含乡镇与免疫率；数量用 `formatWithUnit` 带「头」。  
+
+5. **导入**：选年月 → upsert 摘要（insert/update/fail）；免疫率列由后端跳过；软警告弹窗展示。  
+
+6. **导出**：选年月；所属乡镇与列表共用选项，打开时带入列表当前乡镇，清空=全部。
+
+
+
+### 表单 / 查看分区
+
+
+
+| 分区 | 内容 |
+
+| --- | --- |
+
+| 基本信息 | 年月、村（查看含乡镇） |
+
+| 疫苗接种情况 | 应免数、实免数；只读免疫率；备注 |
+
+
+
+---
+
+
+
+## 4. 业务规则
+
+
+
+| 规则 | 实现 |
+
+| --- | --- |
+
+| 唯一键 | 年 + 月 + 村（前端提交只传 `villageDeptId`；乡镇由后端反推） |
+
+| 必填 | 年、月、村 |
+
+| 数量 | 应免数、实免数：可选；非负整数；单位「头」；实免数 ≤ 应免数（前端） |
+
+| 免疫率预览 | 应免数 > 0 且实免数非空时：`(实免/应免)×100`，保留 2 位小数，展示为 `98.33%`；否则「—」 |
+
+| 实免 > 应免 | 新增/编辑表单拦截；导入仍由后端软警告（不阻断） |
+
+| 不可未来月 | 表单 / 导入 / 导出校验 |
+
+
+
+### 免疫率公式（与后端 `VaccinationDataDerivedSupport` 对齐）
+
+
+
+```
+
+immunityRate = round((actualVaccinateCount * 10000) / shouldVaccinateCount) / 100
+
+```
+
+
+
+前端仅作表单预览；落库与列表/详情以接口返回的 `immunityRate` 为准。
+
+
+
+---
+
+
+
+## 5. 国际化
+
+
+
+`dataModel.vaccinationData`（`lang/zh|bo/dataModel.js`）；页面 `dmNs = 'vaccinationData'`，复用 `dataModelLocaleMixin`（`dmT` / `dmCommon` / `formatWithUnit`）。查看表单使用 `dm-view-form` 高亮。
+
+
+
+---
+
+
+
+## 6. 联调说明
+
+
+
+1. 执行 `sql/biz_vaccination_data.sql`。  
+
+2. 菜单组件 `dataModel/vaccinationData/index`，权限见 §1。  
+
+3. 验证：新增默认年月、免疫率只读预览与保存后一致、列表筛选村、导出乡镇带入列表筛选、实免>应免拦截、导入 upsert。
+
+
+
+---
+
+
+
+## 7. 文件清单
+
+
+
+| 类型 | 路径 |
+
+| --- | --- |
+
+| 页面 | `ruoyi-ui/src/views/dataModel/vaccinationData/index.vue` |
+
+| API | `ruoyi-ui/src/api/dataModel/vaccinationData.js` |
+
+| i18n | `lang/zh/dataModel.js`、`lang/bo/dataModel.js` → `vaccinationData` |
+
+| 前端技术方案 | 本文档 |
+
+
+
+---
+
+
+
+## 8. 修订记录
+
+
+
+| 版本 | 说明 |
+
+| --- | --- |
+
+| 1.0 | 初版：村×年月；CRUD + upsert 导入 + 导出乡镇与列表联动；免疫率前端预览 |
+| 1.1 | 实免数须 ≤ 应免数（仅前端表单校验） |
+
+

doc/产业数据模型及服务/疫苗接种数据填报/疫苗接种数据填报功能需求.md

@@ -18,6 +18,7 @@
 - 唯一键：所属年份 + 所属月份 + 所属村。
 - 导入：存在则更新、不存在则插入（不按年月先删后插）。
 - 派生（保存时计算并落库）：**免疫率 = (实免数 / 应免数) × 100**，保留 2 位小数（应免数 > 0 且实免数非空；如 98.33；界面/导出展示为 `98.33%`）。
+
 - **约束：实免数 ≤ 应免数**（两者均填写时；保存与导入均硬拦截，不允许超过）。
 
 ---
@@ -49,4 +50,8 @@
 | --- | --- |
 | 1.0 | 首版：CRUD + upsert 导入 + 导出 |
 | 1.1 | 免疫率改为 (实免数/应免数)×100，保留 2 位小数落库 |
+<<<<<<< HEAD
+| 1.2 | 页面填报约束实免数 ≤ 应免数（前端校验） |
+=======
 | 1.2 | 约束：实免数 ≤ 应免数（硬校验） |
+>>>>>>> ef65fad8763e393adf8cf1e918e4eec407e1b967

doc/产业数据模型及服务/疫苗接种数据填报/疫苗接种数据填报技术方案.md

@@ -56,6 +56,8 @@ Excel 列：0 序号、1 乡镇、2 村、3 应免数、4 实免数、5 免疫
 
 ## 5. 前端
 
+详见同目录 **[疫苗接种数据填报前端技术方案.md](./疫苗接种数据填报前端技术方案.md)**。
+
 - 页面：`ruoyi-ui/src/views/dataModel/vaccinationData/index.vue`
 - API：`ruoyi-ui/src/api/dataModel/vaccinationData.js`
 - i18n：`dataModel.vaccinationData`（zh/bo）

doc/产业数据模型及服务/疫苗接种数据填报/疫苗接种数据填报测试用例.md

@@ -10,6 +10,7 @@
 | VD-04 | 修改 | 改应免/实免 | 免疫率重算 |
 | VD-05 | 删除 | 删除一条 | 物理删除成功 |
 | VD-06 | 未来月 | 选未来年月保存 | 拒绝 |
+
 | VD-07 | 实免>应免 | 保存/导入 | 拒绝（硬校验） |
 | VD-08 | 下载模板 | 点下载模板 | 得到官方 xlsx |
 | VD-09 | 导入 upsert | 上传模板示例行，再导入同村改数 | 首次新增、再次更新 |

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

@@ -0,0 +1,120 @@
+import request from "@/utils/request"
+
+/** 分页列表 */
+export function listFarmerHousehold(query) {
+  return request({
+    url: "/dataModel/farmerHousehold/list",
+    method: "get",
+    params: query
+  })
+}
+
+/** 详情 */
+export function getFarmerHousehold(id) {
+  return request({
+    url: "/dataModel/farmerHousehold/" + id,
+    method: "get"
+  })
+}
+
+/** 新增 */
+export function addFarmerHousehold(data) {
+  return request({
+    url: "/dataModel/farmerHousehold",
+    method: "post",
+    data
+  })
+}
+
+/** 修改 */
+export function updateFarmerHousehold(data) {
+  return request({
+    url: "/dataModel/farmerHousehold",
+    method: "put",
+    data
+  })
+}
+
+/** 删除 */
+export function delFarmerHousehold(ids) {
+  return request({
+    url: "/dataModel/farmerHousehold/" + ids,
+    method: "delete"
+  })
+}
+
+/** 可选年份 */
+export function listFarmerHouseholdYearOptions() {
+  return request({
+    url: "/dataModel/farmerHousehold/yearOptions",
+    method: "get"
+  })
+}
+
+/** 可选月份（1～12） */
+export function listFarmerHouseholdMonthOptions() {
+  return request({
+    url: "/dataModel/farmerHousehold/monthOptions",
+    method: "get"
+  })
+}
+
+/** 乡镇下拉 */
+export function listFarmerHouseholdTownOptions() {
+  return request({
+    url: "/dataModel/farmerHousehold/townOptions",
+    method: "get"
+  })
+}
+
+/** 县→乡镇→村树 */
+export function listFarmerHouseholdVillageTree() {
+  return request({
+    url: "/dataModel/farmerHousehold/villageTree",
+    method: "get"
+  })
+}
+
+/** Excel 导入 */
+export function importFarmerHousehold(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/farmerHousehold/importData",
+    method: "post",
+    headers: {
+      repeatSubmit: false
+    },
+    data: formData
+  })
+}
+
+/** 下载导入模板（GET） */
+export function downloadFarmerHouseholdTemplate() {
+  return request({
+    url: "/dataModel/farmerHousehold/importTemplate",
+    method: "get",
+    responseType: "blob"
+  })
+}
+
+/**
+ * 按年月导出（GET）
+ * @param {number} statYear
+ * @param {number} statMonth
+ * @param {number} [townDeptId] 可选乡镇
+ */
+export function exportFarmerHousehold(statYear, statMonth, townDeptId) {
+  const params = { statYear, statMonth }
+  if (townDeptId != null && townDeptId !== "") {
+    params.townDeptId = townDeptId
+  }
+  return request({
+    url: "/dataModel/farmerHousehold/export",
+    method: "get",
+    params,
+    responseType: "blob"
+  })
+}

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

@@ -0,0 +1,120 @@
+import request from "@/utils/request"
+
+/** 分页列表 */
+export function listLargeLivestockFarmer(query) {
+  return request({
+    url: "/dataModel/largeLivestockFarmer/list",
+    method: "get",
+    params: query
+  })
+}
+
+/** 详情 */
+export function getLargeLivestockFarmer(id) {
+  return request({
+    url: "/dataModel/largeLivestockFarmer/" + id,
+    method: "get"
+  })
+}
+
+/** 新增 */
+export function addLargeLivestockFarmer(data) {
+  return request({
+    url: "/dataModel/largeLivestockFarmer",
+    method: "post",
+    data
+  })
+}
+
+/** 修改 */
+export function updateLargeLivestockFarmer(data) {
+  return request({
+    url: "/dataModel/largeLivestockFarmer",
+    method: "put",
+    data
+  })
+}
+
+/** 删除 */
+export function delLargeLivestockFarmer(ids) {
+  return request({
+    url: "/dataModel/largeLivestockFarmer/" + ids,
+    method: "delete"
+  })
+}
+
+/** 可选年份 */
+export function listLargeLivestockFarmerYearOptions() {
+  return request({
+    url: "/dataModel/largeLivestockFarmer/yearOptions",
+    method: "get"
+  })
+}
+
+/** 可选月份（1～12） */
+export function listLargeLivestockFarmerMonthOptions() {
+  return request({
+    url: "/dataModel/largeLivestockFarmer/monthOptions",
+    method: "get"
+  })
+}
+
+/** 乡镇下拉 */
+export function listLargeLivestockFarmerTownOptions() {
+  return request({
+    url: "/dataModel/largeLivestockFarmer/townOptions",
+    method: "get"
+  })
+}
+
+/** 县→乡镇→村树 */
+export function listLargeLivestockFarmerVillageTree() {
+  return request({
+    url: "/dataModel/largeLivestockFarmer/villageTree",
+    method: "get"
+  })
+}
+
+/** Excel 导入 */
+export function importLargeLivestockFarmer(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/largeLivestockFarmer/importData",
+    method: "post",
+    headers: {
+      repeatSubmit: false
+    },
+    data: formData
+  })
+}
+
+/** 下载导入模板（GET） */
+export function downloadLargeLivestockFarmerTemplate() {
+  return request({
+    url: "/dataModel/largeLivestockFarmer/importTemplate",
+    method: "get",
+    responseType: "blob"
+  })
+}
+
+/**
+ * 按年月导出（GET）
+ * @param {number} statYear
+ * @param {number} statMonth
+ * @param {number} [townDeptId] 可选乡镇
+ */
+export function exportLargeLivestockFarmer(statYear, statMonth, townDeptId) {
+  const params = { statYear, statMonth }
+  if (townDeptId != null && townDeptId !== "") {
+    params.townDeptId = townDeptId
+  }
+  return request({
+    url: "/dataModel/largeLivestockFarmer/export",
+    method: "get",
+    params,
+    responseType: "blob"
+  })
+}

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

@@ -0,0 +1,120 @@
+import request from "@/utils/request"
+
+/** 分页列表 */
+export function listVaccinationData(query) {
+  return request({
+    url: "/dataModel/vaccinationData/list",
+    method: "get",
+    params: query
+  })
+}
+
+/** 详情 */
+export function getVaccinationData(id) {
+  return request({
+    url: "/dataModel/vaccinationData/" + id,
+    method: "get"
+  })
+}
+
+/** 新增 */
+export function addVaccinationData(data) {
+  return request({
+    url: "/dataModel/vaccinationData",
+    method: "post",
+    data
+  })
+}
+
+/** 修改 */
+export function updateVaccinationData(data) {
+  return request({
+    url: "/dataModel/vaccinationData",
+    method: "put",
+    data
+  })
+}
+
+/** 删除 */
+export function delVaccinationData(ids) {
+  return request({
+    url: "/dataModel/vaccinationData/" + ids,
+    method: "delete"
+  })
+}
+
+/** 可选年份 */
+export function listVaccinationDataYearOptions() {
+  return request({
+    url: "/dataModel/vaccinationData/yearOptions",
+    method: "get"
+  })
+}
+
+/** 可选月份（1～12） */
+export function listVaccinationDataMonthOptions() {
+  return request({
+    url: "/dataModel/vaccinationData/monthOptions",
+    method: "get"
+  })
+}
+
+/** 乡镇下拉 */
+export function listVaccinationDataTownOptions() {
+  return request({
+    url: "/dataModel/vaccinationData/townOptions",
+    method: "get"
+  })
+}
+
+/** 县→乡镇→村树 */
+export function listVaccinationDataVillageTree() {
+  return request({
+    url: "/dataModel/vaccinationData/villageTree",
+    method: "get"
+  })
+}
+
+/** Excel 导入 */
+export function importVaccinationData(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/vaccinationData/importData",
+    method: "post",
+    headers: {
+      repeatSubmit: false
+    },
+    data: formData
+  })
+}
+
+/** 下载导入模板（GET） */
+export function downloadVaccinationDataTemplate() {
+  return request({
+    url: "/dataModel/vaccinationData/importTemplate",
+    method: "get",
+    responseType: "blob"
+  })
+}
+
+/**
+ * 按年月导出（GET）
+ * @param {number} statYear
+ * @param {number} statMonth
+ * @param {number} [townDeptId] 可选乡镇
+ */
+export function exportVaccinationData(statYear, statMonth, townDeptId) {
+  const params = { statYear, statMonth }
+  if (townDeptId != null && townDeptId !== "") {
+    params.townDeptId = townDeptId
+  }
+  return request({
+    url: "/dataModel/vaccinationData/export",
+    method: "get",
+    params,
+    responseType: "blob"
+  })
+}

ruoyi-ui/src/assets/styles/data-model.scss

@@ -0,0 +1,7 @@
+/* 产业数据模型填报 — 查看弹框值高亮（Element 主题色） */
+.dm-view-form {
+  .el-form-item__content {
+    color: #409EFF;
+    font-weight: 500;
+  }
+}

ruoyi-ui/src/assets/styles/index.scss

@@ -4,6 +4,7 @@
 @import './element-ui.scss';
 @import './sidebar.scss';
 @import './btn.scss';
+@import './data-model.scss';
 
 body {
   height: 100%;

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

@@ -43,7 +43,9 @@ export default {
     viewOfflineTime: "འོག་ཏུ་བཀག་དུས་ཚོད།",
     ruleLen120: "ལས་གོང་མིང་1-20",
     ruleLen150: "1-50ཡིག",
+    ruleLen50Optional: "ཡིག་ཆ་50ལས་མི་ཆོག",
     ruleLen1500: "1-500ཡིག",
+    ruleLen500Optional: "ཡིག་ཆ་500ལས་མི་ཆོག",
     ruleImplEndBeforeStart: "མཇུག་ཚེས་འགོ་ཚེས་ལས་སྔ་མི་ཆོག",
     ruleRateRange: "འབྲི་ལུང་0-1",
     ruleNonNegativeInteger: "ཡིག་གྲངས་མི་ཆག",
@@ -66,40 +68,40 @@ export default {
     queryProjectName: "ལས་གོང་མིང་།",
     queryProjectNamePh: "མིང་ནས་འཚོལ།",
     queryProjectType: "ལས་གོང་རིགས།",
+    queryImplYear: "ལག་བསྟར་ལོ།",
     queryPublishStatus: "ཁྱབ་བསྒྲགས་གནས་བབ།",
     colProjectName: "ལས་གོང་མིང་།",
     colProjectType: "ལས་གོང་རིགས།",
     colIntro: "མདོར་བརྗོད།",
-    colImplDate: "ལག་བསྟར་ཚེས་གྲངས།",
+    colImplYear: "ལག་བསྟར་ལོ།",
     colOpImageCount: "ལས་གཉེར་པར།",
     colCover: "ཁ་བརྒྱབ།",
-    colContent: "ནང་དོན།",
+    colContent: "འཛུགས་སྐྲུན་རྒྱ་ཁྱོན་དང་ནང་དོན།",
     colVideo: "ལས་གཉེར་བརྙན།",
     formProjectName: "ལས་གོང་མིང་།",
     formProjectType: "ལས་གོང་རིགས།",
     formIntro: "མདོར་བརྗོད།",
-    formContent: "ནང་དོན།",
-    formImplDate: "ལག་བསྟར་ཚེས་གྲངས།",
-    implRangeSeparator: "ནས",
-    implRangeStartPh: "འགོ་ཚེས།",
-    implRangeEndPh: "མཇུག་ཚེས།",
+    formContent: "འཛུགས་སྐྲུན་རྒྱ་ཁྱོན་དང་ནང་དོན།",
+    formInvestmentAmount: "མ་དངུལ་གྲངས།",
+    formImplYear: "ལག་བསྟར་ལོ།",
+    formImplStatus: "ལག་བསྟར་གནས་ཚུལ།",
     formOpImages: "ལས་གཉེར་པར།",
     formVideo: "ལས་གཉེར་བརྙན།",
     formCover: "ཁ་བརྒྱབ།",
     phProjectName: "ལས་གོང་མིང་འབྲི་རོགས།",
-    phIntro: "མདོར་བརྗོད་འབྲི་རོགས།",
-    phContent: "ནང་དོན་འབྲི་རོགས།",
+    phIntro: "འདེམས་འབྲི，ཡིག་ཆ་50ལས་མི་ཆོག",
+    phContent: "འཛུགས་སྐྲུན་རྒྱ་ཁྱོན་དང་ནང་དོན་འབྲི་རོགས།",
+    phImplStatus: "འདེམས་འབྲི，ཡིག་ཆ་500ལས་མི་ཆོག",
     ruleProjectNameRequired: "ལས་གོང་མིང་འབྲི་རོགས།",
     ruleProjectTypeRequired: "རིགས་འདེམས་རོགས།",
-    ruleIntroRequired: "མདོར་བརྗོད་འབྲི་རོགས།",
-    ruleContentRequired: "ནང་དོན་འབྲི་རོགས།",
-    ruleImplDateRequired: "ལག་བསྟར་ཚེས་གྲངས་འདེམས་རོགས།",
+    ruleContentRequired: "འཛུགས་སྐྲུན་རྒྱ་ཁྱོན་དང་ནང་དོན་འབྲི་རོགས།",
+    ruleImplYearRequired: "ལག་བསྟར་ལོ་འདེམས་རོགས།",
     ruleOpImagesRequired: "ལས་གཉེར་པར་1འཇུག་རོགས།",
     dialogAdd: "[གསར་སྣོན]མཉམ་སྤྱི་འཕྲོག་པ།",
     dialogEdit: "[རྩོམ་སྒྲིག]མཉམ་སྤྱི་འཕྲོག་པ།",
-    type1: "མཉམ་ལས་གཉེར་འགྲོ།",
-    type2: "ཞིང་ལས་ཡུལ་སྤྱོད།",
-    type3: "རྟེན་འཛིན་ཞིང་ལས།",
+    type1: "མཛེས་སྡུག་གྲོང་གསེབ་འཛུགས་སྐྲུན་ལས་གཞི།",
+    type2: "མི་སྡོད་ཁོར་ཡུག་བཟོ་བཅོས་ཡར་རྒྱས་ལས་གཞི།",
+    type3: "གཞན་ལས་གཞི་མ་དངུལ།",
     confirmDelete: "ཐོ་གཞུང་འདི་སུབ་རྒྱུ་གཏན་ཁེལ་ལམ？",
     confirmPublish: "ཁྱབ་བསྒྲགས་བྱེད་དམ།ཁྱབ་བསྒྲགས་རྗེས་བཟོ་བཅོས་མི་ཆོག",
     confirmOffline: "འོག་ཏུ་བཀག་བྱེད་དམ།བཟོ་བཅོས་བསྐྱར་དུ་ཆོག",

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

@@ -286,9 +286,13 @@ export default {
     statMonthLabel: "{month}ཟླ།",
     colVillageCount: "གྲོང་ཚོ་གྲངས།",
     colHerdsmanHouseholdCount: "འབྲོག་ཁྱིམ་གྲངས།",
-    colYakTotal: "གནས་ཚད་གྲངས།",
-    colBullTotal: "གླང་གནས་ཚད།",
-    colCowTotal: "བ་མོ་གནས་ཚད།",
+    colBullTotal: "གླང་སྤྱི་གནས་ཚད།",
+    colCowTotal: "བ་མོ་སྤྱི་གནས་ཚད།",
+    colDairyTotal: "འོ་མ་བཞོ་བ་སྤྱི་གནས་ཚད།",
+    colSheepTotal: "ལུག་སྤྱི་གནས་ཚད།",
+    colInsuredYakCount: "འགན་བཅོལ་གཡག་གནས་ཚད།",
+    colYakTotal: "གཡག་སྤྱི་གནས་ཚད།",
+    colGrandTotal: "སྤྱི་གནས་ཚད།",
     formStatYear: "གཏོགས་ལོ།",
     formStatMonth: "གཏོགས་ཟླ།",
     formTown: "ཤང་གྲོང།",
@@ -297,22 +301,28 @@ export default {
     formHerdsmanHouseholdCount: "འབྲོག་ཁྱིམ་གྲངས།",
     formBreedingBullCount: "ས་བོན་གླང་གནས་ཚད།",
     formBullCastratedCount: "གླང་/རླིག་ཕྱུགས་གནས་ཚད།",
-    formCowYoungCount: "ལོ་0～1.5 ཕྲུ་གུ་གནས་ཚད།",
-    formCowAdultCount: "ལོ་1.5་ཡན་དར་ཕྱུགས་གནས་ཚད།",
+    formCowYoungCount: "ལོ་0～1.5 ཕྲུ་གུ（1.5མི་ཚུད）གནས་ཚད།",
+    formCowAdultCount: "ལོ་1.5་ཡན་དར་ཕྱུགས（1.5ཚུད）གནས་ཚད།",
     formMilkingCowCount: "འོ་མ་བཞོ་བ་མོ་གནས་ཚད།",
     formFertileCowCount: "འཕེལ་ནུས་བ་མོ་གནས་ཚད།",
     formSheepTotal: "ལུག་སྤྱི་གནས་ཚད།",
     formMilkingSheepCount: "འོ་མ་བཞོ་ལུག་གནས་ཚད།",
     formInsuredYakCount: "འགན་བཅོལ་གཡག་གནས་ཚད།",
-    formBullTotal: "གླང་བསྡོམས།",
-    formCowTotal: "བ་མོ་བསྡོམས།",
-    formDairyTotal: "འོ་མ་བཞོ་བ་བསྡོམས།",
+    formBullTotal: "གླང་སྤྱི་གནས་ཚད།",
+    formCowTotal: "བ་མོ་སྤྱི་གནས་ཚད།",
+    formDairyTotal: "འོ་མ་བཞོ་བ་སྤྱི་གནས་ཚད།",
     formYakTotal: "གཡག་སྤྱི་གནས་ཚད།",
-    formGrandTotal: "སྤྱི་བསྡོམས།",
+    formGrandTotal: "སྤྱི་གནས་ཚད།",
     formYakSheepTotal: "སྤྱི་ཚད（གཡག+ལུག）",
     formRemark: "ཟིན་བྲིས།",
     phRemark: "འདེམས་འབྲི，ཡིག་ཆ་500ལས་མི་ཆོག",
     sectionBasic: "གཞི་རྩའི་གནས་ཚུལ།",
+    sectionFarmer: "ཞིང་འབྲོག་ཁྱིམ་གནས་ཚུལ།",
+    sectionBull: "གླང་གནས་ཚད་གནས་ཚུལ།",
+    sectionCow: "བ་མོ་གནས་ཚད་གནས་ཚུལ།",
+    sectionDairy: "འོ་མ་བཞོ་བ་གནས་ཚད་གནས་ཚུལ།",
+    sectionSheep: "ལུག་གནས་ཚད་གནས་ཚུལ།",
+    sectionSummary: "བསྡོམས་རྩིས།",
     sectionInventory: "གནས་ཚད་དཔྱད་གཞི།",
     btnImport: "ནང་འདྲེན།",
     btnDownloadTemplate: "དཔེ་ཡིག་ཕབ་ལེན།",
@@ -392,7 +402,7 @@ export default {
     phRemark: "འདེམས་འབྲི，ཡིག་ཆ་500ལས་མི་ཆོག",
     sectionBasic: "གཞི་རྩའི་གནས་ཚུལ།",
     sectionFarmer: "ཞིང་འབྲོག་ཁྱིམ་གནས་ཚུལ།",
-    sectionOutbound: "ཕྱིར་ཐོན་གནས་ཚུལ།",
+    sectionOutbound: "ཕྱུགས་ཕྱིར་ཐོན་གནས་ཚུལ།",
     sectionSelfConsumption: "རང་ཟ་གནས་ཚུལ།",
     btnImport: "ནང་འདྲེན།",
     btnDownloadTemplate: "དཔེ་ཡིག་ཕབ་ལེན།",
@@ -427,6 +437,7 @@ export default {
     unitHead: "ཨ།",
     unitSheep: "ཐོག",
     unitHorse: "རྟ།",
+    unitHeadSheepHorse: "ཨ་ཐོག་རྟ།",
     ruleStatYearRequired: "གཏོགས་ལོ་འདེམས་རོགས།",
     ruleStatMonthRequired: "གཏོགས་ཟླ་འདེམས་རོགས།",
     ruleStatMonthFuture: "མ་འོངས་ཟླ་འབྲི་མི་ཆོག",
@@ -467,12 +478,12 @@ export default {
     formEstablishDate: "འཛུགས་དུས།",
     formRegisteredCapital: "ཐོ་འགོད་མ་རྩ།",
     formYearEndTotalAssets: "ལོ་མཇུག་རྒྱུ་ནོར་སྤྱི།",
-    formMemberHouseholdCount: "ཞུགས་ཁྱིམ་གྲངས།",
-    formMemberPopulationCount: "ཞུགས་མི་གྲངས།",
-    formPovertyMonitorCount: "དབུལ་ལོག་སྔོན་འགོག་ལྟ་ཞིབ་མི་གྲངས།",
+    formMemberHouseholdCount: "ཁྱིམ་གྲངས།",
+    formMemberPopulationCount: "མི་གྲངས།",
+    formPovertyMonitorCount: "དབུལ་ལོག་སྔོན་འགོག་ལྟ་ཞིབ།",
     formCattleShareCount: "གླང་ཤ་སྒོར་གྲངས།",
     formSheepShareCount: "ལུག་ཤ་སྒོར་གྲངས།",
-    formLivestockShareTotal: "ཕྱུགས་ཤ་སྒོར་ཆུང་བསྡོམས།",
+    formLivestockShareTotal: "ཕྱུགས་ཤ་སྒོར་སྤྱི་གྲངས།",
     formGrasslandShareArea: "རྩྭ་ཐང་ཤ་སྒོར།",
     formLaborShareCount: "ངལ་རྩོལ་ཤ་སྒོར།",
     formCashShareAmount: "དངུལ་ཤ་སྒོར།",
@@ -487,25 +498,29 @@ export default {
     formCollegeGraduateWage: "སློབ་ཆེན་གླ་ཕོགས་ཡོང་འབབ།",
     formFarmerTransferEmploymentCount: "ཞིང་འབྲོག་པ་ལས་གནས་སྤོ།",
     formFarmerTransferWage: "ཞིང་འབྲོག་པ་གླ་ཕོགས་ཡོང་འབབ།",
-    formCattleInventoryCount: "གླང་གནས་ཚད།",
-    formCattleOutboundCount: "གླང་ཕྱིར་ཐོན།",
-    formSheepInventoryCount: "ལུག་གནས་ཚད།",
-    formSheepOutboundCount: "ལུག་ཕྱིར་ཐོན།",
+    formCattleInventoryCount: "གླང་གནས་ཚད་གྲངས།",
+    formCattleOutboundCount: "གླང་ཕྱིར་ཐོན་གྲངས།",
+    formSheepInventoryCount: "ལུག་གནས་ཚད་གྲངས།",
+    formSheepOutboundCount: "ལུག་ཕྱིར་ཐོན་གྲངས།",
     formTrademarkProductCount: "ཐོ་འགོད་ཐོབ་རྟགས་ཐོན་རྫས་གྲངས།",
     formQualityCertProductCount: "སྤུས་ཚད་ངོས་འཛིན་ཐོན་རྫས་གྲངས།",
-    formTrainingManageCount: "སློབ་སྦྱོང-དོ་དམ་ནུས་པ།",
-    formTrainingSkillCount: "སློབ་སྦྱོང-ཆེད་ལས་ལག་རྩལ།",
-    formTrainingOtherCount: "སློབ་སྦྱོང-གཞན།",
+    formTrainingManageCount: "དོ་དམ་ནུས་པ།",
+    formTrainingSkillCount: "ཆེད་ལས་ལག་རྩལ།",
+    formTrainingOtherCount: "གཞན།",
     formBusinessScope: "གཙོ་བོ་ཚོང་གཉེར་ཁྱབ་ཁོངས།",
     formBusinessModel: "ཚོང་གཉེར་རྣམ་པ།",
-    formOperationStatus: "འཁོར་སྐྱོད་གནས་ཚུལ།",
+    formOperationStatus: "མཉམ་ལས་ཁང་འཁོར་སྐྱོད་གནས་ཚུལ།",
     formRemark: "ཟིན་བྲིས།",
     sectionBasic: "གཞི་རྩའི་གནས་ཚུལ།",
-    sectionMemberShare: "ཞུགས་པ་དང་ཤ་སྒོར།",
-    sectionBenefit: "ཕན་འབྲས་གནས་ཚུལ།",
-    sectionEmploymentLivestock: "ལས་ཞུགས་དང་གནས་ཕྱིར་ཐོན།",
-    sectionProductTraining: "ཐོན་རྫས་ངོས་འཛིན་དང་སློབ་སྦྱོང།",
-    sectionOperation: "ཚོང་གཉེར་གནས་ཚུལ།",
+    sectionCooperativeInfo: "མཉམ་ལས་ཁང་གནས་ཚུལ།",
+    sectionMemberShare: "ཞིང་འབྲོག་པ་ཞུགས་གནས་ཚུལ།",
+    sectionBenefit: "ལོ་རེའི་ཕན་འབྲས་འདོན་སྤེལ་གནས་ཚུལ།",
+    sectionEmployment: "མཉམ་ལས་ཁང་ཁྱབ་ཁོངས་ལས་ཞུགས་བསྡུ་གནས་ཚུལ།",
+    sectionLivestockInout: "མཉམ་ལས་ཁང་ཕྱུགས་གནས་ཕྱིར་ཐོན་གནས་ཚུལ།",
+    sectionProductCert: "ཐོན་རྫས་ངོས་འཛིན་གནས་ཚུལ།",
+    sectionTraining: "མཉམ་ལས་ཁང་ཁོངས་མི་སློབ་སྦྱོང་གནས་ཚུལ།",
+    sectionOperation: "མཉམ་ལས་ཁང་ཚོང་གཉེར་ཁྱབ་ཁོངས་དང་རྣམ་པ།",
+    sectionOperationStatus: "མཉམ་ལས་ཁང་འཁོར་སྐྱོད་གནས་ཚུལ།",
     btnImport: "ནང་འདྲེན།",
     btnChooseFile: "ཡིག་ཆ་འདེམས།",
     btnDownloadTemplate: "དཔེ་ཡིག་ཕབ་ལེན།",
@@ -538,6 +553,7 @@ export default {
     unitHousehold: "ཁྱིམ།",
     unitPerson: "མི།",
     unitHead: "ཨ།",
+    unitHeadSheepHorse: "ཨ་ཐོག་རྟ།",
     unitGe: "གྲངས།",
     unitWanYuan: "ཁྲི་སྒོར།",
     unitWanMu: "ཁྲི་མུ།",
@@ -561,11 +577,13 @@ export default {
     colIncomeGrowthRate: "འཕེལ་མྱུར།",
     colPovertyNetIncome: "དབུལ་སྐྱོབ་མི་མང་མི་རེའི་དག་ཡོང་།",
     formStatYear: "གཏོགས་ལོ།",
-    formRuralDisposableIncome: "གྲོང་གསེབ་མི་དམངས་མི་རེའི་སྤྱོད་ཆོག་ཡོང་འབབ།",
+    formRuralDisposableIncome: "མི་རེའི་སྤྱོད་ཆོག་ཡོང་འབབ།",
     formIncomeIncrease: "འཕར་ཚད།",
     formIncomeGrowthRate: "འཕེལ་མྱུར།",
-    formPovertyNetIncome: "དབུལ་སྐྱོབ་མི་མང་མི་རེའི་དག་ཡོང་།",
+    formPovertyNetIncome: "མི་རེའི་དག་ཡོང་།",
     formRemark: "ཟིན་བྲིས།",
+    sectionRuralResident: "གྲོང་གསེབ་མི་དམངས།",
+    sectionPovertyPopulation: "དབུལ་སྐྱོབ་མི་མང་།",
     phIncomeIncrease: "འདེམས་འབྲི，སྒོར；མ་འབྲི་ན་སྔོན་ལོ་ལྟར་རང་རྩིས།",
     phIncomeGrowthRate: "འདེམས་འབྲི，ཆ་ཤས་དཔེར་ན་ 0.1228；མ་འབྲི་ན་རང་རྩིས།",
     phRemark: "འདེམས་འབྲི，ཡིག་ཆ་500ལས་མི་ཆོག",
@@ -574,9 +592,10 @@ export default {
     confirmDelete: "ཐོ་གཞུང་འདི་སུབ་རྒྱུ་གཏན་ཁེལ་ལམ？",
     emptyList: "འབྲི་གཞི་གྲངས་མེད།",
     unitYuan: "སྒོར།",
+    unitPercent: "%",
     ruleStatYearRequired: "གཏོགས་ལོ་འདེམས་རོགས།",
-    ruleRuralIncomeRequired: "གྲོང་གསེབ་མི་དམངས་མི་རེའི་སྤྱོད་ཆོག་ཡོང་འབབ་འབྲི་རོགས།",
-    rulePovertyIncomeRequired: "དབུལ་སྐྱོབ་མི་མང་མི་རེའི་དག་ཡོང་འབྲི་རོགས།",
+    ruleRuralIncomeRequired: "མི་རེའི་སྤྱོད་ཆོག་ཡོང་འབབ་འབྲི་རོགས།",
+    rulePovertyIncomeRequired: "མི་རེའི་དག་ཡོང་འབྲི་རོགས།",
     ruleMoneyNonNegative: "0་ཡན་གྱི་གྲངས་དགོས།",
     ruleNumberInvalid: "ནུས་ལྡན་གྲངས་འབྲི་རོགས།"
   },
@@ -601,6 +620,8 @@ export default {
     formMeatOutput: "ཤ་ཐོན་ཚད།",
     formMilkOutput: "འོ་མ་ཐོན་ཚད།",
     formRemark: "ཟིན་བྲིས།",
+    sectionBasic: "གཞི་རྩའི་གནས་ཚུལ།",
+    sectionOutput: "ཕྱུགས་ལས་ཐོན་རྫས་ཐོན་ཚད་གནས་ཚུལ།",
     btnImport: "ནང་འདྲེན།",
     btnDownloadTemplate: "དཔེ་ཡིག་ཕབ་ལེན།",
     exportTitle: "Excel ཕྱིར་འདྲེན།",
@@ -655,8 +676,8 @@ export default {
     colEnterpriseType: "ཁེ་ལས་རིགས།",
     colRegisteredCapital: "ཐོ་འགོད་མ་རྩ།",
     colEstablishDate: "འཛུགས་དུས།",
-    colCattleYearEndStock: "གླང་གནས་ཚད།",
-    colCattleOutbound: "གླང་ཕྱིར་ཐོན།",
+    colCattleYearEndStock: "ལོ་མཇུག་གླང་གནས་ཚད་གྲངས།",
+    colCattleOutbound: "ལོ་མཇུག་གླང་ཕྱིར་ཐོན་གྲངས།",
     colGrasslandArea: "རྩྭ་ཐང་རྒྱ་ཁྱོན།",
     formStatYear: "གཏོགས་ལོ།",
     formStatMonth: "གཏོགས་ཟླ།",
@@ -667,14 +688,15 @@ export default {
     formEnterpriseType: "ཁེ་ལས་རིགས།",
     formRegisteredCapital: "ཐོ་འགོད་མ་རྩ།",
     formEstablishDate: "འཛུགས་དུས།",
-    formLivestockLaborCount: "ཕྱུགས་ལས་ངལ་རྩོལ་མི་སྣ།",
-    formCattleYearEndStock: "གླང་ལོ་མཇུག་གནས་ཚད།",
-    formCattleBreedingFemaleStock: "གླང་འཕེལ་ནུས་མོ་ཕྱུགས།",
-    formSheepYearEndStock: "ལུག་ལོ་མཇུག་གནས་ཚད།",
-    formSheepBreedingFemaleStock: "ལུག་འཕེལ་ནུས་མོ་ཕྱུགས།",
-    formCattleOutbound: "གླང་ཕྱིར་ཐོན།",
-    formSheepOutbound: "ལུག་ཕྱིར་ཐོན།",
-    formStockSubtotal: "ལོ་མཇུག་ཕྱུགས་གནས་ཚད་ཆུང་བསྡོམས།",
+    formLivestockLaborCount: "ཕྱུགས་ལས་ཐོན་སྐྱེད་ཚོང་གཉེར་ངལ་རྩོལ་མི་སྣ།",
+    formCattleYearEndStock: "ལོ་མཇུག་གླང་གནས་ཚད་གྲངས།",
+    formCattleBreedingFemaleStock: "ལོ་མཇུག་འཕེལ་ནུས་མོ་གླང་གནས་ཚད་གྲངས།",
+    formSheepYearEndStock: "ལོ་མཇུག་ལུག་གནས་ཚད་གྲངས།",
+    formSheepBreedingFemaleStock: "ལོ་མཇུག་འཕེལ་ནུས་མོ་ལུག་གནས་ཚད་གྲངས།",
+    formCattleOutbound: "ལོ་མཇུག་གླང་ཕྱིར་ཐོན་གྲངས།",
+    formSheepOutbound: "ལོ་མཇུག་ལུག་ཕྱིར་ཐོན་གྲངས།",
+    formStockSubtotal: "ལོ་མཇུག་ཕྱུགས་གནས་ཚད་སྤྱི་གྲངས།",
+    formOutboundSubtotal: "ལོ་མཇུག་ཕྱུགས་ཕྱིར་ཐོན་སྤྱི་གྲངས།",
     formGrassBalanceArea: "རྩྭ་ཕྱུགས་སྙོམས་རྒྱ་ཁྱོན།",
     formTransferGrassArea: "བརྗེ་སྤོ་ཚོང་གཉེར་རྩྭ་ས་རྒྱ་ཁྱོན།",
     formGrasslandAreaSubtotal: "རྩྭ་ཐང་རྒྱ་ཁྱོན་ཆུང་བསྡོམས།",
@@ -684,7 +706,7 @@ export default {
     formIncome: "ལོ་རེའི་ཚོང་གཉེར་ཡོང་འབབ་སྤྱི།",
     formExpense: "ལོ་རེའི་ཚོང་གཉེར་འགྲོ་སོང་སྤྱི།",
     formProfit: "ཁེ་བཟང་།",
-    formSubsidyYear: "རོགས་དངུལ་ལོ།",
+    formSubsidyYear: "རོགས་ཐོབ་ལོ།",
     formHasSubsidy: "རོགས་དངུལ་ཐོབ་ཡོད་དམ།",
     formSubsidyAmount: "རོགས་དངུལ།",
     formHasTrademark: "ཐོ་འགོད་ཐོབ་རྟགས་ཡོད་དམ།",
@@ -694,10 +716,13 @@ export default {
     formWagePaid: "གླ་ཕོགས་སྤྲོད།",
     formRemark: "ཟིན་བྲིས།",
     sectionBasic: "གཞི་རྩའི་གནས་ཚུལ།",
-    sectionStock: "གནས་ཚད་དང་ཕྱིར་ཐོན།",
-    sectionGrassland: "རྩྭ་ཐང་དང་རྩྭ་ཕྱུགས་སྙོམས།",
-    sectionFinance: "ཚོང་གཉེར་དང་རོགས་དངུལ།",
-    sectionOther: "གཞན།",
+    sectionRanchInfo: "ཁྱིམ་ཚང་འབྲོག་ར་གནས་ཚུལ།",
+    sectionStock: "ལོ་མཇུག་ཕྱུགས་གནས་ཚད་གནས་ཚུལ།",
+    sectionOutbound: "ལོ་མཇུག་ཕྱུགས་ཕྱིར་ཐོན་གནས་ཚུལ།",
+    sectionGrassland: "རྩྭ་ཕྱུགས་སྙོམས་གནས་ཚུལ།",
+    sectionFinance: "ལོ་རེའི་ཚོང་གཉེར་ཡོང་འབབ་སྤྱི།",
+    sectionSubsidy: "ཁྱིམ་ཚང་འབྲོག་ར་རོགས་དངུལ་ཐོབ་གནས་ཚུལ།",
+    sectionOther: "ཁྱིམ་ཚང་འབྲོག་ར་འཁོར་སྐྱོད་གནས་ཚུལ།",
     btnImport: "ནང་འདྲེན།",
     btnDownloadTemplate: "དཔེ་ཡིག་ཕབ་ལེན།",
     exportTitle: "Excel ཕྱིར་འདྲེན།",
@@ -726,6 +751,7 @@ export default {
     emptyList: "འབྲི་གཞི་གྲངས་མེད།",
     unitPerson: "མི།",
     unitHead: "ཨ།",
+    unitHeadSheepHorse: "ཨ་ཐོག་རྟ།",
     unitMu: "མུ།",
     unitWanYuan: "ཁྲི་སྒོར།",
     unitSheepUnit: "ལུག་རིམ།",
@@ -739,5 +765,256 @@ export default {
     ruleCountNonNegative: "0་ཡན་གྱི་ཧྲིལ་གྲངས་དགོས།",
     ruleDecimalNonNegative: "0་ཡན་གྱི་གྲངས་དགོས།",
     villageTreeEmpty: "གྲོང་ཚོའི་སྒྲིག་འཛུགས་མ་ལོན，ལས་ཁུངས་ནང་「ཤང་གྲོང→གྲོང་ཚོ」ཡོད་མེད་ཞིབ་རོགས།"
+  },
+  largeLivestockFarmer: {
+    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: "ལོ་མཇུག་ཕྱུགས་གནས་ཚད་སྤྱི་གྲངས།",
+    formOutboundSubtotal: "ལོ་མཇུག་ཕྱུགས་ཕྱིར་ཐོན་སྤྱི་གྲངས།",
+    formGrassBalanceArea: "རྩྭ་ཕྱུགས་སྙོམས་རྒྱ་ཁྱོན།",
+    formTransferGrassArea: "བརྗེ་སྤོ་ཚོང་གཉེར་རྩྭ་ས་རྒྱ་ཁྱོན།",
+    formGrasslandAreaSubtotal: "རྩྭ་ཐང་རྒྱ་ཁྱོན་ཆུང་བསྡོམས།",
+    formApprovedCarryingCapacity: "གཏན་འཁེལ་ལོ་མཇུག་རྩྭ་ཕྱུགས་སྙོམས་ཁུར་ཚད།",
+    formYearEndStockSheepUnit: "ལོ་མཇུག་ཕྱུགས་གནས་ཚད།",
+    formIsGrassBalanced: "རྩྭ་ཕྱུགས་སྙོམས་ཁྱིམ་ཡིན་ནམ།",
+    formIncome: "ལོ་རེའི་ཚོང་གཉེར་ཡོང་འབབ་སྤྱི།",
+    formExpense: "ལོ་རེའི་ཚོང་གཉེར་འགྲོ་སོང་སྤྱི།",
+    formProfit: "ཁེ་བཟང་།",
+    formSubsidyYear: "རོགས་ཐོབ་ལོ།",
+    formHasSubsidy: "རོགས་དངུལ་ཐོབ་ཡོད་དམ།",
+    formSubsidyAmount: "རོགས་དངུལ།",
+    formHasTrademark: "ཐོ་འགོད་ཐོབ་རྟགས་ཡོད་དམ།",
+    formHasQualityCert: "ཞིང་ཐོན་སྤུས་ཚད་ངོས་འཛིན་བརྒྱུད་ཡོད་དམ།",
+    formSalesChannel: "ཐོན་རྫས་བཙོང་ལམ།",
+    formDrivenPopulation: "སྐུལ་འདེད་མི་གྲངས།",
+    formWagePaid: "གླ་ཕོགས་སྤྲོད།",
+    formRemark: "ཟིན་བྲིས།",
+    sectionBasic: "གཞི་རྩའི་གནས་ཚུལ།",
+    sectionFarmerInfo: "འཚོ་སྐྱོང་ཁེ་ལས་ཆེན་གནས་ཚུལ།",
+    sectionStock: "ལོ་མཇུག་ཕྱུགས་གནས་ཚད་གནས་ཚུལ།",
+    sectionOutbound: "ལོ་མཇུག་ཕྱུགས་ཕྱིར་ཐོན་གནས་ཚུལ།",
+    sectionGrassland: "རྩྭ་ཕྱུགས་སྙོམས་གནས་ཚུལ།",
+    sectionFinance: "ལོ་རེའི་ཚོང་གཉེར་ཡོང་འབབ་སྤྱི།",
+    sectionSubsidy: "འཚོ་སྐྱོང་ཁེ་ལས་ཆེན་རོགས་དངུལ་ཐོབ་གནས་ཚུལ།",
+    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: "ཨ།",
+    unitHeadSheepHorse: "ཨ་ཐོག་རྟ།",
+    unitMu: "མུ།",
+    unitWanYuan: "ཁྲི་སྒོར།",
+    unitSheepUnit: "ལུག་རིམ།",
+    ruleStatYearRequired: "གཏོགས་ལོ་འདེམས་རོགས།",
+    ruleStatMonthRequired: "གཏོགས་ཟླ་འདེམས་རོགས།",
+    ruleStatMonthFuture: "མ་འོངས་ཟླ་འབྲི་མི་ཆོག",
+    ruleVillageRequired: "གྲོང་ཚོ་འདེམས་རོགས།",
+    ruleEnterpriseNameRequired: "ཁེ་ལས་མིང་འབྲི་རོགས།",
+    ruleEnterpriseNameLen: "ཁེ་ལས་མིང་ཡིག་ཆ་200ལས་མི་ཆོག",
+    ruleLegalRepLen: "ཁྲིམས་མིའི་ངོ་ཚབ་ཡིག་ཆ་64ལས་མི་ཆོག",
+    ruleCountNonNegative: "0་ཡན་གྱི་ཧྲིལ་གྲངས་དགོས།",
+    ruleDecimalNonNegative: "0་ཡན་གྱི་གྲངས་དགོས།",
+    villageTreeEmpty: "གྲོང་ཚོའི་སྒྲིག་འཛུགས་མ་ལོན，ལས་ཁུངས་ནང་「ཤང་གྲོང→གྲོང་ཚོ」ཡོད་མེད་ཞིབ་རོགས།"
+  },
+  farmerHousehold: {
+    queryStatYear: "གཏོགས་ལོ།",
+    queryStatMonth: "གཏོགས་ཟླ།",
+    queryTown: "ཤང་གྲོང།",
+    phVillageSearch: "འདེམས་པའམ་འཚོལ་འཇུག་རོགས།",
+    phRemark: "འདེམས་འབྲི，ཡིག་ཆ་500ལས་མི་ཆོག",
+    colStatYear: "གཏོགས་ལོ།",
+    colStatMonth: "གཏོགས་ཟླ།",
+    statMonthLabel: "{month}ཟླ།",
+    colTownName: "ཤང་གྲོང།",
+    colVillageName: "གྲོང་ཚོ།",
+    colHouseholdCount: "ཞིང་འབྲོག་ཁྱིམ་གྲངས།",
+    colPopulationCount: "ཞིང་འབྲོག་མི་གྲངས།",
+    colPastureContractArea: "རྩྭ་ཐང་གཉེར་ལེན་རྒྱ་ཁྱོན་སྤྱི།",
+    formStatYear: "གཏོགས་ལོ།",
+    formStatMonth: "གཏོགས་ཟླ།",
+    formTown: "ཤང་གྲོང།",
+    formVillage: "གྲོང་ཚོ།",
+    formHouseholdCount: "ཞིང་འབྲོག་ཁྱིམ་གྲངས།",
+    formPopulationCount: "ཞིང་འབྲོག་མི་གྲངས།",
+    formPastureContractArea: "རྩྭ་ཐང་གཉེར་ལེན་རྒྱ་ཁྱོན་སྤྱི།",
+    formGrazingBanArea: "འཚོ་བཀག་རྒྱ་ཁྱོན།",
+    formGrassBalanceArea: "རྩྭ་ཕྱུགས་སྙོམས་རྒྱ་ཁྱོན།",
+    formApprovedCarryingCapacity: "གཏན་འཁེལ་ལོ་མཇུག་རྩྭ་ཕྱུགས་སྙོམས་ཁུར་ཚད།",
+    formYearEndStockSheepUnit: "ལོ་མཇུག་ཕྱུགས་གནས་ཚད།",
+    formIsPureHerder: "འབྲོག་པ་དག་པ་ཡིན་ནམ།",
+    formIsNoLivestock: "ཕྱུགས་མེད་ཁྱིམ་ཡིན་ནམ།",
+    formIsExtinctHousehold: "ཁྱིམ་ཆད་ཡིན་ནམ།",
+    formIsOverloadHerder: "ཁུར་བརྒལ་འབྲོག་པ་ཡིན་ནམ།",
+    formNeedCap: "རྩེ་གཅོད་དགོས་སམ།",
+    formNeedFloor: "རྨང་སྲུང་དགོས་སམ།",
+    formGrazingBanSubsidy: "འཚོ་བཀག་རོགས་དངུལ།",
+    formGrassBalanceReward: "རྩྭ་ཕྱུགས་སྙོམས་བྱ་དགའ།",
+    formSubsidyRewardSubtotal: "རོགས་དངུལ་བྱ་དགའ་སྤྱི།",
+    formAfterCapFloorSubsidy: "རྩེ་གཅོད་རྨང་སྲུང་རྗེས་རོགས་དངུལ་སྤྱི།",
+    formVillageSupervisorSubsidy: "གྲོང་ཚོའི་རྩྭ་ཐང་ལྟ་རྟོག་པ་རོགས་དངུལ།",
+    formSubsidyTotal: "རོགས་དངུལ་བསྡོམས།",
+    formRemark: "ཟིན་བྲིས།",
+    sectionBasic: "གཞི་རྩའི་གནས་ཚུལ།",
+    sectionPasture: "རྩྭ་ཕྱུགས་སྙོམས་གནས་ཚུལ།",
+    sectionCapFloor: "རྩེ་གཅོད་རྨང་སྲུང་གནས་ཚུལ།",
+    sectionSubsidy: "ད་ལོ་རོགས་ཐོབ་གནས་ཚུལ།",
+    btnImport: "ནང་འདྲེན།",
+    btnDownloadTemplate: "དཔེ་ཡིག་ཕབ་ལེན།",
+    exportTitle: "Excel ཕྱིར་འདྲེན།",
+    exportStatYear: "གཏོགས་ལོ།",
+    exportStatYearPh: "གཏོགས་ལོ་འདེམས་རོགས།",
+    exportStatMonth: "གཏོགས་ཟླ།",
+    exportStatMonthPh: "གཏོགས་ཟླ་འདེམས་རོགས།",
+    exportTown: "ཤང་གྲོང།",
+    exportTownPh: "མ་འདེམས་ན་ལོ་ཟླ་དེའི་ཤང་གྲོང་ཚང་མ་ཕྱིར་འདྲེན།",
+    exportStatYearRequired: "གཏོགས་ལོ་འདེམས་རོགས།",
+    exportStatMonthRequired: "གཏོགས་ཟླ་འདེམས་རོགས།",
+    exportLoading: "ཕྱིར་འདྲེན་བཞིན... སྒུག་རོགས།",
+    exportFail: "ཕྱིར་འདྲེན་ཕམ།",
+    importTitle: "Excel ནང་འདྲེན།",
+    importStatYear: "འབྲི་ལོ།",
+    importStatYearPh: "འབྲི་ལོ་འདེམས་རོགས།",
+    importStatMonth: "འབྲི་ཟླ།",
+    importStatMonthPh: "འབྲི་ཟླ་འདེམས་རོགས།",
+    importTip: "སྔོན་ལ་འབྲི་ལོ་ཟླ་འདེམས，དེ་ནས་དཔེ་ཡིག་དང་མཐུན་པའི .xlsx ཡར་འཇུག；ལོ་ཟླ་གྲོང་ཚོ་གཅིག་པ་ཡོད་ན་རྩོམ་སྒྲིག",
+    importLoading: "ནང་འདྲེན་བཞིན... སྒུག་རོགས།",
+    importSummary: "ནང་འདྲེན་ཟིན：གསར་{insert} རྩོམ་{update} ཕམ་{fail}",
+    importWarnTitle: "ནང་འདྲེན་ཉེན་བརྡ།",
+    importFailTitle: "ནང་འདྲེན་ཕམ་ཞིབ།",
+    dialogAdd: "[གསར་སྣོན]ཞིང་འབྲོག་ཁྱིམ་གཞི་གྲངས།",
+    dialogEdit: "[རྩོམ་སྒྲིག]ཞིང་འབྲོག་ཁྱིམ་གཞི་གྲངས།",
+    confirmDelete: "ཐོ་གཞུང་འདི་སུབ་རྒྱུ་གཏན་ཁེལ་ལམ？",
+    emptyList: "འབྲི་གཞི་གྲངས་མེད།",
+    unitHousehold: "ཁྱིམ།",
+    unitPerson: "མི།",
+    unitMu: "མུ།",
+    unitYuan: "སྒོར།",
+    unitSheepUnit: "ལུག་རིམ།",
+    ruleStatYearRequired: "གཏོགས་ལོ་འདེམས་རོགས།",
+    ruleStatMonthRequired: "གཏོགས་ཟླ་འདེམས་རོགས།",
+    ruleStatMonthFuture: "མ་འོངས་ཟླ་འབྲི་མི་ཆོག",
+    ruleVillageRequired: "གྲོང་ཚོ་འདེམས་རོགས།",
+    ruleCountNonNegative: "0་ཡན་གྱི་ཧྲིལ་གྲངས་དགོས།",
+    ruleDecimalNonNegative: "0་ཡན་གྱི་གྲངས་དགོས།",
+    villageTreeEmpty: "གྲོང་ཚོའི་སྒྲིག་འཛུགས་མ་ལོན，ལས་ཁུངས་ནང་「ཤང་གྲོང→གྲོང་ཚོ」ཡོད་མེད་ཞིབ་རོགས།"
+  },
+  vaccinationData: {
+    queryStatYear: "གཏོགས་ལོ།",
+    queryStatMonth: "གཏོགས་ཟླ།",
+    queryTown: "ཤང་གྲོང།",
+    queryVillage: "གྲོང་ཚོ།",
+    phVillageSearch: "འདེམས་པའམ་འཚོལ་འཇུག་རོགས།",
+    phRemark: "འདེམས་འབྲི，ཡིག་ཆ་500ལས་མི་ཆོག",
+    colStatYear: "གཏོགས་ལོ།",
+    colStatMonth: "གཏོགས་ཟླ།",
+    statMonthLabel: "{month}ཟླ།",
+    colTownName: "ཤང་གྲོང།",
+    colVillageName: "གྲོང་ཚོ།",
+    colShouldVaccinateCount: "འགོག་དགོས་གྲངས།",
+    colActualVaccinateCount: "དངོས་འགོག་གྲངས།",
+    colImmunityRate: "འགོག་ནད་ཕྱོད།",
+    formStatYear: "གཏོགས་ལོ།",
+    formStatMonth: "གཏོགས་ཟླ།",
+    formTown: "ཤང་གྲོང།",
+    formVillage: "གྲོང་ཚོ།",
+    formShouldVaccinateCount: "འགོག་དགོས་གྲངས།",
+    formActualVaccinateCount: "དངོས་འགོག་གྲངས།",
+    formImmunityRate: "འགོག་ནད་ཕྱོད།",
+    formRemark: "ཟིན་བྲིས།",
+    sectionBasic: "གཞི་རྩའི་གནས་ཚུལ།",
+    sectionVaccination: "སྨན་ཁབ་འགོག་ནད་གནས་ཚུལ།",
+    btnImport: "ནང་འདྲེན།",
+    btnDownloadTemplate: "དཔེ་ཡིག་ཕབ་ལེན།",
+    exportTitle: "Excel ཕྱིར་འདྲེན།",
+    exportStatYear: "གཏོགས་ལོ།",
+    exportStatYearPh: "གཏོགས་ལོ་འདེམས་རོགས།",
+    exportStatMonth: "གཏོགས་ཟླ།",
+    exportStatMonthPh: "གཏོགས་ཟླ་འདེམས་རོགས།",
+    exportTown: "ཤང་གྲོང།",
+    exportTownPh: "མ་འདེམས་ན་ལོ་ཟླ་དེའི་ཤང་གྲོང་ཚང་མ་ཕྱིར་འདྲེན།",
+    exportStatYearRequired: "གཏོགས་ལོ་འདེམས་རོགས།",
+    exportStatMonthRequired: "གཏོགས་ཟླ་འདེམས་རོགས།",
+    exportLoading: "ཕྱིར་འདྲེན་བཞིན... སྒུག་རོགས།",
+    exportFail: "ཕྱིར་འདྲེན་ཕམ།",
+    importTitle: "Excel ནང་འདྲེན།",
+    importStatYear: "འབྲི་ལོ།",
+    importStatYearPh: "འབྲི་ལོ་འདེམས་རོགས།",
+    importStatMonth: "འབྲི་ཟླ།",
+    importStatMonthPh: "འབྲི་ཟླ་འདེམས་རོགས།",
+    importTip: "སྔོན་ལ་འབྲི་ལོ་ཟླ་འདེམས，དེ་ནས་དཔེ་ཡིག་དང་མཐུན་པའི .xlsx ཡར་འཇུག；ལོ་ཟླ་གྲོང་ཚོ་གཅིག་པ་ཡོད་ན་རྩོམ་སྒྲིག",
+    importLoading: "ནང་འདྲེན་བཞིན... སྒུག་རོགས།",
+    importSummary: "ནང་འདྲེན་ཟིན：གསར་{insert} རྩོམ་{update} ཕམ་{fail}",
+    importWarnTitle: "ནང་འདྲེན་ཉེན་བརྡ།",
+    importFailTitle: "ནང་འདྲེན་ཕམ་ཞིབ།",
+    dialogAdd: "[གསར་སྣོན]སྨན་ཁབ་འགོག་ནད་གཞི་གྲངས།",
+    dialogEdit: "[རྩོམ་སྒྲིག]སྨན་ཁབ་འགོག་ནད་གཞི་གྲངས།",
+    confirmDelete: "ཐོ་གཞུང་འདི་སུབ་རྒྱུ་གཏན་ཁེལ་ལམ？",
+    emptyList: "འབྲི་གཞི་གྲངས་མེད།",
+    unitHead: "མགོ།",
+    ruleStatYearRequired: "གཏོགས་ལོ་འདེམས་རོགས།",
+    ruleStatMonthRequired: "གཏོགས་ཟླ་འདེམས་རོགས།",
+    ruleStatMonthFuture: "མ་འོངས་ཟླ་འབྲི་མི་ཆོག",
+    ruleVillageRequired: "གྲོང་ཚོ་འདེམས་རོགས།",
+    ruleCountNonNegative: "0་ཡན་གྱི་ཧྲིལ་གྲངས་དགོས།",
+    ruleActualLeShould: "དངོས་འགོག་གྲངས་འགོག་དགོས་གྲངས་ལས་མང་མི་ཆོག",
+    villageTreeEmpty: "གྲོང་ཚོའི་སྒྲིག་འཛུགས་མ་ལོན，ལས་ཁུངས་ནང་「ཤང་གྲོང→གྲོང་ཚོ」ཡོད་མེད་ཞིབ་རོགས།"
   }
 }

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

@@ -43,7 +43,9 @@ export default {
     viewOfflineTime: "下架时间",
     ruleLen120: "项目名称长度在 1 到 20 个字符",
     ruleLen150: "长度在 1 到 50 个字符",
+    ruleLen50Optional: "长度不能超过 50 个字符",
     ruleLen1500: "长度在 1 到 500 个字符",
+    ruleLen500Optional: "长度不能超过 500 个字符",
     ruleImplEndBeforeStart: "实施结束日期不能早于开始日期",
     ruleRateRange: "比率须在 0～1 之间",
     ruleNonNegativeInteger: "须为非负整数",
@@ -66,40 +68,40 @@ export default {
     queryProjectName: "项目名称",
     queryProjectNamePh: "项目名称模糊查询",
     queryProjectType: "项目类型",
+    queryImplYear: "实施年限",
     queryPublishStatus: "发布状态",
     colProjectName: "项目名称",
     colProjectType: "项目类型",
     colIntro: "项目简介",
-    colImplDate: "实施日期",
+    colImplYear: "实施年限",
     colOpImageCount: "运营图片",
     colCover: "封面",
-    colContent: "项目内容",
+    colContent: "建设规模及内容",
     colVideo: "运营视频",
     formProjectName: "项目名称",
     formProjectType: "项目类型",
     formIntro: "项目简介",
-    formContent: "项目内容",
-    formImplDate: "实施日期",
-    implRangeSeparator: "至",
-    implRangeStartPh: "开始日期",
-    implRangeEndPh: "结束日期",
+    formContent: "建设规模及内容",
+    formInvestmentAmount: "投资金额",
+    formImplYear: "实施年限",
+    formImplStatus: "实施情况",
     formOpImages: "运营图片",
     formVideo: "运营视频",
     formCover: "封面",
     phProjectName: "请输入项目名称",
-    phIntro: "请输入项目简介",
-    phContent: "请输入项目内容",
+    phIntro: "选填，不超过 50 字",
+    phContent: "请输入建设规模及内容",
+    phImplStatus: "选填，不超过 500 字",
     ruleProjectNameRequired: "请输入项目名称",
     ruleProjectTypeRequired: "请选择项目类型",
-    ruleIntroRequired: "请输入项目简介",
-    ruleContentRequired: "请输入项目内容",
-    ruleImplDateRequired: "请选择实施日期",
+    ruleContentRequired: "请输入建设规模及内容",
+    ruleImplYearRequired: "请选择实施年限",
     ruleOpImagesRequired: "请上传至少 1 张运营图片",
     dialogAdd: "[新增]共同富裕项目",
     dialogEdit: "[编辑]共同富裕项目",
-    type1: "合作共赢",
-    type2: "农文旅融合",
-    type3: "认养农业",
+    type1: "和美乡村建设项目",
+    type2: "人居环境整治提升项目",
+    type3: "其他项目投入",
     confirmDelete: "是否确认删除这条数据？",
     confirmPublish: "确认发布该共同富裕项目吗？发布后不可修改。",
     confirmOffline: "确认下架该共同富裕项目吗？下架后可再次编辑并发布。",

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

@@ -286,9 +286,13 @@ export default {
     statMonthLabel: "{month}月",
     colVillageCount: "村居数",
     colHerdsmanHouseholdCount: "牧户数",
-    colYakTotal: "存栏数",
-    colBullTotal: "公牛存栏数",
-    colCowTotal: "母牛存栏数",
+    colBullTotal: "公牛总存栏数",
+    colCowTotal: "母牛总存栏数",
+    colDairyTotal: "奶牛总存栏数",
+    colSheepTotal: "羊总存栏数",
+    colInsuredYakCount: "保险牦牛存栏数",
+    colYakTotal: "牦牛总存栏数",
+    colGrandTotal: "总存栏数",
     formStatYear: "所属年份",
     formStatMonth: "所属月份",
     formTown: "所属乡镇",
@@ -297,22 +301,28 @@ export default {
     formHerdsmanHouseholdCount: "牧户数",
     formBreedingBullCount: "种公牛存栏数",
     formBullCastratedCount: "公牛/阉畜存栏数",
-    formCowYoungCount: "0～1.5岁幼畜存栏数",
-    formCowAdultCount: "1.5岁以上成畜存栏数",
+    formCowYoungCount: "0～1.5岁幼畜（不包括1.5岁）存栏数",
+    formCowAdultCount: "1.5岁以上成畜（包括1.5岁）存栏数",
     formMilkingCowCount: "产奶母牛存栏数",
     formFertileCowCount: "能繁母牛存栏数",
     formSheepTotal: "羊总存栏数",
     formMilkingSheepCount: "产奶羊存栏数",
     formInsuredYakCount: "保险牦牛存栏数",
-    formBullTotal: "公牛合计",
-    formCowTotal: "母牛合计",
-    formDairyTotal: "奶牛合计",
-    formYakTotal: "牦牛总存栏",
-    formGrandTotal: "总合计",
+    formBullTotal: "公牛总存栏数",
+    formCowTotal: "母牛总存栏数",
+    formDairyTotal: "奶牛总存栏数",
+    formYakTotal: "牦牛总存栏数",
+    formGrandTotal: "总存栏数",
     formYakSheepTotal: "总量（牦牛+羊）",
     formRemark: "备注",
     phRemark: "选填，不超过 500 字",
     sectionBasic: "基本信息",
+    sectionFarmer: "农牧户情况",
+    sectionBull: "公牛存栏情况",
+    sectionCow: "母牛存栏情况",
+    sectionDairy: "奶牛存栏情况",
+    sectionSheep: "羊存栏情况",
+    sectionSummary: "汇总",
     sectionInventory: "存栏指标",
     btnImport: "导入",
     btnDownloadTemplate: "下载模板",
@@ -392,7 +402,7 @@ export default {
     phRemark: "选填，不超过 500 字",
     sectionBasic: "基本信息",
     sectionFarmer: "农牧户情况",
-    sectionOutbound: "出栏情况",
+    sectionOutbound: "牲畜出栏情况",
     sectionSelfConsumption: "自食情况",
     btnImport: "导入",
     btnDownloadTemplate: "下载模板",
@@ -427,6 +437,7 @@ export default {
     unitHead: "头",
     unitSheep: "只",
     unitHorse: "匹",
+    unitHeadSheepHorse: "头只匹",
     ruleStatYearRequired: "请选择所属年份",
     ruleStatMonthRequired: "请选择所属月份",
     ruleStatMonthFuture: "不可填报未来月份",
@@ -467,12 +478,12 @@ export default {
     formEstablishDate: "成立时间",
     formRegisteredCapital: "注册资本",
     formYearEndTotalAssets: "截止年底总资产",
-    formMemberHouseholdCount: "入社户数",
-    formMemberPopulationCount: "入社人数",
-    formPovertyMonitorCount: "防返贫监测人数",
+    formMemberHouseholdCount: "户数",
+    formMemberPopulationCount: "人数",
+    formPovertyMonitorCount: "防返贫监测",
     formCattleShareCount: "牛入股数量",
     formSheepShareCount: "羊入股数量",
-    formLivestockShareTotal: "牲畜入股小计",
+    formLivestockShareTotal: "牲畜总入股数量",
     formGrasslandShareArea: "草场入股",
     formLaborShareCount: "劳动力入股",
     formCashShareAmount: "现金入股",
@@ -487,25 +498,29 @@ export default {
     formCollegeGraduateWage: "大学生工资性收入",
     formFarmerTransferEmploymentCount: "农牧民转移就业",
     formFarmerTransferWage: "农牧民工资性收入",
-    formCattleInventoryCount: "牛存栏",
-    formCattleOutboundCount: "牛出栏",
-    formSheepInventoryCount: "羊存栏",
-    formSheepOutboundCount: "羊出栏",
+    formCattleInventoryCount: "牛存栏数",
+    formCattleOutboundCount: "牛出栏数",
+    formSheepInventoryCount: "羊存栏数",
+    formSheepOutboundCount: "羊出栏数",
     formTrademarkProductCount: "注册商标产品数量",
     formQualityCertProductCount: "质量认证产品数量",
-    formTrainingManageCount: "培训-管理能力",
-    formTrainingSkillCount: "培训-专业技能",
-    formTrainingOtherCount: "培训-其他",
+    formTrainingManageCount: "管理能力",
+    formTrainingSkillCount: "专业技能",
+    formTrainingOtherCount: "其他",
     formBusinessScope: "主要经营范围",
     formBusinessModel: "经营模式分类",
-    formOperationStatus: "运营情况",
+    formOperationStatus: "合作社运营情况",
     formRemark: "备注",
     sectionBasic: "基本信息",
-    sectionMemberShare: "入社与入股",
-    sectionBenefit: "效益情况",
-    sectionEmploymentLivestock: "就业与存出栏",
-    sectionProductTraining: "产品认证与培训",
-    sectionOperation: "经营情况",
+    sectionCooperativeInfo: "合作社信息",
+    sectionMemberShare: "农牧民入社情况",
+    sectionBenefit: "年度效益发挥情况",
+    sectionEmployment: "合作社领域吸纳就业情况",
+    sectionLivestockInout: "合作社牲畜存出栏情况",
+    sectionProductCert: "产品认证情况",
+    sectionTraining: "合作社社员培训情况",
+    sectionOperation: "合作社经营范围及模式",
+    sectionOperationStatus: "合作社运营情况",
     btnImport: "导入",
     btnChooseFile: "选取文件",
     btnDownloadTemplate: "下载模板",
@@ -538,6 +553,7 @@ export default {
     unitHousehold: "户",
     unitPerson: "人",
     unitHead: "头",
+    unitHeadSheepHorse: "头只匹",
     unitGe: "个",
     unitWanYuan: "万元",
     unitWanMu: "万亩",
@@ -561,11 +577,13 @@ export default {
     colIncomeGrowthRate: "增速",
     colPovertyNetIncome: "脱贫人口人均纯收入",
     formStatYear: "所属年份",
-    formRuralDisposableIncome: "农村居民人均可支配收入",
+    formRuralDisposableIncome: "人均可支配收入",
     formIncomeIncrease: "增幅",
     formIncomeGrowthRate: "增速",
-    formPovertyNetIncome: "脱贫人口人均纯收入",
+    formPovertyNetIncome: "人均纯收入",
     formRemark: "备注",
+    sectionRuralResident: "农村居民",
+    sectionPovertyPopulation: "脱贫人口",
     phIncomeIncrease: "选填，元；不填则按上年自动计算",
     phIncomeGrowthRate: "选填，小数如 0.1228；不填则自动计算",
     phRemark: "选填，不超过 500 字",
@@ -574,9 +592,10 @@ export default {
     confirmDelete: "是否确认删除这条数据？",
     emptyList: "暂无填报数据",
     unitYuan: "元",
+    unitPercent: "%",
     ruleStatYearRequired: "请选择所属年份",
-    ruleRuralIncomeRequired: "请输入农村居民人均可支配收入",
-    rulePovertyIncomeRequired: "请输入脱贫人口人均纯收入",
+    ruleRuralIncomeRequired: "请输入人均可支配收入",
+    rulePovertyIncomeRequired: "请输入人均纯收入",
     ruleMoneyNonNegative: "须为大于等于 0 的数字",
     ruleNumberInvalid: "请输入有效数字"
   },
@@ -601,6 +620,8 @@ export default {
     formMeatOutput: "肉产量",
     formMilkOutput: "奶产量",
     formRemark: "备注",
+    sectionBasic: "基本信息",
+    sectionOutput: "畜牧产品产量信息",
     btnImport: "导入",
     btnDownloadTemplate: "下载模板",
     exportTitle: "Excel 导出",
@@ -655,8 +676,8 @@ export default {
     colEnterpriseType: "企业类型",
     colRegisteredCapital: "注册资本",
     colEstablishDate: "成立时间",
-    colCattleYearEndStock: "牛存栏",
-    colCattleOutbound: "牛出栏",
+    colCattleYearEndStock: "年底牛存栏数",
+    colCattleOutbound: "年底牛出栏数",
     colGrasslandArea: "草场面积",
     formStatYear: "所属年份",
     formStatMonth: "所属月份",
@@ -667,14 +688,15 @@ export default {
     formEnterpriseType: "企业类型",
     formRegisteredCapital: "注册资本",
     formEstablishDate: "成立时间",
-    formLivestockLaborCount: "从事畜牧业劳力人员",
-    formCattleYearEndStock: "牛年底存栏",
-    formCattleBreedingFemaleStock: "牛能繁母畜",
-    formSheepYearEndStock: "羊年底存栏",
-    formSheepBreedingFemaleStock: "羊能繁母畜",
-    formCattleOutbound: "牛出栏",
-    formSheepOutbound: "羊出栏",
-    formStockSubtotal: "年底牲畜存栏小计",
+    formLivestockLaborCount: "从事畜牧业生产经营劳力人员",
+    formCattleYearEndStock: "年底牛存栏数",
+    formCattleBreedingFemaleStock: "年底能繁母牛存栏数",
+    formSheepYearEndStock: "年底羊存栏数",
+    formSheepBreedingFemaleStock: "年底能繁母羊存栏数",
+    formCattleOutbound: "年底牛出栏数",
+    formSheepOutbound: "年底羊出栏数",
+    formStockSubtotal: "年底牲畜总存栏数",
+    formOutboundSubtotal: "年底牲畜总出栏数",
     formGrassBalanceArea: "草畜平衡面积",
     formTransferGrassArea: "流转经营草地面积",
     formGrasslandAreaSubtotal: "草场面积小计",
@@ -684,7 +706,7 @@ export default {
     formIncome: "年度经营总收入",
     formExpense: "年度经营总支出",
     formProfit: "利润",
-    formSubsidyYear: "补助资金年份",
+    formSubsidyYear: "受助年份",
     formHasSubsidy: "是否享受补助",
     formSubsidyAmount: "补贴资金",
     formHasTrademark: "是否有注册商标",
@@ -694,10 +716,13 @@ export default {
     formWagePaid: "发放工资",
     formRemark: "备注",
     sectionBasic: "基本信息",
-    sectionStock: "存栏与出栏",
-    sectionGrassland: "草场与草畜平衡",
-    sectionFinance: "经营与补助",
-    sectionOther: "其他",
+    sectionRanchInfo: "家庭牧场信息",
+    sectionStock: "年底牲畜存栏情况",
+    sectionOutbound: "年底牲畜出栏情况",
+    sectionGrassland: "草畜平衡情况",
+    sectionFinance: "年度经营总收入",
+    sectionSubsidy: "家庭牧场补助资金享受情况",
+    sectionOther: "家庭牧场运营情况",
     btnImport: "导入",
     btnDownloadTemplate: "下载模板",
     exportTitle: "Excel 导出",
@@ -726,6 +751,7 @@ export default {
     emptyList: "暂无填报数据",
     unitPerson: "人",
     unitHead: "头",
+    unitHeadSheepHorse: "头只匹",
     unitMu: "亩",
     unitWanYuan: "万元",
     unitSheepUnit: "绵羊单位",
@@ -739,5 +765,256 @@ export default {
     ruleCountNonNegative: "须为大于等于 0 的整数",
     ruleDecimalNonNegative: "须为大于等于 0 的数字",
     villageTreeEmpty: "未加载到村级组织数据，请确认系统部门已维护「乡镇→村」"
+  },
+  largeLivestockFarmer: {
+    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: "年底牲畜总存栏数",
+    formOutboundSubtotal: "年底牲畜总出栏数",
+    formGrassBalanceArea: "草畜平衡面积",
+    formTransferGrassArea: "流转经营草地面积",
+    formGrasslandAreaSubtotal: "草场面积小计",
+    formApprovedCarryingCapacity: "核定年末草畜平衡载畜量",
+    formYearEndStockSheepUnit: "年底牲畜存栏",
+    formIsGrassBalanced: "是否草畜平衡户",
+    formIncome: "年度经营总收入",
+    formExpense: "年度经营总支出",
+    formProfit: "利润",
+    formSubsidyYear: "受助年份",
+    formHasSubsidy: "是否享受补助",
+    formSubsidyAmount: "补贴资金",
+    formHasTrademark: "是否有注册商标",
+    formHasQualityCert: "是否通过农产品质量认证",
+    formSalesChannel: "产品销售渠道",
+    formDrivenPopulation: "带动人数",
+    formWagePaid: "发放工资",
+    formRemark: "备注",
+    sectionBasic: "基本信息",
+    sectionFarmerInfo: "养殖大户信息",
+    sectionStock: "年底牲畜存栏情况",
+    sectionOutbound: "年底牲畜出栏情况",
+    sectionGrassland: "草畜平衡情况",
+    sectionFinance: "年度经营总收入",
+    sectionSubsidy: "养殖大户补助资金享受情况",
+    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: "头",
+    unitHeadSheepHorse: "头只匹",
+    unitMu: "亩",
+    unitWanYuan: "万元",
+    unitSheepUnit: "绵羊单位",
+    ruleStatYearRequired: "请选择所属年份",
+    ruleStatMonthRequired: "请选择所属月份",
+    ruleStatMonthFuture: "不可填报未来月份",
+    ruleVillageRequired: "请选择所属村",
+    ruleEnterpriseNameRequired: "请输入企业名称",
+    ruleEnterpriseNameLen: "企业名称不能超过 200 字",
+    ruleLegalRepLen: "法定代表人不能超过 64 字",
+    ruleCountNonNegative: "须为大于等于 0 的整数",
+    ruleDecimalNonNegative: "须为大于等于 0 的数字",
+    villageTreeEmpty: "未加载到村级组织数据，请确认系统部门已维护「乡镇→村」"
+  },
+  farmerHousehold: {
+    queryStatYear: "所属年份",
+    queryStatMonth: "所属月份",
+    queryTown: "所属乡镇",
+    phVillageSearch: "请选择或输入搜索",
+    phRemark: "选填，不超过 500 字",
+    colStatYear: "所属年份",
+    colStatMonth: "所属月份",
+    statMonthLabel: "{month}月",
+    colTownName: "所属乡镇",
+    colVillageName: "所属村",
+    colHouseholdCount: "农牧户数",
+    colPopulationCount: "农牧人数",
+    colPastureContractArea: "草场承包总面积",
+    formStatYear: "所属年份",
+    formStatMonth: "所属月份",
+    formTown: "所属乡镇",
+    formVillage: "所属村",
+    formHouseholdCount: "农牧户数",
+    formPopulationCount: "农牧人数",
+    formPastureContractArea: "草场承包总面积",
+    formGrazingBanArea: "禁牧面积",
+    formGrassBalanceArea: "草畜平衡面积",
+    formApprovedCarryingCapacity: "核定年末草畜平衡载畜量",
+    formYearEndStockSheepUnit: "年底牲畜存栏",
+    formIsPureHerder: "是否是纯牧户",
+    formIsNoLivestock: "是否无畜户",
+    formIsExtinctHousehold: "是否绝户",
+    formIsOverloadHerder: "是否超载牧户",
+    formNeedCap: "是否需要封顶",
+    formNeedFloor: "是否需要保底",
+    formGrazingBanSubsidy: "禁牧补助",
+    formGrassBalanceReward: "草畜平衡奖励",
+    formSubsidyRewardSubtotal: "补助奖励总资金",
+    formAfterCapFloorSubsidy: "封顶保底后享受补助奖励总资金",
+    formVillageSupervisorSubsidy: "村级草原监督员补助",
+    formSubsidyTotal: "补助合计金额",
+    formRemark: "备注",
+    sectionBasic: "基本信息",
+    sectionPasture: "草畜平衡情况",
+    sectionCapFloor: "封顶保底情况",
+    sectionSubsidy: "本年受助情况",
+    btnImport: "导入",
+    btnDownloadTemplate: "下载模板",
+    exportTitle: "Excel 导出",
+    exportStatYear: "所属年份",
+    exportStatYearPh: "请选择所属年份",
+    exportStatMonth: "所属月份",
+    exportStatMonthPh: "请选择所属月份",
+    exportTown: "所属乡镇",
+    exportTownPh: "不选则导出该年月全部乡镇",
+    exportStatYearRequired: "请选择所属年份",
+    exportStatMonthRequired: "请选择所属月份",
+    exportLoading: "正在导出，请稍候...",
+    exportFail: "导出失败",
+    importTitle: "Excel 导入",
+    importStatYear: "填报年份",
+    importStatYearPh: "请选择填报年份",
+    importStatMonth: "填报月份",
+    importStatMonthPh: "请选择填报月份",
+    importTip: "请先选择填报年月，再上传与模板格式一致的 .xlsx 文件；同年同月同村已存在则更新",
+    importLoading: "正在导入，请稍候...",
+    importSummary: "导入完成：新增 {insert} 条，更新 {update} 条，失败 {fail} 条",
+    importWarnTitle: "导入警告",
+    importFailTitle: "导入失败明细",
+    dialogAdd: "[新增]农牧户数据",
+    dialogEdit: "[编辑]农牧户数据",
+    confirmDelete: "是否确认删除这条数据？",
+    emptyList: "暂无填报数据",
+    unitHousehold: "户",
+    unitPerson: "人",
+    unitMu: "亩",
+    unitYuan: "元",
+    unitSheepUnit: "绵羊单位",
+    ruleStatYearRequired: "请选择所属年份",
+    ruleStatMonthRequired: "请选择所属月份",
+    ruleStatMonthFuture: "不可填报未来月份",
+    ruleVillageRequired: "请选择所属村",
+    ruleCountNonNegative: "须为大于等于 0 的整数",
+    ruleDecimalNonNegative: "须为大于等于 0 的数字",
+    villageTreeEmpty: "未加载到村级组织数据，请确认系统部门已维护「乡镇→村」"
+  },
+  vaccinationData: {
+    queryStatYear: "所属年份",
+    queryStatMonth: "所属月份",
+    queryTown: "所属乡镇",
+    queryVillage: "所属村",
+    phVillageSearch: "请选择或输入搜索",
+    phRemark: "选填，不超过 500 字",
+    colStatYear: "所属年份",
+    colStatMonth: "所属月份",
+    statMonthLabel: "{month}月",
+    colTownName: "所属乡镇",
+    colVillageName: "所属村",
+    colShouldVaccinateCount: "应免数",
+    colActualVaccinateCount: "实免数",
+    colImmunityRate: "免疫率",
+    formStatYear: "所属年份",
+    formStatMonth: "所属月份",
+    formTown: "所属乡镇",
+    formVillage: "所属村",
+    formShouldVaccinateCount: "应免数",
+    formActualVaccinateCount: "实免数",
+    formImmunityRate: "免疫率",
+    formRemark: "备注",
+    sectionBasic: "基本信息",
+    sectionVaccination: "疫苗接种情况",
+    btnImport: "导入",
+    btnDownloadTemplate: "下载模板",
+    exportTitle: "Excel 导出",
+    exportStatYear: "所属年份",
+    exportStatYearPh: "请选择所属年份",
+    exportStatMonth: "所属月份",
+    exportStatMonthPh: "请选择所属月份",
+    exportTown: "所属乡镇",
+    exportTownPh: "不选则导出该年月全部乡镇",
+    exportStatYearRequired: "请选择所属年份",
+    exportStatMonthRequired: "请选择所属月份",
+    exportLoading: "正在导出，请稍候...",
+    exportFail: "导出失败",
+    importTitle: "Excel 导入",
+    importStatYear: "填报年份",
+    importStatYearPh: "请选择填报年份",
+    importStatMonth: "填报月份",
+    importStatMonthPh: "请选择填报月份",
+    importTip: "请先选择填报年月，再上传与模板格式一致的 .xlsx 文件；同年同月同村已存在则更新",
+    importLoading: "正在导入，请稍候...",
+    importSummary: "导入完成：新增 {insert} 条，更新 {update} 条，失败 {fail} 条",
+    importWarnTitle: "导入警告",
+    importFailTitle: "导入失败明细",
+    dialogAdd: "[新增]疫苗接种数据",
+    dialogEdit: "[编辑]疫苗接种数据",
+    confirmDelete: "是否确认删除这条数据？",
+    emptyList: "暂无填报数据",
+    unitHead: "头",
+    ruleStatYearRequired: "请选择所属年份",
+    ruleStatMonthRequired: "请选择所属月份",
+    ruleStatMonthFuture: "不可填报未来月份",
+    ruleVillageRequired: "请选择所属村",
+    ruleCountNonNegative: "须为大于等于 0 的整数",
+    ruleActualLeShould: "实免数不能大于应免数",
+    villageTreeEmpty: "未加载到村级组织数据，请确认系统部门已维护「乡镇→村」"
   }
 }

ruoyi-ui/src/mixins/dataModelLocaleMixin.js

@@ -1,7 +1,9 @@
 /**
  * 产业数据模型及体系：dmT（data.dmNs）、dmCommon（通用按钮/校验）
  *
- * 查看弹窗约定：数值类字段须用 formatWithUnit 展示单位（与表单后缀一致）。
+ * 查看弹窗约定：
+ * 1. 数值类字段须用 formatWithUnit 展示单位（与表单后缀一致）。
+ * 2. 查看表单根节点加 class="dm-view-form"，值文本使用主题高亮色（见 assets/styles/data-model.scss）。
  */
 export default {
   methods: {

ruoyi-ui/src/views/commonProsperity/project/index.vue

@@ -14,10 +14,16 @@
         </el-form-item>
         <el-form-item prop="projectType">
           <template slot="label">{{ cpT("queryProjectType") }}</template>
-          <el-select v-model="queryParams.projectType" :placeholder="cpCommon('pleaseSelect')" clearable style="width: 160px">
+          <el-select v-model="queryParams.projectType" :placeholder="cpCommon('pleaseSelect')" clearable style="width: 200px">
             <el-option v-for="item in projectTypeOptions" :key="item.value" :label="item.label" :value="item.value" />
           </el-select>
         </el-form-item>
+        <el-form-item prop="implYear">
+          <template slot="label">{{ cpT("queryImplYear") }}</template>
+          <el-select v-model="queryParams.implYear" :placeholder="cpCommon('pleaseSelect')" clearable style="width: 140px">
+            <el-option v-for="y in yearOptions" :key="'q-' + y" :label="String(y)" :value="y" />
+          </el-select>
+        </el-form-item>
         <el-form-item prop="publishStatus">
           <template slot="label">{{ cpT("queryPublishStatus") }}</template>
           <el-select v-model="queryParams.publishStatus" :placeholder="cpCommon('pleaseSelect')" clearable style="width: 140px">
@@ -45,17 +51,13 @@
     <el-card shadow="never">
       <el-table v-loading="loading" :data="tableList" border>
         <el-table-column :label="cpT('colProjectName')" prop="projectName" align="center" min-width="120" :show-overflow-tooltip="true" />
-        <el-table-column :label="cpT('colProjectType')" align="center" width="110">
+        <el-table-column :label="cpT('colProjectType')" align="center" min-width="160">
           <template slot-scope="scope">
             <span>{{ typeLabel(scope.row.projectType) }}</span>
           </template>
         </el-table-column>
         <el-table-column :label="cpT('colIntro')" prop="introduction" align="center" min-width="120" :show-overflow-tooltip="true" />
-        <el-table-column :label="cpT('colImplDate')" align="center" width="200">
-          <template slot-scope="scope">
-            <span>{{ implDateRangeText(scope.row) }}</span>
-          </template>
-        </el-table-column>
+        <el-table-column :label="cpT('colImplYear')" prop="implYear" align="center" width="100" />
         <el-table-column :label="cpT('colOpImageCount')" align="center" width="88">
           <template slot-scope="scope">
             <span>{{ scope.row.opImageCount != null ? scope.row.opImageCount + cpT("opImageUnit") : $t("commonProsperity.status.dash") }}</span>
@@ -126,7 +128,7 @@
     </el-card>
 
     <el-dialog :title="dialogTitle" :visible.sync="open" width="720px" append-to-body @close="cancel">
-      <el-form :key="formKey" ref="form" :model="form" label-width="110px">
+      <el-form :key="formKey" ref="form" :model="form" label-width="130px">
         <el-form-item prop="projectName" :rules="formRules.projectName">
           <template slot="label">{{ cpT("formProjectName") }}</template>
           <el-input v-model="form.projectName" :placeholder="cpT('phProjectName')" maxlength="20" show-word-limit />
@@ -145,17 +147,26 @@
           <template slot="label">{{ cpT("formContent") }}</template>
           <el-input v-model="form.projectContent" type="textarea" :rows="4" :placeholder="cpT('phContent')" maxlength="500" show-word-limit />
         </el-form-item>
-        <el-form-item prop="implDateRange" :rules="formRules.implDateRange">
-          <template slot="label">{{ cpT("formImplDate") }}</template>
-          <el-date-picker
-            v-model="form.implDateRange"
-            type="daterange"
-            value-format="yyyy-MM-dd"
-            :range-separator="cpT('implRangeSeparator')"
-            :start-placeholder="cpT('implRangeStartPh')"
-            :end-placeholder="cpT('implRangeEndPh')"
-            style="width: 100%"
+        <el-form-item prop="investmentAmount" :rules="formRules.investmentAmount">
+          <template slot="label">{{ cpT("formInvestmentAmount") }}</template>
+          <el-input-number
+            v-model="form.investmentAmount"
+            :min="0"
+            :precision="2"
+            :controls="false"
+            style="width: 220px"
           />
+          <span class="form-unit">{{ cpCommon("unitWanYuan") }}</span>
+        </el-form-item>
+        <el-form-item prop="implYear" :rules="formRules.implYear">
+          <template slot="label">{{ cpT("formImplYear") }}</template>
+          <el-select v-model="form.implYear" :placeholder="cpCommon('pleaseSelect')" style="width: 220px">
+            <el-option v-for="y in yearOptions" :key="'f-' + y" :label="String(y)" :value="y" />
+          </el-select>
+        </el-form-item>
+        <el-form-item prop="implStatus" :rules="formRules.implStatus">
+          <template slot="label">{{ cpT("formImplStatus") }}</template>
+          <el-input v-model="form.implStatus" type="textarea" :rows="3" :placeholder="cpT('phImplStatus')" maxlength="500" show-word-limit />
         </el-form-item>
         <el-form-item prop="operationImages">
           <template slot="label">{{ cpT("formOpImages") }}</template>
@@ -229,7 +240,7 @@
     </el-dialog>
 
     <el-dialog :title="cpCommon('viewTitle')" :visible.sync="viewOpen" width="680px" append-to-body>
-      <el-form label-width="110px" size="small">
+      <el-form label-width="130px" size="small">
         <el-form-item :label="cpT('formProjectName')">
           <span>{{ viewRow.projectName }}</span>
         </el-form-item>
@@ -242,8 +253,14 @@
         <el-form-item :label="cpT('formContent')">
           <span class="view-content-text">{{ viewRow.projectContent || $t("commonProsperity.status.dash") }}</span>
         </el-form-item>
-        <el-form-item :label="cpT('formImplDate')">
-          <span>{{ implDateRangeText(viewRow) }}</span>
+        <el-form-item :label="cpT('formInvestmentAmount')">
+          <span>{{ investmentAmountText(viewRow.investmentAmount) }}</span>
+        </el-form-item>
+        <el-form-item :label="cpT('formImplYear')">
+          <span>{{ viewRow.implYear != null ? viewRow.implYear : $t("commonProsperity.status.dash") }}</span>
+        </el-form-item>
+        <el-form-item :label="cpT('formImplStatus')">
+          <span class="view-content-text">{{ viewRow.implStatus || $t("commonProsperity.status.dash") }}</span>
         </el-form-item>
         <el-form-item :label="cpT('viewOpImages')">
           <template v-if="viewOpImages.length">
@@ -319,9 +336,11 @@ export default {
         pageSize: 20,
         projectName: undefined,
         projectType: undefined,
+        implYear: undefined,
         publishStatus: undefined
       },
       form: {},
+      yearOptions: [],
       /** 运营图片 el-upload 展示列表 */
       opImageFileList: [],
       imageFileExts: ["jpg", "jpeg", "png"],
@@ -343,18 +362,14 @@ export default {
           { min: 1, max: 20, message: this.cpCommon("ruleLen120"), trigger: "blur" }
         ],
         projectType: [{ required: true, message: this.cpT("ruleProjectTypeRequired"), trigger: "change" }],
-        introduction: [
-          { required: true, message: this.cpT("ruleIntroRequired"), trigger: "blur" },
-          { min: 1, max: 50, message: this.cpCommon("ruleLen150"), trigger: "blur" }
-        ],
+        introduction: [{ max: 50, message: this.cpCommon("ruleLen50Optional"), trigger: "blur" }],
         projectContent: [
           { required: true, message: this.cpT("ruleContentRequired"), trigger: "blur" },
           { min: 1, max: 500, message: this.cpCommon("ruleLen1500"), trigger: "blur" }
         ],
-        implDateRange: [
-          { required: true, message: this.cpT("ruleImplDateRequired"), trigger: "change" },
-          { validator: this.validateImplDateRange, trigger: "change" }
-        ]
+        investmentAmount: [{ validator: this.validateInvestmentAmount, trigger: "blur" }],
+        implYear: [{ required: true, message: this.cpT("ruleImplYearRequired"), trigger: "change" }],
+        implStatus: [{ max: 500, message: this.cpCommon("ruleLen500Optional"), trigger: "blur" }]
       }
     },
     uploadAction() {
@@ -381,26 +396,35 @@ export default {
     }
   },
   created() {
+    this.buildYearOptions()
     this.getList()
   },
   methods: {
+    buildYearOptions() {
+      const current = new Date().getFullYear()
+      const years = []
+      for (let y = current; y >= current - 5; y--) {
+        years.push(y)
+      }
+      this.yearOptions = years
+    },
     typeLabel(val) {
       const item = this.projectTypeOptions.find((o) => o.value === val)
       return item ? item.label : ""
     },
-    implDateRangeText(row) {
-      if (row && row.implStartDate && row.implEndDate) {
-        return row.implStartDate + this.cpT("implRangeSeparator") + row.implEndDate
+    investmentAmountText(val) {
+      if (val === null || val === undefined || val === "") {
+        return this.$t("commonProsperity.status.dash")
       }
-      return this.$t("commonProsperity.status.dash")
+      return val + " " + this.cpCommon("unitWanYuan")
     },
-    validateImplDateRange(rule, value, callback) {
-      if (!value || value.length !== 2 || !value[0] || !value[1]) {
-        callback(new Error(this.cpT("ruleImplDateRequired")))
+    validateInvestmentAmount(rule, value, callback) {
+      if (value === null || value === undefined || value === "") {
+        callback()
         return
       }
-      if (value[0] > value[1]) {
-        callback(new Error(this.cpCommon("ruleImplEndBeforeStart")))
+      if (Number(value) < 0) {
+        callback(new Error(this.cpCommon("ruleNonNegativeNumber")))
         return
       }
       callback()
@@ -435,6 +459,7 @@ export default {
     resetQuery() {
       this.queryParams.projectName = undefined
       this.queryParams.projectType = undefined
+      this.queryParams.implYear = undefined
       this.queryParams.publishStatus = undefined
       this.resetForm("queryForm")
       this.handleQuery()
@@ -446,7 +471,9 @@ export default {
         projectType: undefined,
         introduction: undefined,
         projectContent: undefined,
-        implDateRange: null,
+        investmentAmount: undefined,
+        implYear: new Date().getFullYear(),
+        implStatus: undefined,
         videoFileUrl: undefined,
         videoFilePath: undefined,
         coverFileUrl: undefined,
@@ -495,7 +522,9 @@ export default {
           projectType: data.projectType,
           introduction: data.introduction,
           projectContent: data.projectContent,
-          implDateRange: data.implStartDate && data.implEndDate ? [data.implStartDate, data.implEndDate] : null,
+          investmentAmount: data.investmentAmount,
+          implYear: data.implYear,
+          implStatus: data.implStatus,
           videoFileUrl: data.videoFileUrl,
           videoFilePath: data.videoFilePath,
           coverFileUrl: data.coverFileUrl,
@@ -661,13 +690,16 @@ export default {
     },
     buildSubmitPayload() {
       this.syncOpImagesFromFileList()
+      const intro = this.form.introduction != null ? String(this.form.introduction).trim() : ""
+      const implStatus = this.form.implStatus != null ? String(this.form.implStatus).trim() : ""
       return {
         projectName: this.form.projectName,
         projectType: this.form.projectType,
-        introduction: this.form.introduction,
+        introduction: intro || undefined,
         projectContent: this.form.projectContent,
-        implStartDate: this.form.implDateRange[0],
-        implEndDate: this.form.implDateRange[1],
+        investmentAmount: this.form.investmentAmount,
+        implYear: this.form.implYear,
+        implStatus: implStatus || undefined,
         operationImages: this.form.operationImages || [],
         videoFileUrl: this.form.videoFileUrl,
         videoFilePath: this.form.videoFilePath,
@@ -742,4 +774,8 @@ export default {
   white-space: pre-wrap;
   word-break: break-word;
 }
+.form-unit {
+  margin-left: 8px;
+  color: #606266;
+}
 </style>

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

@@ -168,6 +168,10 @@
               </el-select>
             </el-form-item>
           </el-col>
+        </el-row>
+
+        <div class="cd-section-title">{{ dmT("sectionCooperativeInfo") }}</div>
+        <el-row :gutter="16">
           <el-col :span="12">
             <el-form-item prop="cooperativeName" :rules="formRules.cooperativeName">
               <template slot="label">{{ dmT("formCooperativeName") }}</template>
@@ -233,8 +237,8 @@
             <el-form-item>
               <template slot="label">{{ dmT("formLivestockShareTotal") }}</template>
               <div class="dm-input-with-unit">
-                <el-input :value="livestockShareTotalDisplay" disabled class="dm-input-with-unit__input" />
-                <span class="dm-input-with-unit__suffix">{{ dmT("unitHead") }}</span>
+                <el-input-number :value="livestockShareTotalDisplay" :controls="false" disabled class="dm-input-with-unit__input" />
+                <span class="dm-input-with-unit__suffix">{{ dmT("unitHeadSheepHorse") }}</span>
               </div>
             </el-form-item>
           </el-col>
@@ -292,9 +296,9 @@
           </el-col>
         </el-row>
 
-        <div class="cd-section-title">{{ dmT("sectionEmploymentLivestock") }}</div>
+        <div class="cd-section-title">{{ dmT("sectionEmployment") }}</div>
         <el-row :gutter="16">
-          <el-col v-for="field in employmentLivestockFields" :key="field.prop" :span="12">
+          <el-col v-for="field in employmentFields" :key="field.prop" :span="12">
             <el-form-item :prop="field.prop" :rules="field.type === 'decimal' ? formRules.decimal : formRules.count">
               <template slot="label">{{ dmT(field.labelKey) }}</template>
               <div class="dm-input-with-unit">
@@ -312,9 +316,49 @@
           </el-col>
         </el-row>
 
-        <div class="cd-section-title">{{ dmT("sectionProductTraining") }}</div>
+        <div class="cd-section-title">{{ dmT("sectionLivestockInout") }}</div>
+        <el-row :gutter="16">
+          <el-col v-for="field in livestockInoutFields" :key="field.prop" :span="12">
+            <el-form-item :prop="field.prop" :rules="formRules.count">
+              <template slot="label">{{ dmT(field.labelKey) }}</template>
+              <div class="dm-input-with-unit">
+                <el-input-number
+                  v-model="form[field.prop]"
+                  :min="0"
+                  :precision="0"
+                  :controls="true"
+                  controls-position="right"
+                  class="dm-input-with-unit__input"
+                />
+                <span class="dm-input-with-unit__suffix">{{ dmT(field.unitKey) }}</span>
+              </div>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <div class="cd-section-title">{{ dmT("sectionProductCert") }}</div>
+        <el-row :gutter="16">
+          <el-col v-for="field in productCertFields" :key="field.prop" :span="12">
+            <el-form-item :prop="field.prop" :rules="formRules.count">
+              <template slot="label">{{ dmT(field.labelKey) }}</template>
+              <div class="dm-input-with-unit">
+                <el-input-number
+                  v-model="form[field.prop]"
+                  :min="0"
+                  :precision="0"
+                  :controls="true"
+                  controls-position="right"
+                  class="dm-input-with-unit__input"
+                />
+                <span class="dm-input-with-unit__suffix">{{ dmT(field.unitKey) }}</span>
+              </div>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <div class="cd-section-title">{{ dmT("sectionTraining") }}</div>
         <el-row :gutter="16">
-          <el-col v-for="field in productTrainingFields" :key="field.prop" :span="12">
+          <el-col v-for="field in trainingFields" :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">
@@ -345,6 +389,8 @@
             <el-radio v-for="item in businessModelOptions" :key="item" :label="item">{{ item }}</el-radio>
           </el-radio-group>
         </el-form-item>
+
+        <div class="cd-section-title">{{ dmT("sectionOperationStatus") }}</div>
         <el-form-item>
           <template slot="label">{{ dmT("formOperationStatus") }}</template>
           <el-radio-group v-model="form.operationStatus">
@@ -363,7 +409,8 @@
     </el-dialog>
 
     <el-dialog :title="dmCommon('viewTitle')" :visible.sync="viewOpen" width="980px" append-to-body>
-      <el-form label-width="150px" size="small">
+      <el-form class="dm-view-form" label-width="150px" size="small">
+        <div class="cd-section-title">{{ dmT("sectionBasic") }}</div>
         <el-row :gutter="16">
           <el-col :span="12">
             <el-form-item :label="dmT('formStatYear')">
@@ -385,6 +432,10 @@
               <span>{{ viewRow.villageName || dash }}</span>
             </el-form-item>
           </el-col>
+        </el-row>
+
+        <div class="cd-section-title">{{ dmT("sectionCooperativeInfo") }}</div>
+        <el-row :gutter="16">
           <el-col :span="12">
             <el-form-item :label="dmT('formCooperativeName')">
               <span>{{ viewRow.cooperativeName || dash }}</span>
@@ -400,11 +451,84 @@
               <span>{{ viewRow.establishDate || dash }}</span>
             </el-form-item>
           </el-col>
-          <el-col v-for="field in allViewFields" :key="'v-' + field.prop" :span="12">
+          <el-col v-for="field in basicDecimalFields" :key="'vc-' + field.prop" :span="12">
+            <el-form-item :label="dmT(field.labelKey)">
+              <span>{{ formatWithUnit(formatDecimal(viewRow[field.prop]), field.unitKey) }}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <div class="cd-section-title">{{ dmT("sectionMemberShare") }}</div>
+        <el-row :gutter="16">
+          <el-col v-for="field in memberCountFields" :key="'vm-' + 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 :span="12">
+            <el-form-item :label="dmT('formLivestockShareTotal')">
+              <span>{{ formatWithUnit(formatCount(livestockShareTotalOf(viewRow)), "unitHeadSheepHorse") }}</span>
+            </el-form-item>
+          </el-col>
+          <el-col v-for="field in shareDecimalFields" :key="'vsd-' + field.prop" :span="12">
+            <el-form-item :label="dmT(field.labelKey)">
+              <span>{{ formatWithUnit(formatDecimal(viewRow[field.prop]), field.unitKey) }}</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="dmT('formLaborShareCount')">
+              <span>{{ formatWithUnit(formatCount(viewRow.laborShareCount), "unitPerson") }}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <div class="cd-section-title">{{ dmT("sectionBenefit") }}</div>
+        <el-row :gutter="16">
+          <el-col v-for="field in benefitDecimalFields" :key="'vb-' + field.prop" :span="12">
+            <el-form-item :label="dmT(field.labelKey)">
+              <span>{{ formatWithUnit(formatDecimal(viewRow[field.prop]), field.unitKey) }}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <div class="cd-section-title">{{ dmT("sectionEmployment") }}</div>
+        <el-row :gutter="16">
+          <el-col v-for="field in employmentFields" :key="'ve-' + field.prop" :span="12">
             <el-form-item :label="dmT(field.labelKey)">
               <span>{{ formatWithUnit(field.type === 'decimal' ? formatDecimal(viewRow[field.prop]) : formatCount(viewRow[field.prop]), field.unitKey) }}</span>
             </el-form-item>
           </el-col>
+        </el-row>
+
+        <div class="cd-section-title">{{ dmT("sectionLivestockInout") }}</div>
+        <el-row :gutter="16">
+          <el-col v-for="field in livestockInoutFields" :key="'vl-' + 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-row>
+
+        <div class="cd-section-title">{{ dmT("sectionProductCert") }}</div>
+        <el-row :gutter="16">
+          <el-col v-for="field in productCertFields" :key="'vp-' + 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-row>
+
+        <div class="cd-section-title">{{ dmT("sectionTraining") }}</div>
+        <el-row :gutter="16">
+          <el-col v-for="field in trainingFields" :key="'vt-' + 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-row>
+
+        <div class="cd-section-title">{{ dmT("sectionOperation") }}</div>
+        <el-row :gutter="16">
           <el-col :span="24">
             <el-form-item :label="dmT('formBusinessScope')">
               <span class="cd-view-text">{{ viewRow.businessScope || dash }}</span>
@@ -415,6 +539,10 @@
               <span>{{ viewRow.businessModel || dash }}</span>
             </el-form-item>
           </el-col>
+        </el-row>
+
+        <div class="cd-section-title">{{ dmT("sectionOperationStatus") }}</div>
+        <el-row :gutter="16">
           <el-col :span="12">
             <el-form-item :label="dmT('formOperationStatus')">
               <span>{{ viewRow.operationStatus || dash }}</span>
@@ -564,67 +692,41 @@ const BENEFIT_DECIMAL_FIELDS = [
   { prop: "lossAmount", labelKey: "formLossAmount", unitKey: "unitWanYuan" }
 ]
 
-const EMPLOYMENT_LIVESTOCK_FIELDS = [
+const EMPLOYMENT_FIELDS = [
   { prop: "collegeGraduateCount", labelKey: "formCollegeGraduateCount", unitKey: "unitPerson", type: "count" },
   { prop: "collegeGraduateWage", labelKey: "formCollegeGraduateWage", unitKey: "unitWanYuan", type: "decimal" },
   { prop: "farmerTransferEmploymentCount", labelKey: "formFarmerTransferEmploymentCount", unitKey: "unitPerson", type: "count" },
-  { prop: "farmerTransferWage", labelKey: "formFarmerTransferWage", unitKey: "unitWanYuan", type: "decimal" },
+  { prop: "farmerTransferWage", labelKey: "formFarmerTransferWage", unitKey: "unitWanYuan", type: "decimal" }
+]
+
+const LIVESTOCK_INOUT_FIELDS = [
   { prop: "cattleInventoryCount", labelKey: "formCattleInventoryCount", unitKey: "unitHead", type: "count" },
   { prop: "cattleOutboundCount", labelKey: "formCattleOutboundCount", unitKey: "unitHead", type: "count" },
   { prop: "sheepInventoryCount", labelKey: "formSheepInventoryCount", unitKey: "unitHead", type: "count" },
   { prop: "sheepOutboundCount", labelKey: "formSheepOutboundCount", unitKey: "unitHead", type: "count" }
 ]
 
-const PRODUCT_TRAINING_FIELDS = [
+const PRODUCT_CERT_FIELDS = [
   { prop: "trademarkProductCount", labelKey: "formTrademarkProductCount", unitKey: "unitGe" },
-  { prop: "qualityCertProductCount", labelKey: "formQualityCertProductCount", unitKey: "unitGe" },
+  { prop: "qualityCertProductCount", labelKey: "formQualityCertProductCount", unitKey: "unitGe" }
+]
+
+const TRAINING_FIELDS = [
   { prop: "trainingManageCount", labelKey: "formTrainingManageCount", unitKey: "unitPerson" },
   { prop: "trainingSkillCount", labelKey: "formTrainingSkillCount", unitKey: "unitPerson" },
   { prop: "trainingOtherCount", labelKey: "formTrainingOtherCount", unitKey: "unitPerson" }
 ]
 
-const VIEW_EXTRA_FIELDS = [
-  { prop: "registeredCapital", labelKey: "formRegisteredCapital", type: "decimal", unitKey: "unitWanYuan" },
-  { prop: "yearEndTotalAssets", labelKey: "formYearEndTotalAssets", type: "decimal", unitKey: "unitWanYuan" },
-  { prop: "memberHouseholdCount", labelKey: "formMemberHouseholdCount", type: "count", unitKey: "unitHousehold" },
-  { prop: "memberPopulationCount", labelKey: "formMemberPopulationCount", type: "count", unitKey: "unitPerson" },
-  { prop: "povertyMonitorCount", labelKey: "formPovertyMonitorCount", type: "count", unitKey: "unitPerson" },
-  { prop: "cattleShareCount", labelKey: "formCattleShareCount", type: "count", unitKey: "unitHead" },
-  { prop: "sheepShareCount", labelKey: "formSheepShareCount", type: "count", unitKey: "unitHead" },
-  { prop: "livestockShareTotal", labelKey: "formLivestockShareTotal", type: "count", unitKey: "unitHead" },
-  { prop: "grasslandShareArea", labelKey: "formGrasslandShareArea", type: "decimal", unitKey: "unitWanMu" },
-  { prop: "laborShareCount", labelKey: "formLaborShareCount", type: "count", unitKey: "unitPerson" },
-  { prop: "cashShareAmount", labelKey: "formCashShareAmount", type: "decimal", unitKey: "unitWanYuan" },
-  { prop: "otherShareAmount", labelKey: "formOtherShareAmount", type: "decimal", unitKey: "unitWanYuan" },
-  { prop: "totalIncome", labelKey: "formTotalIncome", type: "decimal", unitKey: "unitWanYuan" },
-  { prop: "netIncome", labelKey: "formNetIncome", type: "decimal", unitKey: "unitWanYuan" },
-  { prop: "cashDividend", labelKey: "formCashDividend", type: "decimal", unitKey: "unitWanYuan" },
-  { prop: "inKindDividend", labelKey: "formInKindDividend", type: "decimal", unitKey: "unitWanYuan" },
-  { prop: "revolvingFund", labelKey: "formRevolvingFund", type: "decimal", unitKey: "unitWanYuan" },
-  { prop: "lossAmount", labelKey: "formLossAmount", type: "decimal", unitKey: "unitWanYuan" },
-  { prop: "collegeGraduateCount", labelKey: "formCollegeGraduateCount", type: "count", unitKey: "unitPerson" },
-  { prop: "collegeGraduateWage", labelKey: "formCollegeGraduateWage", type: "decimal", unitKey: "unitWanYuan" },
-  { prop: "farmerTransferEmploymentCount", labelKey: "formFarmerTransferEmploymentCount", type: "count", unitKey: "unitPerson" },
-  { prop: "farmerTransferWage", labelKey: "formFarmerTransferWage", type: "decimal", unitKey: "unitWanYuan" },
-  { prop: "cattleInventoryCount", labelKey: "formCattleInventoryCount", type: "count", unitKey: "unitHead" },
-  { prop: "cattleOutboundCount", labelKey: "formCattleOutboundCount", type: "count", unitKey: "unitHead" },
-  { prop: "sheepInventoryCount", labelKey: "formSheepInventoryCount", type: "count", unitKey: "unitHead" },
-  { prop: "sheepOutboundCount", labelKey: "formSheepOutboundCount", type: "count", unitKey: "unitHead" },
-  { prop: "trademarkProductCount", labelKey: "formTrademarkProductCount", type: "count", unitKey: "unitGe" },
-  { prop: "qualityCertProductCount", labelKey: "formQualityCertProductCount", type: "count", unitKey: "unitGe" },
-  { prop: "trainingManageCount", labelKey: "formTrainingManageCount", type: "count", unitKey: "unitPerson" },
-  { prop: "trainingSkillCount", labelKey: "formTrainingSkillCount", type: "count", unitKey: "unitPerson" },
-  { prop: "trainingOtherCount", labelKey: "formTrainingOtherCount", type: "count", unitKey: "unitPerson" }
-]
-
 const NUMERIC_PROPS = [
   ...BASIC_DECIMAL_FIELDS.map((f) => f.prop),
   ...MEMBER_COUNT_FIELDS.map((f) => f.prop),
   ...SHARE_DECIMAL_FIELDS.map((f) => f.prop),
   "laborShareCount",
   ...BENEFIT_DECIMAL_FIELDS.map((f) => f.prop),
-  ...EMPLOYMENT_LIVESTOCK_FIELDS.map((f) => f.prop),
-  ...PRODUCT_TRAINING_FIELDS.map((f) => f.prop)
+  ...EMPLOYMENT_FIELDS.map((f) => f.prop),
+  ...LIVESTOCK_INOUT_FIELDS.map((f) => f.prop),
+  ...PRODUCT_CERT_FIELDS.map((f) => f.prop),
+  ...TRAINING_FIELDS.map((f) => f.prop)
 ]
 
 function getCurrentYearMonth() {
@@ -736,9 +838,10 @@ export default {
       memberCountFields: MEMBER_COUNT_FIELDS,
       shareDecimalFields: SHARE_DECIMAL_FIELDS,
       benefitDecimalFields: BENEFIT_DECIMAL_FIELDS,
-      employmentLivestockFields: EMPLOYMENT_LIVESTOCK_FIELDS,
-      productTrainingFields: PRODUCT_TRAINING_FIELDS,
-      allViewFields: VIEW_EXTRA_FIELDS,
+      employmentFields: EMPLOYMENT_FIELDS,
+      livestockInoutFields: LIVESTOCK_INOUT_FIELDS,
+      productCertFields: PRODUCT_CERT_FIELDS,
+      trainingFields: TRAINING_FIELDS,
       viewRow: {},
       importForm: {
         statYear: undefined,
@@ -847,6 +950,15 @@ export default {
       }
       return this.dmT("statMonthLabel", { month })
     },
+    livestockShareTotalOf(row) {
+      if (!row) {
+        return 0
+      }
+      if (row.livestockShareTotal != null && row.livestockShareTotal !== "") {
+        return row.livestockShareTotal
+      }
+      return safeInt(row.cattleShareCount) + safeInt(row.sheepShareCount)
+    },
     formatCount(val) {
       if (val == null || val === "") {
         return this.dash

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

@@ -61,7 +61,8 @@
     </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 :key="formKey" ref="form" :model="form" label-width="140px" size="small">
+        <div class="di-section-title">{{ dmT("sectionRuralResident") }}</div>
         <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">
@@ -97,13 +98,18 @@
         </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%"
-          />
+          <div class="dm-input-with-unit">
+            <el-input
+              v-model="form.incomeGrowthRate"
+              :placeholder="dmT('phIncomeGrowthRate')"
+              clearable
+              class="dm-input-with-unit__input"
+            />
+            <span class="dm-input-with-unit__suffix">{{ dmT("unitPercent") }}</span>
+          </div>
         </el-form-item>
+
+        <div class="di-section-title">{{ dmT("sectionPovertyPopulation") }}</div>
         <el-form-item prop="povertyNetIncome" :rules="formRules.povertyNetIncome">
           <template slot="label">{{ dmT("formPovertyNetIncome") }}</template>
           <div class="dm-input-with-unit">
@@ -130,7 +136,8 @@
     </el-dialog>
 
     <el-dialog :title="dmCommon('viewTitle')" :visible.sync="viewOpen" width="640px" append-to-body>
-      <el-form label-width="180px" size="small">
+      <el-form class="dm-view-form" label-width="140px" size="small">
+        <div class="di-section-title">{{ dmT("sectionRuralResident") }}</div>
         <el-form-item :label="dmT('formStatYear')">
           <span>{{ viewRow.statYear || dash }}</span>
         </el-form-item>
@@ -143,6 +150,8 @@
         <el-form-item :label="dmT('formIncomeGrowthRate')">
           <span>{{ formatGrowthRate(viewRow.incomeGrowthRate) }}</span>
         </el-form-item>
+
+        <div class="di-section-title">{{ dmT("sectionPovertyPopulation") }}</div>
         <el-form-item :label="dmT('formPovertyNetIncome')">
           <span>{{ formatWithUnit(formatMoney(viewRow.povertyNetIncome), "unitYuan") }}</span>
         </el-form-item>
@@ -297,7 +306,7 @@ export default {
       }
       return n.toFixed(2)
     },
-    /** 列表/详情：库中 null 显示为 0.00%；小数转百分比 */
+    /** 列表/详情：库中 null 显示为 0.00%；按库值直接展示百分比（不再 ×100） */
     formatGrowthRate(val) {
       if (val == null || val === "") {
         return "0.00%"
@@ -306,7 +315,7 @@ export default {
       if (!Number.isFinite(n)) {
         return "0.00%"
       }
-      return (n * 100).toFixed(2) + "%"
+      return n.toFixed(2) + "%"
     },
     validateNonNegativeMoney(rule, value, callback) {
       if (value == null || value === "") {
@@ -482,6 +491,11 @@ export default {
 </script>
 
 <style scoped>
+.di-section-title {
+  margin: 4px 0 12px;
+  font-weight: 600;
+  color: #303133;
+}
 .di-view-text {
   white-space: pre-wrap;
   word-break: break-all;

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

@@ -108,7 +108,7 @@
     </el-card>
 
     <el-dialog :title="dialogTitle" :visible.sync="open" width="980px" append-to-body @close="cancel">
-      <el-form :key="formKey" ref="form" :model="form" label-width="168px" size="small">
+      <el-form :key="formKey" ref="form" :model="form" class="fr-form" label-width="220px" size="small">
         <div class="fr-section-title">{{ dmT("sectionBasic") }}</div>
         <el-row :gutter="16">
           <el-col :span="12">
@@ -146,6 +146,10 @@
               </el-select>
             </el-form-item>
           </el-col>
+        </el-row>
+
+        <div class="fr-section-title">{{ dmT("sectionRanchInfo") }}</div>
+        <el-row :gutter="16">
           <el-col :span="12">
             <el-form-item prop="enterpriseName" :rules="formRules.enterpriseName">
               <template slot="label">{{ dmT("formEnterpriseName") }}</template>
@@ -213,7 +217,7 @@
 
         <div class="fr-section-title">{{ dmT("sectionStock") }}</div>
         <el-row :gutter="16">
-          <el-col v-for="field in stockCountFields" :key="field.prop" :span="12">
+          <el-col v-for="field in stockInventoryFields" :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">
@@ -232,8 +236,36 @@
             <el-form-item>
               <template slot="label">{{ dmT("formStockSubtotal") }}</template>
               <div class="dm-input-with-unit">
-                <el-input :value="stockSubtotalDisplay" disabled class="dm-input-with-unit__input" />
-                <span class="dm-input-with-unit__suffix">{{ dmT("unitHead") }}</span>
+                <el-input-number :value="stockSubtotalDisplay" :controls="false" disabled class="dm-input-with-unit__input" />
+                <span class="dm-input-with-unit__suffix">{{ dmT("unitHeadSheepHorse") }}</span>
+              </div>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <div class="fr-section-title">{{ dmT("sectionOutbound") }}</div>
+        <el-row :gutter="16">
+          <el-col v-for="field in stockOutboundFields" :key="field.prop" :span="12">
+            <el-form-item :prop="field.prop" :rules="formRules.count">
+              <template slot="label">{{ dmT(field.labelKey) }}</template>
+              <div class="dm-input-with-unit">
+                <el-input-number
+                  v-model="form[field.prop]"
+                  :min="0"
+                  :precision="0"
+                  controls-position="right"
+                  class="dm-input-with-unit__input"
+                />
+                <span class="dm-input-with-unit__suffix">{{ dmT(field.unitKey) }}</span>
+              </div>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item>
+              <template slot="label">{{ dmT("formOutboundSubtotal") }}</template>
+              <div class="dm-input-with-unit">
+                <el-input-number :value="outboundSubtotalDisplay" :controls="false" disabled class="dm-input-with-unit__input" />
+                <span class="dm-input-with-unit__suffix">{{ dmT("unitHeadSheepHorse") }}</span>
               </div>
             </el-form-item>
           </el-col>
@@ -302,6 +334,18 @@
               </div>
             </el-form-item>
           </el-col>
+        </el-row>
+
+        <div class="fr-section-title">{{ dmT("sectionSubsidy") }}</div>
+        <el-row :gutter="16">
+          <el-col :span="12">
+            <el-form-item prop="hasSubsidy">
+              <template slot="label">{{ dmT("formHasSubsidy") }}</template>
+              <el-radio-group v-model="form.hasSubsidy">
+                <el-radio v-for="item in yesNoOptions" :key="'hs-' + item" :label="item">{{ item }}</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
           <el-col :span="12">
             <el-form-item prop="subsidyYear">
               <template slot="label">{{ dmT("formSubsidyYear") }}</template>
@@ -315,14 +359,6 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item prop="hasSubsidy">
-              <template slot="label">{{ dmT("formHasSubsidy") }}</template>
-              <el-radio-group v-model="form.hasSubsidy">
-                <el-radio v-for="item in yesNoOptions" :key="'hs-' + item" :label="item">{{ item }}</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
           <el-col :span="12">
             <el-form-item prop="subsidyAmount" :rules="formRules.decimal">
               <template slot="label">{{ dmT("formSubsidyAmount") }}</template>
@@ -393,8 +429,9 @@
     </el-dialog>
 
     <el-dialog :title="dmCommon('viewTitle')" :visible.sync="viewOpen" width="980px" append-to-body>
-      <el-form label-width="168px" size="small">
-        <el-row :gutter="16">
+      <el-form class="dm-view-form fr-form" label-width="220px" size="small">
+        <div class="fr-section-title">{{ dmT("sectionBasic") }}</div>
+        <el-row :gutter="8">
           <el-col :span="12">
             <el-form-item :label="dmT('formStatYear')"><span>{{ viewRow.statYear || dash }}</span></el-form-item>
           </el-col>
@@ -407,9 +444,132 @@
           <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 viewFields" :key="'v-' + field.prop" :span="12">
+        </el-row>
+
+        <div class="fr-section-title">{{ dmT("sectionRanchInfo") }}</div>
+        <el-row :gutter="8">
+          <el-col :span="12">
+            <el-form-item :label="dmT('formEnterpriseName')"><span>{{ viewRow.enterpriseName || dash }}</span></el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="dmT('formLegalRepresentative')"><span>{{ viewRow.legalRepresentative || dash }}</span></el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="dmT('formEnterpriseType')"><span>{{ viewRow.enterpriseType || dash }}</span></el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="dmT('formRegisteredCapital')">
+              <span>{{ formatWithUnit(formatDecimal(viewRow.registeredCapital), "unitWanYuan") }}</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="dmT('formEstablishDate')"><span>{{ viewRow.establishDate || dash }}</span></el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="dmT('formLivestockLaborCount')">
+              <span>{{ formatWithUnit(formatCount(viewRow.livestockLaborCount), "unitPerson") }}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <div class="fr-section-title">{{ dmT("sectionStock") }}</div>
+        <el-row :gutter="8">
+          <el-col v-for="field in stockInventoryFields" :key="'vs-' + field.prop" :span="12">
             <el-form-item :label="dmT(field.labelKey)">
-              <span>{{ formatViewField(viewRow, field) }}</span>
+              <span>{{ formatWithUnit(formatCount(viewRow[field.prop]), field.unitKey) }}</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="dmT('formStockSubtotal')">
+              <span>{{ formatWithUnit(formatCount(stockSubtotalOf(viewRow)), "unitHeadSheepHorse") }}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <div class="fr-section-title">{{ dmT("sectionOutbound") }}</div>
+        <el-row :gutter="8">
+          <el-col v-for="field in stockOutboundFields" :key="'vo-' + 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 :span="12">
+            <el-form-item :label="dmT('formOutboundSubtotal')">
+              <span>{{ formatWithUnit(formatCount(outboundSubtotalOf(viewRow)), "unitHeadSheepHorse") }}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <div class="fr-section-title">{{ dmT("sectionGrassland") }}</div>
+        <el-row :gutter="8">
+          <el-col v-for="field in grasslandDecimalFields" :key="'vg-' + field.prop" :span="12">
+            <el-form-item :label="dmT(field.labelKey)">
+              <span>{{ formatWithUnit(formatDecimal(viewRow[field.prop]), field.unitKey) }}</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="dmT('formGrasslandAreaSubtotal')">
+              <span>{{ formatWithUnit(formatDecimal(grasslandAreaSubtotalOf(viewRow)), "unitMu") }}</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="dmT('formIsGrassBalanced')"><span>{{ viewRow.isGrassBalanced || dash }}</span></el-form-item>
+          </el-col>
+        </el-row>
+
+        <div class="fr-section-title">{{ dmT("sectionFinance") }}</div>
+        <el-row :gutter="8">
+          <el-col :span="12">
+            <el-form-item :label="dmT('formIncome')">
+              <span>{{ formatWithUnit(formatDecimal(viewRow.income), "unitWanYuan") }}</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="dmT('formExpense')">
+              <span>{{ formatWithUnit(formatDecimal(viewRow.expense), "unitWanYuan") }}</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="dmT('formProfit')">
+              <span>{{ formatWithUnit(formatDecimal(viewRow.profit), "unitWanYuan") }}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <div class="fr-section-title">{{ dmT("sectionSubsidy") }}</div>
+        <el-row :gutter="8">
+          <el-col :span="12">
+            <el-form-item :label="dmT('formHasSubsidy')"><span>{{ viewRow.hasSubsidy || dash }}</span></el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="dmT('formSubsidyYear')"><span>{{ viewRow.subsidyYear || dash }}</span></el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="dmT('formSubsidyAmount')">
+              <span>{{ formatWithUnit(formatDecimal(viewRow.subsidyAmount), "unitWanYuan") }}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <div class="fr-section-title">{{ dmT("sectionOther") }}</div>
+        <el-row :gutter="8">
+          <el-col :span="12">
+            <el-form-item :label="dmT('formHasTrademark')"><span>{{ viewRow.hasTrademark || dash }}</span></el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="dmT('formHasQualityCert')"><span>{{ viewRow.hasQualityCert || dash }}</span></el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="dmT('formSalesChannel')"><span>{{ viewRow.salesChannel || dash }}</span></el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="dmT('formDrivenPopulation')">
+              <span>{{ formatWithUnit(formatCount(viewRow.drivenPopulation), "unitPerson") }}</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="dmT('formWagePaid')">
+              <span>{{ formatWithUnit(formatDecimal(viewRow.wagePaid), "unitWanYuan") }}</span>
             </el-form-item>
           </el-col>
           <el-col :span="24">
@@ -514,11 +674,14 @@ const YES_NO_OPTIONS = ["是", "否"]
 const DEFAULT_ENTERPRISE_TYPE = "个体工商户"
 const DEFAULT_SALES_CHANNEL = "其他"
 
-const STOCK_COUNT_FIELDS = [
+const STOCK_INVENTORY_FIELDS = [
   { prop: "cattleYearEndStock", labelKey: "formCattleYearEndStock", unitKey: "unitHead" },
   { prop: "cattleBreedingFemaleStock", labelKey: "formCattleBreedingFemaleStock", unitKey: "unitHead" },
   { prop: "sheepYearEndStock", labelKey: "formSheepYearEndStock", unitKey: "unitHead" },
-  { prop: "sheepBreedingFemaleStock", labelKey: "formSheepBreedingFemaleStock", unitKey: "unitHead" },
+  { prop: "sheepBreedingFemaleStock", labelKey: "formSheepBreedingFemaleStock", unitKey: "unitHead" }
+]
+
+const STOCK_OUTBOUND_FIELDS = [
   { prop: "cattleOutbound", labelKey: "formCattleOutbound", unitKey: "unitHead" },
   { prop: "sheepOutbound", labelKey: "formSheepOutbound", unitKey: "unitHead" }
 ]
@@ -532,7 +695,8 @@ const GRASSLAND_DECIMAL_FIELDS = [
 
 const COUNT_PROPS = [
   "livestockLaborCount",
-  ...STOCK_COUNT_FIELDS.map((f) => f.prop),
+  ...STOCK_INVENTORY_FIELDS.map((f) => f.prop),
+  ...STOCK_OUTBOUND_FIELDS.map((f) => f.prop),
   "drivenPopulation"
 ]
 
@@ -545,39 +709,6 @@ const DECIMAL_PROPS = [
   "wagePaid"
 ]
 
-const VIEW_FIELDS = [
-  { prop: "enterpriseName", labelKey: "formEnterpriseName", type: "text" },
-  { prop: "legalRepresentative", labelKey: "formLegalRepresentative", type: "text" },
-  { prop: "enterpriseType", labelKey: "formEnterpriseType", type: "text" },
-  { prop: "registeredCapital", labelKey: "formRegisteredCapital", type: "decimal", unitKey: "unitWanYuan" },
-  { prop: "establishDate", labelKey: "formEstablishDate", type: "text" },
-  { prop: "livestockLaborCount", labelKey: "formLivestockLaborCount", type: "count", unitKey: "unitPerson" },
-  { prop: "cattleYearEndStock", labelKey: "formCattleYearEndStock", type: "count", unitKey: "unitHead" },
-  { prop: "cattleBreedingFemaleStock", labelKey: "formCattleBreedingFemaleStock", type: "count", unitKey: "unitHead" },
-  { prop: "sheepYearEndStock", labelKey: "formSheepYearEndStock", type: "count", unitKey: "unitHead" },
-  { prop: "sheepBreedingFemaleStock", labelKey: "formSheepBreedingFemaleStock", type: "count", unitKey: "unitHead" },
-  { prop: "cattleOutbound", labelKey: "formCattleOutbound", type: "count", unitKey: "unitHead" },
-  { prop: "sheepOutbound", labelKey: "formSheepOutbound", type: "count", unitKey: "unitHead" },
-  { prop: "stockSubtotal", labelKey: "formStockSubtotal", type: "count", unitKey: "unitHead" },
-  { prop: "grassBalanceArea", labelKey: "formGrassBalanceArea", type: "decimal", unitKey: "unitMu" },
-  { prop: "transferGrassArea", labelKey: "formTransferGrassArea", type: "decimal", unitKey: "unitMu" },
-  { prop: "grasslandAreaSubtotal", labelKey: "formGrasslandAreaSubtotal", type: "decimal", unitKey: "unitMu" },
-  { prop: "approvedCarryingCapacity", labelKey: "formApprovedCarryingCapacity", type: "decimal", unitKey: "unitHead" },
-  { prop: "yearEndStockSheepUnit", labelKey: "formYearEndStockSheepUnit", type: "decimal", unitKey: "unitHead" },
-  { prop: "isGrassBalanced", labelKey: "formIsGrassBalanced", type: "text" },
-  { prop: "income", labelKey: "formIncome", type: "decimal", unitKey: "unitWanYuan" },
-  { prop: "expense", labelKey: "formExpense", type: "decimal", unitKey: "unitWanYuan" },
-  { prop: "profit", labelKey: "formProfit", type: "decimal", unitKey: "unitWanYuan" },
-  { prop: "subsidyYear", labelKey: "formSubsidyYear", type: "count" },
-  { prop: "hasSubsidy", labelKey: "formHasSubsidy", type: "text" },
-  { prop: "subsidyAmount", labelKey: "formSubsidyAmount", type: "decimal", unitKey: "unitWanYuan" },
-  { prop: "hasTrademark", labelKey: "formHasTrademark", type: "text" },
-  { prop: "hasQualityCert", labelKey: "formHasQualityCert", type: "text" },
-  { prop: "salesChannel", labelKey: "formSalesChannel", type: "text" },
-  { prop: "drivenPopulation", labelKey: "formDrivenPopulation", type: "count", unitKey: "unitPerson" },
-  { prop: "wagePaid", labelKey: "formWagePaid", type: "decimal", unitKey: "unitWanYuan" }
-]
-
 function getCurrentYearMonth() {
   const now = new Date()
   return { statYear: now.getFullYear(), statMonth: now.getMonth() + 1 }
@@ -678,9 +809,9 @@ export default {
       enterpriseTypeOptions: ENTERPRISE_TYPE_OPTIONS,
       salesChannelOptions: SALES_CHANNEL_OPTIONS,
       yesNoOptions: YES_NO_OPTIONS,
-      stockCountFields: STOCK_COUNT_FIELDS,
+      stockInventoryFields: STOCK_INVENTORY_FIELDS,
+      stockOutboundFields: STOCK_OUTBOUND_FIELDS,
       grasslandDecimalFields: GRASSLAND_DECIMAL_FIELDS,
-      viewFields: VIEW_FIELDS,
       viewRow: {},
       importForm: { statYear: undefined, statMonth: undefined },
       exportForm: { statYear: undefined, statMonth: undefined, townDeptId: undefined },
@@ -705,6 +836,9 @@ export default {
     stockSubtotalDisplay() {
       return safeNum(this.form.cattleYearEndStock) + safeNum(this.form.sheepYearEndStock)
     },
+    outboundSubtotalDisplay() {
+      return safeNum(this.form.cattleOutbound) + safeNum(this.form.sheepOutbound)
+    },
     grasslandAreaSubtotalDisplay() {
       const n = safeNum(this.form.grassBalanceArea) + safeNum(this.form.transferGrassArea)
       return Number(n.toFixed(4))
@@ -813,6 +947,36 @@ export default {
       }
       return this.formatWithUnit(val, field.unitKey)
     },
+    stockSubtotalOf(row) {
+      if (!row) {
+        return 0
+      }
+      if (row.stockSubtotal != null && row.stockSubtotal !== "") {
+        return row.stockSubtotal
+      }
+      return safeNum(row.cattleYearEndStock) + safeNum(row.sheepYearEndStock)
+    },
+    outboundSubtotalOf(row) {
+      if (!row) {
+        return 0
+      }
+      if (row.outboundSubtotal != null && row.outboundSubtotal !== "") {
+        return row.outboundSubtotal
+      }
+      return safeNum(row.cattleOutbound) + safeNum(row.sheepOutbound)
+    },
+    grasslandAreaSubtotalOf(row) {
+      if (!row) {
+        return undefined
+      }
+      if (row.grasslandAreaSubtotal != null && row.grasslandAreaSubtotal !== "") {
+        return row.grasslandAreaSubtotal
+      }
+      if (row.grassBalanceArea == null && row.transferGrassArea == null) {
+        return undefined
+      }
+      return Number((safeNum(row.grassBalanceArea) + safeNum(row.transferGrassArea)).toFixed(4))
+    },
     isFutureStatPeriod(statYear, statMonth) {
       if (statYear == null || statMonth == null) {
         return false
@@ -1167,6 +1331,10 @@ export default {
   font-weight: 600;
   color: #303133;
 }
+.fr-form >>> .el-form-item__label {
+  white-space: nowrap;
+  line-height: 32px;
+}
 .fr-import-tip {
   margin: 0 0 12px;
   color: #909399;

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

@@ -106,6 +106,7 @@
 
     <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">
+        <div class="lpo-section-title">{{ dmT("sectionBasic") }}</div>
         <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%">
@@ -135,6 +136,8 @@
             />
           </el-select>
         </el-form-item>
+
+        <div class="lpo-section-title">{{ dmT("sectionOutput") }}</div>
         <el-form-item prop="meatOutput" :rules="formRules.decimal">
           <template slot="label">{{ dmT("formMeatOutput") }}</template>
           <div class="dm-input-with-unit">
@@ -175,7 +178,8 @@
     </el-dialog>
 
     <el-dialog :title="dmCommon('viewTitle')" :visible.sync="viewOpen" width="640px" append-to-body>
-      <el-form label-width="120px" size="small">
+      <el-form class="dm-view-form" label-width="120px" size="small">
+        <div class="lpo-section-title">{{ dmT("sectionBasic") }}</div>
         <el-form-item :label="dmT('formStatYear')">
           <span>{{ viewRow.statYear || dash }}</span>
         </el-form-item>
@@ -188,6 +192,8 @@
         <el-form-item :label="dmT('formVillage')">
           <span>{{ viewRow.villageName || dash }}</span>
         </el-form-item>
+
+        <div class="lpo-section-title">{{ dmT("sectionOutput") }}</div>
         <el-form-item :label="dmT('formMeatOutput')">
           <span>{{ formatWithUnit(formatOutput(viewRow.meatOutput), "unitWanTon") }}</span>
         </el-form-item>
@@ -810,6 +816,11 @@ export default {
 </script>
 
 <style scoped>
+.lpo-section-title {
+  margin: 4px 0 12px;
+  font-weight: 600;
+  color: #303133;
+}
 .lpo-import-tip {
   margin: 0 0 12px;
   color: #909399;

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

@@ -0,0 +1,834 @@
+<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:vaccinationData:add']"
+            type="primary"
+            plain
+            icon="el-icon-plus"
+            size="mini"
+            @click="handleAdd"
+          >{{ dmCommon("add") }}</el-button>
+          <el-button
+            v-hasPermi="['dataModel:vaccinationData:import']"
+            type="info"
+            plain
+            icon="el-icon-upload2"
+            size="mini"
+            @click="handleImportOpen"
+          >{{ dmT("btnImport") }}</el-button>
+          <el-button
+            v-hasPermi="['dataModel:vaccinationData: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="90" />
+        <el-table-column :label="dmT('colStatMonth')" align="center" width="80">
+          <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('colShouldVaccinateCount')" align="center" width="100">
+          <template slot-scope="scope">{{ formatCount(scope.row.shouldVaccinateCount) }}</template>
+        </el-table-column>
+        <el-table-column :label="dmT('colActualVaccinateCount')" align="center" width="100">
+          <template slot-scope="scope">{{ formatCount(scope.row.actualVaccinateCount) }}</template>
+        </el-table-column>
+        <el-table-column :label="dmT('colImmunityRate')" align="center" width="100">
+          <template slot-scope="scope">{{ formatImmunityRate(scope.row.immunityRate) }}</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:vaccinationData:query']" type="text" size="mini" @click="handleView(scope.row)">{{ dmCommon("view") }}</el-button>
+            <el-button v-hasPermi="['dataModel:vaccinationData:edit']" type="text" size="mini" @click="handleEdit(scope.row)">{{ dmCommon("edit") }}</el-button>
+            <el-button v-hasPermi="['dataModel:vaccinationData: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" class="vd-form" label-width="120px" size="small">
+        <div class="vd-section-title">{{ dmT("sectionBasic") }}</div>
+        <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>
+
+        <div class="vd-section-title">{{ dmT("sectionVaccination") }}</div>
+        <el-form-item prop="shouldVaccinateCount" :rules="formRules.count">
+          <template slot="label">{{ dmT("formShouldVaccinateCount") }}</template>
+          <div class="dm-input-with-unit">
+            <el-input-number
+              v-model="form.shouldVaccinateCount"
+              :min="0"
+              :precision="0"
+              controls-position="right"
+              class="dm-input-with-unit__input"
+              @change="onShouldCountChange"
+            />
+            <span class="dm-input-with-unit__suffix">{{ dmT("unitHead") }}</span>
+          </div>
+        </el-form-item>
+        <el-form-item prop="actualVaccinateCount" :rules="formRules.actualCount">
+          <template slot="label">{{ dmT("formActualVaccinateCount") }}</template>
+          <div class="dm-input-with-unit">
+            <el-input-number
+              v-model="form.actualVaccinateCount"
+              :min="0"
+              :precision="0"
+              controls-position="right"
+              class="dm-input-with-unit__input"
+            />
+            <span class="dm-input-with-unit__suffix">{{ dmT("unitHead") }}</span>
+          </div>
+        </el-form-item>
+        <el-form-item>
+          <template slot="label">{{ dmT("formImmunityRate") }}</template>
+          <el-input :value="immunityRateDisplay" disabled />
+        </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 class="dm-view-form vd-form" label-width="120px" size="small">
+        <div class="vd-section-title">{{ dmT("sectionBasic") }}</div>
+        <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>
+
+        <div class="vd-section-title">{{ dmT("sectionVaccination") }}</div>
+        <el-form-item :label="dmT('formShouldVaccinateCount')">
+          <span>{{ formatWithUnit(formatCount(viewRow.shouldVaccinateCount), "unitHead") }}</span>
+        </el-form-item>
+        <el-form-item :label="dmT('formActualVaccinateCount')">
+          <span>{{ formatWithUnit(formatCount(viewRow.actualVaccinateCount), "unitHead") }}</span>
+        </el-form-item>
+        <el-form-item :label="dmT('formImmunityRate')">
+          <span>{{ formatImmunityRate(viewRow.immunityRate) }}</span>
+        </el-form-item>
+        <el-form-item :label="dmT('formRemark')">
+          <span class="vd-view-text">{{ viewRow.remark || dash }}</span>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button v-hasPermi="['dataModel:vaccinationData: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="vd-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 {
+  listVaccinationData,
+  getVaccinationData,
+  addVaccinationData,
+  updateVaccinationData,
+  delVaccinationData,
+  listVaccinationDataYearOptions,
+  listVaccinationDataMonthOptions,
+  listVaccinationDataTownOptions,
+  listVaccinationDataVillageTree,
+  importVaccinationData,
+  downloadVaccinationDataTemplate,
+  exportVaccinationData
+} from "@/api/dataModel/vaccinationData"
+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,
+    shouldVaccinateCount: undefined,
+    actualVaccinateCount: undefined,
+    remark: undefined
+  }
+}
+
+function normalizeForm(data) {
+  const row = Object.assign(createEmptyForm(), data || {})
+  ;["shouldVaccinateCount", "actualVaccinateCount"].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,
+          label: townName ? `${townName} / ${villageName}` : villageName
+        })
+      })
+    })
+  })
+  return list
+}
+
+function calcImmunityRate(should, actual) {
+  if (should == null || should <= 0 || actual == null || actual === "") {
+    return null
+  }
+  const s = Number(should)
+  const a = Number(actual)
+  if (!Number.isFinite(s) || !Number.isFinite(a) || s <= 0) {
+    return null
+  }
+  return Math.round((a * 10000) / s) / 100
+}
+
+export default {
+  name: "VaccinationData",
+  mixins: [dataModelLocaleMixin],
+  data() {
+    return {
+      dmNs: "vaccinationData",
+      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")
+    },
+    immunityRateDisplay() {
+      const rate = calcImmunityRate(this.form.shouldVaccinateCount, this.form.actualVaccinateCount)
+      return this.formatImmunityRate(rate)
+    },
+    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" }],
+        count: [{ validator: this.validateOptionalCount, trigger: "change" }],
+        actualCount: [{ validator: this.validateActualCount, 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() {
+      listVaccinationDataYearOptions().then((res) => {
+        this.yearOptions = Array.isArray(res.data) ? res.data : []
+      })
+      listVaccinationDataMonthOptions().then((res) => {
+        if (Array.isArray(res.data) && res.data.length) {
+          this.monthOptions = res.data
+        }
+      })
+      listVaccinationDataTownOptions().then((res) => {
+        this.townOptions = Array.isArray(res.data) ? res.data : []
+      })
+      this.loadVillageTree()
+    },
+    loadVillageTree() {
+      return listVaccinationDataVillageTree()
+        .then((res) => {
+          const raw = res && res.data !== undefined ? res.data : res
+          this.villageOptions = flattenVillageOptions(Array.isArray(raw) ? raw : [])
+          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 })
+    },
+    formatCount(val) {
+      return val == null || val === "" ? this.dash : val
+    },
+    formatImmunityRate(rate) {
+      if (rate == null || rate === "") {
+        return this.dash
+      }
+      const n = Number(rate)
+      if (!Number.isFinite(n)) {
+        return this.dash
+      }
+      return `${n.toFixed(2)}%`
+    },
+    isFutureStatPeriod(statYear, statMonth) {
+      if (statYear == null || statMonth == null) {
+        return false
+      }
+      const now = new Date()
+      const y = now.getFullYear()
+      const m = now.getMonth() + 1
+      return statYear > y || (statYear === y && statMonth > m)
+    },
+    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()
+    },
+    validateOptionalCount(rule, value, callback) {
+      if (value == null || value === "") {
+        callback()
+        return
+      }
+      if (typeof value !== "number" || Number.isNaN(value) || value < 0 || !Number.isInteger(value)) {
+        callback(new Error(this.dmT("ruleCountNonNegative")))
+        return
+      }
+      callback()
+    },
+    validateActualCount(rule, value, callback) {
+      if (value == null || value === "") {
+        callback()
+        return
+      }
+      if (typeof value !== "number" || Number.isNaN(value) || value < 0 || !Number.isInteger(value)) {
+        callback(new Error(this.dmT("ruleCountNonNegative")))
+        return
+      }
+      const should = this.form.shouldVaccinateCount
+      if (should != null && should !== "" && Number.isFinite(Number(should)) && value > Number(should)) {
+        callback(new Error(this.dmT("ruleActualLeShould")))
+        return
+      }
+      callback()
+    },
+    onShouldCountChange() {
+      this.$nextTick(() => {
+        if (this.$refs.form) {
+          this.$refs.form.validateField("actualVaccinateCount")
+        }
+      })
+    },
+    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
+    },
+    getList() {
+      this.loading = true
+      listVaccinationData(this.buildListQuery())
+        .then((res) => {
+          this.tableList = res.rows || []
+          this.total = res.total || 0
+        })
+        .finally(() => {
+          this.loading = false
+        })
+    },
+    handleQuery() {
+      this.queryParams.pageNum = 1
+      this.getList()
+    },
+    resetQuery() {
+      this.queryParams = {
+        pageNum: 1,
+        pageSize: 20,
+        statYear: undefined,
+        statMonth: undefined,
+        townDeptId: undefined,
+        villageDeptId: undefined
+      }
+      this.getList()
+    },
+    handleAdd() {
+      this.dialogEdit = false
+      this.formKey += 1
+      this.form = createEmptyForm()
+      const ym = getCurrentYearMonth()
+      this.form.statYear = ym.statYear
+      this.form.statMonth = ym.statMonth
+      this.open = true
+      this.$nextTick(() => {
+        if (this.$refs.form) {
+          this.$refs.form.clearValidate()
+        }
+      })
+    },
+    handleEdit(row) {
+      getVaccinationData(row.id).then((res) => {
+        this.dialogEdit = true
+        this.formKey += 1
+        this.form = normalizeForm(res.data)
+        this.open = true
+        this.viewOpen = false
+        this.$nextTick(() => {
+          if (this.$refs.form) {
+            this.$refs.form.clearValidate()
+          }
+        })
+      })
+    },
+    handleView(row) {
+      getVaccinationData(row.id).then((res) => {
+        this.viewRow = res.data || {}
+        this.viewOpen = true
+      })
+    },
+    handleEditFromView() {
+      if (!this.viewRow || this.viewRow.id == null) {
+        return
+      }
+      this.handleEdit(this.viewRow)
+    },
+    handleDelete(row) {
+      this.$modal
+        .confirm(this.dmT("confirmDelete"))
+        .then(() => delVaccinationData(row.id))
+        .then(() => {
+          this.$modal.msgSuccess(this.dmCommon("msgDelOk"))
+          this.getList()
+        })
+        .catch(() => {})
+    },
+    buildSubmitPayload() {
+      return {
+        id: this.form.id,
+        statYear: this.form.statYear,
+        statMonth: this.form.statMonth,
+        villageDeptId: this.form.villageDeptId,
+        shouldVaccinateCount:
+          this.form.shouldVaccinateCount == null || this.form.shouldVaccinateCount === ""
+            ? null
+            : this.form.shouldVaccinateCount,
+        actualVaccinateCount:
+          this.form.actualVaccinateCount == null || this.form.actualVaccinateCount === ""
+            ? null
+            : this.form.actualVaccinateCount,
+        remark: this.form.remark
+      }
+    },
+    submitForm() {
+      this.$refs.form.validate((valid) => {
+        if (!valid) {
+          return
+        }
+        const payload = this.buildSubmitPayload()
+        if (this.dialogEdit) {
+          updateVaccinationData(payload).then(() => {
+            this.$modal.msgSuccess(this.dmCommon("msgEditOk"))
+            this.open = false
+            this.getList()
+          })
+        } else {
+          addVaccinationData(payload).then(() => {
+            this.$modal.msgSuccess(this.dmCommon("msgAddOk"))
+            this.open = false
+            this.getList()
+          })
+        }
+      })
+    },
+    cancel() {
+      this.open = false
+      this.form = createEmptyForm()
+    },
+    handleImportOpen() {
+      const ym = getCurrentYearMonth()
+      this.importForm = {
+        statYear: this.queryParams.statYear != null ? this.queryParams.statYear : ym.statYear,
+        statMonth: this.queryParams.statMonth != null ? this.queryParams.statMonth : ym.statMonth
+      }
+      this.importOpen = true
+      this.$nextTick(() => {
+        if (this.$refs.importFormRef) {
+          this.$refs.importFormRef.clearValidate()
+        }
+        if (this.$refs.importUpload) {
+          this.$refs.importUpload.clearFiles()
+        }
+      })
+    },
+    resetImport() {
+      this.importForm = { statYear: undefined, statMonth: undefined }
+      if (this.$refs.importUpload) {
+        this.$refs.importUpload.clearFiles()
+      }
+    },
+    handleDownloadTemplate() {
+      downloadVaccinationDataTemplate().then(async (data) => {
+        const isBlob = blobValidate(data)
+        if (isBlob) {
+          saveAs(data, `vaccination_data_import_template_${new Date().getTime()}.xlsx`)
+        } else {
+          this.$modal.msgError(this.dmT("exportFail"))
+        }
+      })
+    },
+    handleImportSubmit() {
+      this.$refs.importFormRef.validate((valid) => {
+        if (!valid) {
+          return
+        }
+        const files = this.$refs.importUpload ? this.$refs.importUpload.uploadFiles : []
+        if (!files || !files.length) {
+          this.$modal.msgError(this.dmCommon("pleaseSelect"))
+          return
+        }
+        const raw = files[0].raw
+        this.importing = true
+        this.$modal.loading(this.dmT("importLoading"))
+        importVaccinationData(raw, this.importForm.statYear, this.importForm.statMonth)
+          .then((res) => {
+            const data = res.data || {}
+            const msg = this.dmT("importSummary", {
+              insert: data.insertCount != null ? data.insertCount : 0,
+              update: data.updateCount != null ? data.updateCount : 0,
+              fail: data.failCount != null ? data.failCount : 0
+            })
+            this.$modal.msgSuccess(msg)
+            if (data.warnMessages && data.warnMessages.length) {
+              this.$alert(data.warnMessages.join("<br/>"), this.dmT("importWarnTitle"), { dangerouslyUseHTMLString: true })
+            }
+            if (data.failMessages && data.failMessages.length) {
+              this.$alert(data.failMessages.join("<br/>"), this.dmT("importFailTitle"), { dangerouslyUseHTMLString: true })
+            }
+            this.importOpen = false
+            this.getList()
+          })
+          .finally(() => {
+            this.importing = false
+            this.$modal.closeLoading()
+          })
+      })
+    },
+    handleExportOpen() {
+      const ym = getCurrentYearMonth()
+      this.exportForm = {
+        statYear: this.queryParams.statYear != null ? this.queryParams.statYear : ym.statYear,
+        statMonth: this.queryParams.statMonth != null ? this.queryParams.statMonth : ym.statMonth,
+        townDeptId: this.queryParams.townDeptId
+      }
+      this.exportOpen = true
+      this.$nextTick(() => {
+        if (this.$refs.exportFormRef) {
+          this.$refs.exportFormRef.clearValidate()
+        }
+      })
+    },
+    resetExport() {
+      this.exportForm = { statYear: undefined, statMonth: undefined, townDeptId: undefined }
+    },
+    handleExportSubmit() {
+      this.$refs.exportFormRef.validate((valid) => {
+        if (!valid) {
+          return
+        }
+        this.exporting = true
+        this.$modal.loading(this.dmT("exportLoading"))
+        exportVaccinationData(this.exportForm.statYear, this.exportForm.statMonth, this.exportForm.townDeptId)
+          .then(async (data) => {
+            const isBlob = blobValidate(data)
+            if (isBlob) {
+              saveAs(
+                data,
+                `vaccination_data_${this.exportForm.statYear}_${this.exportForm.statMonth}_${new Date().getTime()}.xlsx`
+              )
+              this.exportOpen = false
+            } else {
+              this.$modal.msgError(this.dmT("exportFail"))
+            }
+          })
+          .finally(() => {
+            this.exporting = false
+            this.$modal.closeLoading()
+          })
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+.vd-section-title {
+  margin: 4px 0 12px;
+  font-weight: 600;
+  color: #303133;
+}
+.vd-import-tip {
+  margin: 0 0 12px;
+  color: #909399;
+  font-size: 12px;
+  line-height: 1.5;
+}
+.vd-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

@@ -87,15 +87,27 @@
         <el-table-column :label="dmT('colHerdsmanHouseholdCount')" align="center" width="90">
           <template slot-scope="scope">{{ formatCount(scope.row.herdsmanHouseholdCount) }}</template>
         </el-table-column>
-        <el-table-column :label="dmT('colYakTotal')" align="center" width="100">
-          <template slot-scope="scope">{{ formatCount(scope.row.yakTotal) }}</template>
-        </el-table-column>
-        <el-table-column :label="dmT('colBullTotal')" align="center" width="110">
+        <el-table-column :label="dmT('colBullTotal')" align="center" width="120">
           <template slot-scope="scope">{{ formatCount(scope.row.bullTotal) }}</template>
         </el-table-column>
-        <el-table-column :label="dmT('colCowTotal')" align="center" width="110">
+        <el-table-column :label="dmT('colCowTotal')" align="center" width="120">
           <template slot-scope="scope">{{ formatCount(scope.row.cowTotal) }}</template>
         </el-table-column>
+        <el-table-column :label="dmT('colDairyTotal')" align="center" width="120">
+          <template slot-scope="scope">{{ formatCount(scope.row.dairyTotal) }}</template>
+        </el-table-column>
+        <el-table-column :label="dmT('colSheepTotal')" align="center" width="110">
+          <template slot-scope="scope">{{ formatCount(scope.row.sheepTotal) }}</template>
+        </el-table-column>
+        <el-table-column :label="dmT('colInsuredYakCount')" align="center" width="130">
+          <template slot-scope="scope">{{ formatCount(scope.row.insuredYakCount) }}</template>
+        </el-table-column>
+        <el-table-column :label="dmT('colYakTotal')" align="center" width="120">
+          <template slot-scope="scope">{{ formatCount(scope.row.yakTotal) }}</template>
+        </el-table-column>
+        <el-table-column :label="dmT('colGrandTotal')" align="center" width="100">
+          <template slot-scope="scope">{{ formatCount(scope.row.grandTotal) }}</template>
+        </el-table-column>
         <el-table-column :label="dmCommon('colOp')" align="center" class-name="small-padding fixed-width" width="180" fixed="right">
           <template slot-scope="scope">
             <el-button v-hasPermi="['dataModel:yakHerdInventory:query']" type="text" size="mini" @click="handleView(scope.row)">{{ dmCommon("view") }}</el-button>
@@ -114,7 +126,7 @@
     </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="168px" size="small">
+      <el-form :key="formKey" ref="form" :model="form" label-width="200px" size="small">
         <div class="yhi-section-title">{{ dmT("sectionBasic") }}</div>
         <el-row :gutter="16">
           <el-col :span="12">
@@ -155,9 +167,59 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <div class="yhi-section-title">{{ dmT("sectionInventory") }}</div>
+
+        <div class="yhi-section-title">{{ dmT("sectionFarmer") }}</div>
+        <el-row :gutter="16">
+          <el-col v-for="field in farmerFields" :key="field.prop" :span="12">
+            <el-form-item :prop="field.prop" :rules="formRules.count">
+              <template slot="label">{{ dmT(field.labelKey) }}</template>
+              <div class="dm-input-with-unit">
+                <el-input-number
+                  v-model="form[field.prop]"
+                  :min="0"
+                  :precision="0"
+                  :controls="true"
+                  controls-position="right"
+                  class="dm-input-with-unit__input"
+                />
+                <span class="dm-input-with-unit__suffix">{{ dmT(field.unitKey) }}</span>
+              </div>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <div class="yhi-section-title">{{ dmT("sectionBull") }}</div>
+        <el-row :gutter="16">
+          <el-col v-for="field in bullInputFields" :key="field.prop" :span="12">
+            <el-form-item :prop="field.prop" :rules="formRules.count">
+              <template slot="label">{{ dmT(field.labelKey) }}</template>
+              <div class="dm-input-with-unit">
+                <el-input-number
+                  v-model="form[field.prop]"
+                  :min="0"
+                  :precision="0"
+                  :controls="true"
+                  controls-position="right"
+                  class="dm-input-with-unit__input"
+                />
+                <span class="dm-input-with-unit__suffix">{{ dmT(field.unitKey) }}</span>
+              </div>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item>
+              <template slot="label">{{ dmT("formBullTotal") }}</template>
+              <div class="dm-input-with-unit">
+                <el-input-number :value="bullTotalDisplay" :controls="false" disabled class="dm-input-with-unit__input" />
+                <span class="dm-input-with-unit__suffix">{{ dmT("unitHead") }}</span>
+              </div>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <div class="yhi-section-title">{{ dmT("sectionCow") }}</div>
         <el-row :gutter="16">
-          <el-col v-for="field in inputCountFields" :key="field.prop" :span="12">
+          <el-col v-for="field in cowInputFields" :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">
@@ -173,7 +235,113 @@
               </div>
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item>
+              <template slot="label">{{ dmT("formCowTotal") }}</template>
+              <div class="dm-input-with-unit">
+                <el-input-number :value="cowTotalDisplay" :controls="false" disabled class="dm-input-with-unit__input" />
+                <span class="dm-input-with-unit__suffix">{{ dmT("unitHead") }}</span>
+              </div>
+            </el-form-item>
+          </el-col>
         </el-row>
+
+        <div class="yhi-section-title">{{ dmT("sectionDairy") }}</div>
+        <el-row :gutter="16">
+          <el-col v-for="field in dairyInputFields" :key="field.prop" :span="12">
+            <el-form-item :prop="field.prop" :rules="formRules.count">
+              <template slot="label">{{ dmT(field.labelKey) }}</template>
+              <div class="dm-input-with-unit">
+                <el-input-number
+                  v-model="form[field.prop]"
+                  :min="0"
+                  :precision="0"
+                  :controls="true"
+                  controls-position="right"
+                  class="dm-input-with-unit__input"
+                />
+                <span class="dm-input-with-unit__suffix">{{ dmT(field.unitKey) }}</span>
+              </div>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item>
+              <template slot="label">{{ dmT("formDairyTotal") }}</template>
+              <div class="dm-input-with-unit">
+                <el-input-number :value="dairyTotalDisplay" :controls="false" disabled class="dm-input-with-unit__input" />
+                <span class="dm-input-with-unit__suffix">{{ dmT("unitHead") }}</span>
+              </div>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <div class="yhi-section-title">{{ dmT("sectionSheep") }}</div>
+        <el-row :gutter="16">
+          <el-col v-for="field in sheepInputFields" :key="field.prop" :span="12">
+            <el-form-item :prop="field.prop" :rules="formRules.count">
+              <template slot="label">{{ dmT(field.labelKey) }}</template>
+              <div class="dm-input-with-unit">
+                <el-input-number
+                  v-model="form[field.prop]"
+                  :min="0"
+                  :precision="0"
+                  :controls="true"
+                  controls-position="right"
+                  class="dm-input-with-unit__input"
+                />
+                <span class="dm-input-with-unit__suffix">{{ dmT(field.unitKey) }}</span>
+              </div>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <div class="yhi-section-title">{{ dmT("sectionSummary") }}</div>
+        <el-row :gutter="16">
+          <el-col :span="12">
+            <el-form-item prop="insuredYakCount" :rules="formRules.count">
+              <template slot="label">{{ dmT("formInsuredYakCount") }}</template>
+              <div class="dm-input-with-unit">
+                <el-input-number
+                  v-model="form.insuredYakCount"
+                  :min="0"
+                  :precision="0"
+                  :controls="true"
+                  controls-position="right"
+                  class="dm-input-with-unit__input"
+                />
+                <span class="dm-input-with-unit__suffix">{{ dmT("unitHead") }}</span>
+              </div>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item>
+              <template slot="label">{{ dmT("formYakTotal") }}</template>
+              <div class="dm-input-with-unit">
+                <el-input-number :value="yakTotalDisplay" :controls="false" disabled class="dm-input-with-unit__input" />
+                <span class="dm-input-with-unit__suffix">{{ dmT("unitHead") }}</span>
+              </div>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item>
+              <template slot="label">{{ dmT("formGrandTotal") }}</template>
+              <div class="dm-input-with-unit">
+                <el-input-number :value="grandTotalDisplay" :controls="false" disabled class="dm-input-with-unit__input" />
+                <span class="dm-input-with-unit__suffix">{{ dmT("unitHead") }}</span>
+              </div>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item>
+              <template slot="label">{{ dmT("formYakSheepTotal") }}</template>
+              <div class="dm-input-with-unit">
+                <el-input-number :value="yakSheepTotalDisplay" :controls="false" disabled class="dm-input-with-unit__input" />
+                <span class="dm-input-with-unit__suffix">{{ dmT("unitHead") }}</span>
+              </div>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
         <el-form-item prop="remark" :rules="formRules.remark">
           <template slot="label">{{ dmT("formRemark") }}</template>
           <el-input v-model="form.remark" type="textarea" :rows="2" :placeholder="dmT('phRemark')" maxlength="500" show-word-limit />
@@ -186,7 +354,8 @@
     </el-dialog>
 
     <el-dialog :title="dmCommon('viewTitle')" :visible.sync="viewOpen" width="920px" append-to-body>
-      <el-form label-width="168px" size="small">
+      <el-form class="dm-view-form" label-width="200px" size="small">
+        <div class="yhi-section-title">{{ dmT("sectionBasic") }}</div>
         <el-row :gutter="16">
           <el-col :span="12">
             <el-form-item :label="dmT('formStatYear')">
@@ -208,16 +377,90 @@
               <span>{{ viewRow.villageName || dash }}</span>
             </el-form-item>
           </el-col>
-          <el-col v-for="field in inputCountFields" :key="'vi-' + field.prop" :span="12">
+        </el-row>
+
+        <div class="yhi-section-title">{{ dmT("sectionFarmer") }}</div>
+        <el-row :gutter="16">
+          <el-col v-for="field in farmerFields" :key="'vf-' + 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-row>
+
+        <div class="yhi-section-title">{{ dmT("sectionBull") }}</div>
+        <el-row :gutter="16">
+          <el-col v-for="field in bullInputFields" :key="'vb-' + 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 derivedCountFields" :key="'vd-' + field.prop" :span="12">
+          <el-col :span="12">
+            <el-form-item :label="dmT('formBullTotal')">
+              <span>{{ formatWithUnit(formatCount(viewRow.bullTotal), "unitHead") }}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <div class="yhi-section-title">{{ dmT("sectionCow") }}</div>
+        <el-row :gutter="16">
+          <el-col v-for="field in cowInputFields" :key="'vc-' + 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 :span="12">
+            <el-form-item :label="dmT('formCowTotal')">
+              <span>{{ formatWithUnit(formatCount(viewRow.cowTotal), "unitHead") }}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <div class="yhi-section-title">{{ dmT("sectionDairy") }}</div>
+        <el-row :gutter="16">
+          <el-col v-for="field in dairyInputFields" :key="'vd-' + 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 :span="12">
+            <el-form-item :label="dmT('formDairyTotal')">
+              <span>{{ formatWithUnit(formatCount(viewRow.dairyTotal), "unitHead") }}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <div class="yhi-section-title">{{ dmT("sectionSheep") }}</div>
+        <el-row :gutter="16">
+          <el-col v-for="field in sheepInputFields" :key="'vs-' + 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-row>
+
+        <div class="yhi-section-title">{{ dmT("sectionSummary") }}</div>
+        <el-row :gutter="16">
+          <el-col :span="12">
+            <el-form-item :label="dmT('formInsuredYakCount')">
+              <span>{{ formatWithUnit(formatCount(viewRow.insuredYakCount), "unitHead") }}</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="dmT('formYakTotal')">
+              <span>{{ formatWithUnit(formatCount(viewRow.yakTotal), "unitHead") }}</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="dmT('formGrandTotal')">
+              <span>{{ formatWithUnit(formatCount(viewRow.grandTotal), "unitHead") }}</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="dmT('formYakSheepTotal')">
+              <span>{{ formatWithUnit(formatCount(viewRow.yakSheepTotal), "unitHead") }}</span>
+            </el-form-item>
+          </el-col>
           <el-col :span="24">
             <el-form-item :label="dmT('formRemark')">
               <span class="yhi-view-text">{{ viewRow.remark || dash }}</span>
@@ -346,29 +589,38 @@ import { blobValidate } from "@/utils/ruoyi"
 import { saveAs } from "file-saver"
 
 /** 手工录入明细（表单可编辑；选填） */
-const INPUT_COUNT_FIELDS = [
+const FARMER_FIELDS = [
   { prop: "villageCount", labelKey: "formVillageCount", unitKey: "unitGe" },
-  { prop: "herdsmanHouseholdCount", labelKey: "formHerdsmanHouseholdCount", unitKey: "unitHousehold" },
+  { prop: "herdsmanHouseholdCount", labelKey: "formHerdsmanHouseholdCount", unitKey: "unitHousehold" }
+]
+const BULL_INPUT_FIELDS = [
   { prop: "breedingBullCount", labelKey: "formBreedingBullCount", unitKey: "unitHead" },
-  { prop: "bullCastratedCount", labelKey: "formBullCastratedCount", unitKey: "unitHead" },
+  { prop: "bullCastratedCount", labelKey: "formBullCastratedCount", unitKey: "unitHead" }
+]
+const COW_INPUT_FIELDS = [
   { prop: "cowYoungCount", labelKey: "formCowYoungCount", unitKey: "unitHead" },
-  { prop: "cowAdultCount", labelKey: "formCowAdultCount", unitKey: "unitHead" },
+  { prop: "cowAdultCount", labelKey: "formCowAdultCount", unitKey: "unitHead" }
+]
+const DAIRY_INPUT_FIELDS = [
   { prop: "milkingCowCount", labelKey: "formMilkingCowCount", unitKey: "unitHead" },
-  { prop: "fertileCowCount", labelKey: "formFertileCowCount", unitKey: "unitHead" },
-  { prop: "sheepTotal", labelKey: "formSheepTotal", unitKey: "unitHead" },
+  { prop: "fertileCowCount", labelKey: "formFertileCowCount", unitKey: "unitHead" }
+]
+const SHEEP_INPUT_FIELDS = [
   { prop: "milkingSheepCount", labelKey: "formMilkingSheepCount", unitKey: "unitHead" },
-  { prop: "insuredYakCount", labelKey: "formInsuredYakCount", unitKey: "unitHead" }
+  { prop: "sheepTotal", labelKey: "formSheepTotal", unitKey: "unitHead" }
 ]
+const INPUT_COUNT_FIELDS = FARMER_FIELDS.concat(
+  BULL_INPUT_FIELDS,
+  COW_INPUT_FIELDS,
+  DAIRY_INPUT_FIELDS,
+  SHEEP_INPUT_FIELDS,
+  [{ 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 safeNum(val) {
+  const n = Number(val)
+  return Number.isFinite(n) ? n : 0
+}
 
 function getCurrentYearMonth() {
   const now = new Date()
@@ -473,11 +725,44 @@ export default {
     dash() {
       return this.$t("dataModel.status.dash")
     },
-    inputCountFields() {
-      return INPUT_COUNT_FIELDS
+    farmerFields() {
+      return FARMER_FIELDS
+    },
+    bullInputFields() {
+      return BULL_INPUT_FIELDS
+    },
+    cowInputFields() {
+      return COW_INPUT_FIELDS
+    },
+    dairyInputFields() {
+      return DAIRY_INPUT_FIELDS
+    },
+    sheepInputFields() {
+      return SHEEP_INPUT_FIELDS
+    },
+    bullTotalDisplay() {
+      return safeNum(this.form.breedingBullCount) + safeNum(this.form.bullCastratedCount)
+    },
+    cowTotalDisplay() {
+      return safeNum(this.form.cowYoungCount) + safeNum(this.form.cowAdultCount)
+    },
+    dairyTotalDisplay() {
+      return safeNum(this.form.milkingCowCount) + safeNum(this.form.fertileCowCount)
+    },
+    yakTotalDisplay() {
+      return this.bullTotalDisplay + this.cowTotalDisplay + safeNum(this.form.insuredYakCount)
+    },
+    grandTotalDisplay() {
+      return (
+        this.bullTotalDisplay +
+        this.cowTotalDisplay +
+        safeNum(this.form.insuredYakCount) +
+        this.dairyTotalDisplay +
+        safeNum(this.form.sheepTotal)
+      )
     },
-    derivedCountFields() {
-      return DERIVED_COUNT_FIELDS
+    yakSheepTotalDisplay() {
+      return this.bullTotalDisplay + this.cowTotalDisplay + safeNum(this.form.insuredYakCount) + safeNum(this.form.sheepTotal)
     },
     dialogTitle() {
       return this.dialogEdit ? this.dmT("dialogEdit") : this.dmT("dialogAdd")

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

@@ -195,6 +195,15 @@
               </div>
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item>
+              <template slot="label">{{ dmT("formOutboundTotal") }}</template>
+              <div class="dm-input-with-unit">
+                <el-input-number :value="outboundTotalDisplay" :controls="false" disabled class="dm-input-with-unit__input" />
+                <span class="dm-input-with-unit__suffix">{{ dmT("unitHeadSheepHorse") }}</span>
+              </div>
+            </el-form-item>
+          </el-col>
         </el-row>
         <div class="yor-section-title">{{ dmT("sectionSelfConsumption") }}</div>
         <el-row :gutter="16">
@@ -214,6 +223,15 @@
               </div>
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item>
+              <template slot="label">{{ dmT("formSelfConsumptionTotal") }}</template>
+              <div class="dm-input-with-unit">
+                <el-input-number :value="selfConsumptionTotalDisplay" :controls="false" disabled class="dm-input-with-unit__input" />
+                <span class="dm-input-with-unit__suffix">{{ dmT("unitHeadSheepHorse") }}</span>
+              </div>
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-form-item prop="remark" :rules="formRules.remark">
           <template slot="label">{{ dmT("formRemark") }}</template>
@@ -227,7 +245,8 @@
     </el-dialog>
 
     <el-dialog :title="dmCommon('viewTitle')" :visible.sync="viewOpen" width="920px" append-to-body>
-      <el-form label-width="168px" size="small">
+      <el-form class="dm-view-form" label-width="168px" size="small">
+        <div class="yor-section-title">{{ dmT("sectionBasic") }}</div>
         <el-row :gutter="16">
           <el-col :span="12">
             <el-form-item :label="dmT('formStatYear')">
@@ -249,27 +268,47 @@
               <span>{{ viewRow.villageName || dash }}</span>
             </el-form-item>
           </el-col>
-          <el-col v-for="field in inputCountFields" :key="'v-' + field.prop" :span="12">
+        </el-row>
+
+        <div class="yor-section-title">{{ dmT("sectionFarmer") }}</div>
+        <el-row :gutter="16">
+          <el-col v-for="field in farmerCountFields" :key="'vf-' + 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-row>
+
+        <div class="yor-section-title">{{ dmT("sectionOutbound") }}</div>
+        <el-row :gutter="16">
+          <el-col v-for="field in outboundCountFields" :key="'vo-' + 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 :span="12">
             <el-form-item :label="dmT('formOutboundTotal')">
-              <span>{{ formatWithUnit(formatCount(sumOutboundTotal(viewRow)), "unitHead") }}</span>
+              <span>{{ formatWithUnit(formatCount(sumOutboundTotal(viewRow)), "unitHeadSheepHorse") }}</span>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item :label="dmT('formSelfConsumptionTotal')">
-              <span>{{ formatWithUnit(formatCount(sumSelfConsumptionTotal(viewRow)), "unitHead") }}</span>
+        </el-row>
+
+        <div class="yor-section-title">{{ dmT("sectionSelfConsumption") }}</div>
+        <el-row :gutter="16">
+          <el-col v-for="field in selfConsumptionCountFields" :key="'vs-' + 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 :span="24">
-            <el-form-item :label="dmT('formRemark')">
-              <span class="yor-view-text">{{ viewRow.remark || dash }}</span>
+          <el-col :span="12">
+            <el-form-item :label="dmT('formSelfConsumptionTotal')">
+              <span>{{ formatWithUnit(formatCount(sumSelfConsumptionTotal(viewRow)), "unitHeadSheepHorse") }}</span>
             </el-form-item>
           </el-col>
         </el-row>
+        <el-form-item :label="dmT('formRemark')">
+          <span class="yor-view-text">{{ viewRow.remark || dash }}</span>
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button
@@ -521,6 +560,12 @@ export default {
     selfConsumptionCountFields() {
       return COUNT_FIELDS.filter((field) => field.section === "selfConsumption")
     },
+    outboundTotalDisplay() {
+      return sumProps(this.form, OUTBOUND_TOTAL_PROPS)
+    },
+    selfConsumptionTotalDisplay() {
+      return sumProps(this.form, SELF_CONSUMPTION_TOTAL_PROPS)
+    },
     dialogTitle() {
       return this.dialogEdit ? this.dmT("dialogEdit") : this.dmT("dialogAdd")
     },