123

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

@@ -0,0 +1,104 @@
+# 农村三资数据填报 — 前端技术方案
+
+> 依据：同目录功能需求、技术方案；村级唯一 CRUD；**无**导入导出；字段 **小驼峰**。
+
+---
+
+## 1. 页面与路由
+
+| 项 | 说明 |
+| --- | --- |
+| **Vue 路径** | `ruoyi-ui/src/views/dataModel/ruralThreeAssets/index.vue` |
+| **组件名** | `RuralThreeAssets` |
+| **菜单配置** | 组件路径：`dataModel/ruralThreeAssets/index` |
+| **权限前缀** | `dataModel:ruralThreeAssets:list\|query\|add\|edit\|remove` |
+
+---
+
+## 2. API 模块
+
+| 项 | 说明 |
+| --- | --- |
+| **文件** | `ruoyi-ui/src/api/dataModel/ruralThreeAssets.js` |
+| **Base** | `/dataModel/ruralThreeAssets` |
+
+| 方法 | 路径 | 说明 |
+| --- | --- | --- |
+| `listRuralThreeAssets` | GET `/list` | 分页；筛选乡镇、村 |
+| `getRuralThreeAssets` | GET `/{id}` | 详情（含派生固定资产） |
+| `addRuralThreeAssets` | POST `/` | 新增 |
+| `updateRuralThreeAssets` | PUT `/` | 修改 |
+| `delRuralThreeAssets` | DELETE `/{ids}` | 删除 |
+| `listRuralThreeAssetsTownOptions` | GET `/townOptions` | 乡镇下拉 |
+| `listRuralThreeAssetsVillageTree` | GET `/villageTree` | 县→乡镇→村树 |
+
+本期 **无** `yearOptions` / 导入 / 导出。
+
+---
+
+## 3. 页面结构
+
+1. **筛选**：乡镇、村（可搜索）。  
+2. **列表**：乡镇、村、经营性固定资产、非经营性固定资产、固定资产、操作。  
+3. **新增/编辑**：只选村（标签「乡镇 / 村」）；金额单位「万元」；固定资产只读预览。  
+4. **详情**：含乡镇；派生固定资产展示。
+
+### 表单 / 查看分区
+
+| 分区 | 内容 |
+| --- | --- |
+| 基本信息 | 村（查看含乡镇） |
+| 三资情况 | 经营性固定资产、非经营性固定资产；只读固定资产；备注 |
+
+### 字段映射
+
+| 界面 | 字段 |
+| --- | --- |
+| 经营性固定资产 | `operatingFixedAssets` |
+| 非经营性固定资产 | `nonOperatingFixedAssets` |
+| 固定资产（派生） | `fixedAssets` |
+
+---
+
+## 4. 业务规则
+
+| 规则 | 实现 |
+| --- | --- |
+| 唯一键 | 村（提交只传 `villageDeptId`；乡镇由后端反推） |
+| 必填 | 村 |
+| 金额 | 经营性/非经营性可选；≥0；单位「万元」；精度 2 位 |
+| 固定资产预览 | 二者皆空 →「—」；否则 `(经营性\|\|0)+(非经营性\|\|0)`，保留 2 位 |
+| 落库 | 后端 `RuralThreeAssetsDerivedSupport` 计算并写入 |
+
+---
+
+## 5. 国际化
+
+`dataModel.ruralThreeAssets`（`lang/zh|bo/dataModel.js`）；页面 `dmNs = 'ruralThreeAssets'`，复用 `dataModelLocaleMixin`。查看表单使用 `dm-view-form`。
+
+---
+
+## 6. 联调说明
+
+1. 执行 `sql/biz_rural_three_assets.sql`。  
+2. 菜单组件 `dataModel/ruralThreeAssets/index`，权限见 §1。  
+3. 验证：同村不可重复新增、固定资产预览与保存后一致、无导入导出入口。
+
+---
+
+## 7. 文件清单
+
+| 类型 | 路径 |
+| --- | --- |
+| 页面 | `ruoyi-ui/src/views/dataModel/ruralThreeAssets/index.vue` |
+| API | `ruoyi-ui/src/api/dataModel/ruralThreeAssets.js` |
+| i18n | `lang/zh/dataModel.js`、`lang/bo/dataModel.js` → `ruralThreeAssets` |
+| 前端技术方案 | 本文档 |
+
+---
+
+## 8. 修订记录
+
+| 版本 | 说明 |
+| --- | --- |
+| 1.0 | 初版：村级唯一 CRUD；固定资产只读预览；无导入导出 |

doc/产业数据模型及服务/农村三资数据填报/农村三资数据填报功能需求.md

@@ -37,8 +37,15 @@
 
 ---
 
-## 5. 修订记录
+## 5. 相关文档
+
+- [农村三资数据填报技术方案.md](./农村三资数据填报技术方案.md)
+- [农村三资数据填报前端技术方案.md](./农村三资数据填报前端技术方案.md)
+- [农村三资数据填报测试用例.md](./农村三资数据填报测试用例.md)
+
+## 6. 修订记录
 
 | 版本 | 说明 |
 | --- | --- |
 | 1.0 | 初版：村级 CRUD + 固定资产派生 |
+| 1.1 | 补充前端技术方案链接 |

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

@@ -31,6 +31,8 @@ DDL：`sql/biz_rural_three_assets.sql`
 
 ## 4. 前端
 
+详见同目录 **[农村三资数据填报前端技术方案.md](./农村三资数据填报前端技术方案.md)**。
+
 - 页面：`ruoyi-ui/src/views/dataModel/ruralThreeAssets/index.vue`
 - API：`ruoyi-ui/src/api/dataModel/ruralThreeAssets.js`
 - 表单只选村；固定资产只读预览；列表筛乡镇/村
@@ -40,3 +42,4 @@ DDL：`sql/biz_rural_three_assets.sql`
 | 版本 | 说明 |
 | --- | --- |
 | 1.0 | 初版 |
+| 1.1 | 补充前端技术方案链接 |

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

@@ -0,0 +1,117 @@
+# 有无畜户数据填报 — 前端技术方案
+
+> 依据：同目录功能需求、技术方案；交互对齐疫苗接种等村×年月填报；字段 **小驼峰**。
+
+---
+
+## 1. 页面与路由
+
+| 项 | 说明 |
+| --- | --- |
+| **Vue 路径** | `ruoyi-ui/src/views/dataModel/livestockOwnershipHousehold/index.vue` |
+| **组件名** | `LivestockOwnershipHousehold` |
+| **菜单配置** | 组件路径：`dataModel/livestockOwnershipHousehold/index` |
+| **权限前缀** | `dataModel:livestockOwnershipHousehold:list\|query\|add\|edit\|remove\|import\|export` |
+
+---
+
+## 2. API 模块
+
+| 项 | 说明 |
+| --- | --- |
+| **文件** | `ruoyi-ui/src/api/dataModel/livestockOwnershipHousehold.js` |
+| **Base** | `/dataModel/livestockOwnershipHousehold` |
+
+CRUD、`yearOptions` / `monthOptions` / `townOptions` / `villageTree`、导入 `importData`、模板 `importTemplate`、导出 `export`（可选 `townDeptId`）与同类村级填报模块同构；模板/导出均为 **GET + blob**。
+
+| 方法 | 路径 | 说明 |
+| --- | --- | --- |
+| `listLivestockOwnershipHousehold` | GET `/list` | 分页；筛选年、月、乡镇、村 |
+| `getLivestockOwnershipHousehold` | GET `/{id}` | 详情 |
+| `addLivestockOwnershipHousehold` | POST `/` | 新增 |
+| `updateLivestockOwnershipHousehold` | PUT `/` | 修改 |
+| `delLivestockOwnershipHousehold` | DELETE `/{ids}` | 删除 |
+| `listLivestockOwnershipHouseholdYearOptions` | GET `/yearOptions` | 年份下拉 |
+| `listLivestockOwnershipHouseholdMonthOptions` | GET `/monthOptions` | 月份下拉 |
+| `listLivestockOwnershipHouseholdTownOptions` | GET `/townOptions` | 乡镇下拉 |
+| `listLivestockOwnershipHouseholdVillageTree` | GET `/villageTree` | 县→乡镇→村树 |
+| `importLivestockOwnershipHousehold` | POST `/importData` | FormData：`file` + `statYear` + `statMonth` |
+| `downloadLivestockOwnershipHouseholdTemplate` | GET `/importTemplate` | 模板 blob |
+| `exportLivestockOwnershipHousehold` | GET `/export` | 参数：`statYear`、`statMonth`、可选 `townDeptId` |
+
+---
+
+## 3. 页面结构
+
+1. **筛选**：年、月、乡镇、村（村可搜索）。  
+2. **列表**：年、月、乡镇、村；有畜户（户数/人数/有劳力/牲畜数）；无畜户（户数/人数/有劳力）；操作。  
+3. **新增/编辑**：选村（标签「乡镇 / 村」）；新增默认本年本月；计数字段选填、非负整数。  
+4. **详情**：与表单同分区；查看含乡镇；数值带单位。  
+5. **导入**：选年月 → upsert 摘要；任一行失败整批不写（后端）。  
+6. **导出**：选年月；乡镇打开时带入列表当前筛选，清空=全部。
+
+### 表单 / 查看分区
+
+| 分区 | 内容 |
+| --- | --- |
+| 基本信息 | 年月、村（查看含乡镇） |
+| 有畜户 | 户数（户）、人数（人）、有劳力（人）、牲畜数（头只） |
+| 无畜户 | 户数（户）、人数（人）、有劳力（人） |
+| — | 备注 |
+
+### 字段映射
+
+| 界面 | 字段 |
+| --- | --- |
+| 有畜户户数 | `withLivestockHouseholdCount` |
+| 有畜户人数 | `withLivestockPopulationCount` |
+| 有畜户有劳力 | `withLivestockLaborCount` |
+| 有畜户牲畜数 | `withLivestockAnimalCount` |
+| 无畜户户数 | `withoutLivestockHouseholdCount` |
+| 无畜户人数 | `withoutLivestockPopulationCount` |
+| 无畜户有劳力 | `withoutLivestockLaborCount` |
+
+---
+
+## 4. 业务规则
+
+| 规则 | 实现 |
+| --- | --- |
+| 唯一键 | 年 + 月 + 村（提交只传 `villageDeptId`；乡镇由后端反推） |
+| 必填 | 年、月、村 |
+| 计数 | 七项可选；非负整数 |
+| 不可未来月 | 表单 / 导入 / 导出校验 |
+| 导入 | 同年同月同村 upsert |
+
+---
+
+## 5. 国际化
+
+`dataModel.livestockOwnershipHousehold`（`lang/zh|bo/dataModel.js`）；页面 `dmNs = 'livestockOwnershipHousehold'`，复用 `dataModelLocaleMixin`。查看表单使用 `dm-view-form`。
+
+---
+
+## 6. 联调说明
+
+1. 执行 `sql/biz_livestock_ownership_household.sql`。  
+2. 菜单组件 `dataModel/livestockOwnershipHousehold/index`，权限见 §1。  
+3. 验证：新增默认年月、分区填报、导入 upsert、导出乡镇带入列表筛选。
+
+---
+
+## 7. 文件清单
+
+| 类型 | 路径 |
+| --- | --- |
+| 页面 | `ruoyi-ui/src/views/dataModel/livestockOwnershipHousehold/index.vue` |
+| API | `ruoyi-ui/src/api/dataModel/livestockOwnershipHousehold.js` |
+| i18n | `lang/zh/dataModel.js`、`lang/bo/dataModel.js` → `livestockOwnershipHousehold` |
+| 前端技术方案 | 本文档 |
+
+---
+
+## 8. 修订记录
+
+| 版本 | 说明 |
+| --- | --- |
+| 1.0 | 初版：村×年月；CRUD + upsert 导入 + 导出；有畜户/无畜户分区 |

doc/产业数据模型及服务/有无畜户数据填报/有无畜户数据填报功能需求.md

@@ -40,8 +40,15 @@
 
 ---
 
-## 5. 修订记录
+## 5. 相关文档
+
+- [有无畜户数据填报技术方案.md](./有无畜户数据填报技术方案.md)
+- [有无畜户数据填报前端技术方案.md](./有无畜户数据填报前端技术方案.md)
+- [有无畜户数据填报测试用例.md](./有无畜户数据填报测试用例.md)
+
+## 6. 修订记录
 
 | 版本 | 说明 |
 | --- | --- |
 | 1.0 | 初版：对齐牦牛出栏骨架，村×年月填报 |
+| 1.1 | 补充前端技术方案链接 |

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

@@ -33,8 +33,18 @@ Controller `/dataModel/livestockOwnershipHousehold` → Service → Mapper；Exc
 - 导入：系统选年月 → 解析 → 乡镇/村识别 → 非负校验 → upsert。
 - 导出：改标题年月、填表人/时间；写村行；末行「合计」（合并序号～村列）。
 
-## 5. 修订记录
+## 5. 前端
+
+详见同目录 **[有无畜户数据填报前端技术方案.md](./有无畜户数据填报前端技术方案.md)**。
+
+- 页面：`ruoyi-ui/src/views/dataModel/livestockOwnershipHousehold/index.vue`
+- API：`ruoyi-ui/src/api/dataModel/livestockOwnershipHousehold.js`
+- 菜单组件：`dataModel/livestockOwnershipHousehold/index`
+- i18n：`dataModel.livestockOwnershipHousehold`（zh/bo）
+
+## 6. 修订记录
 
 | 版本 | 说明 |
 | --- | --- |
 | 1.0 | 初版 |
+| 1.1 | 补充前端技术方案链接 |

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

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

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

@@ -0,0 +1,60 @@
+import request from "@/utils/request"
+
+/** 分页列表 */
+export function listRuralThreeAssets(query) {
+  return request({
+    url: "/dataModel/ruralThreeAssets/list",
+    method: "get",
+    params: query
+  })
+}
+
+/** 详情 */
+export function getRuralThreeAssets(id) {
+  return request({
+    url: "/dataModel/ruralThreeAssets/" + id,
+    method: "get"
+  })
+}
+
+/** 新增 */
+export function addRuralThreeAssets(data) {
+  return request({
+    url: "/dataModel/ruralThreeAssets",
+    method: "post",
+    data
+  })
+}
+
+/** 修改 */
+export function updateRuralThreeAssets(data) {
+  return request({
+    url: "/dataModel/ruralThreeAssets",
+    method: "put",
+    data
+  })
+}
+
+/** 删除 */
+export function delRuralThreeAssets(ids) {
+  return request({
+    url: "/dataModel/ruralThreeAssets/" + ids,
+    method: "delete"
+  })
+}
+
+/** 乡镇下拉 */
+export function listRuralThreeAssetsTownOptions() {
+  return request({
+    url: "/dataModel/ruralThreeAssets/townOptions",
+    method: "get"
+  })
+}
+
+/** 县→乡镇→村树 */
+export function listRuralThreeAssetsVillageTree() {
+  return request({
+    url: "/dataModel/ruralThreeAssets/villageTree",
+    method: "get"
+  })
+}

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

@@ -1055,5 +1055,100 @@ export default {
     unitSheepUnit: "ལུག་རིམ།",
     dateRangeInvalid: "འགོ་ཚེས་མཇུག་ཚེས་ལས་ཕྱི་མི་ཆོག",
     emptyList: "ཉེན་བརྡ་གཞི་གྲངས་མེད།"
+  },
+  livestockOwnershipHousehold: {
+    queryStatYear: "གཏོགས་ལོ།",
+    queryStatMonth: "གཏོགས་ཟླ།",
+    queryTown: "ཤང་གྲོང།",
+    queryVillage: "གྲོང་ཚོ།",
+    phVillageSearch: "འདེམས་པའམ་འཚོལ་འཇུག་རོགས།",
+    phRemark: "འདེམས་འབྲི，ཡིག་ཆ་500ལས་མི་ཆོག",
+    colStatYear: "གཏོགས་ལོ།",
+    colStatMonth: "གཏོགས་ཟླ།",
+    statMonthLabel: "{month}ཟླ།",
+    colTownName: "ཤང་གྲོང།",
+    colVillageName: "གྲོང་ཚོ།",
+    colWithHousehold: "ཕྱུགས་ཡོད་ཁྱིམ་གྲངས།",
+    colWithPopulation: "ཕྱུགས་ཡོད་མི་གྲངས།",
+    colWithLabor: "ཕྱུགས་ཡོད་ངལ་རྩོལ།",
+    colWithAnimal: "ཕྱུགས་ཡོད་ཕྱུགས་གྲངས།",
+    colWithoutHousehold: "ཕྱུགས་མེད་ཁྱིམ་གྲངས།",
+    colWithoutPopulation: "ཕྱུགས་མེད་མི་གྲངས།",
+    colWithoutLabor: "ཕྱུགས་མེད་ངལ་རྩོལ།",
+    formStatYear: "གཏོགས་ལོ།",
+    formStatMonth: "གཏོགས་ཟླ།",
+    formTown: "ཤང་གྲོང།",
+    formVillage: "གྲོང་ཚོ།",
+    formHouseholdCount: "ཁྱིམ་གྲངས།",
+    formPopulationCount: "མི་གྲངས།",
+    formLaborCount: "ངལ་རྩོལ་ཡོད།",
+    formAnimalCount: "ཕྱུགས་གྲངས།",
+    formRemark: "ཟིན་བྲིས།",
+    sectionBasic: "གཞི་རྩའི་གནས་ཚུལ།",
+    sectionWith: "ཕྱུགས་ཡོད་ཁྱིམ།",
+    sectionWithout: "ཕྱུགས་མེད་ཁྱིམ།",
+    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: "མི།",
+    unitHeadPiece: "མགོ་ཐོ།",
+    ruleStatYearRequired: "གཏོགས་ལོ་འདེམས་རོགས།",
+    ruleStatMonthRequired: "གཏོགས་ཟླ་འདེམས་རོགས།",
+    ruleStatMonthFuture: "མ་འོངས་ཟླ་འབྲི་མི་ཆོག",
+    ruleVillageRequired: "གྲོང་ཚོ་འདེམས་རོགས།",
+    ruleCountNonNegative: "0་ཡན་གྱི་ཧྲིལ་གྲངས་དགོས།",
+    villageTreeEmpty: "གྲོང་ཚོའི་སྒྲིག་འཛུགས་མ་ལོན，ལས་ཁུངས་ནང་「ཤང་གྲོང→གྲོང་ཚོ」ཡོད་མེད་ཞིབ་རོགས།"
+  },
+  ruralThreeAssets: {
+    queryTown: "ཤང་གྲོང།",
+    queryVillage: "གྲོང་ཚོ།",
+    phVillageSearch: "འདེམས་པའམ་འཚོལ་འཇུག་རོགས།",
+    phRemark: "འདེམས་འབྲི，ཡིག་ཆ་500ལས་མི་ཆོག",
+    colTownName: "ཤང་གྲོང།",
+    colVillageName: "གྲོང་ཚོ།",
+    colOperatingFixedAssets: "གཉེར་སྐྱོང་རང་གཏན་རྒྱུ་ནོར།",
+    colNonOperatingFixedAssets: "གཉེར་སྐྱོང་མིན་པའི་རང་གཏན་རྒྱུ་ནོར།",
+    colFixedAssets: "རང་གཏན་རྒྱུ་ནོར།",
+    formTown: "ཤང་གྲོང།",
+    formVillage: "གྲོང་ཚོ།",
+    formOperatingFixedAssets: "གཉེར་སྐྱོང་རང་གཏན་རྒྱུ་ནོར།",
+    formNonOperatingFixedAssets: "གཉེར་སྐྱོང་མིན་པའི་རང་གཏན་རྒྱུ་ནོར།",
+    formFixedAssets: "རང་གཏན་རྒྱུ་ནོར།",
+    formRemark: "ཟིན་བྲིས།",
+    sectionBasic: "གཞི་རྩའི་གནས་ཚུལ།",
+    sectionAssets: "རྒྱུ་ནོར་གསུམ་གནས་ཚུལ།",
+    dialogAdd: "[གསར་སྣོན]གྲོང་གསེབ་རྒྱུ་ནོར་གསུམ་གཞི་གྲངས།",
+    dialogEdit: "[རྩོམ་སྒྲིག]གྲོང་གསེབ་རྒྱུ་ནོར་གསུམ་གཞི་གྲངས།",
+    confirmDelete: "ཐོ་གཞུང་འདི་སུབ་རྒྱུ་གཏན་ཁེལ་ལམ？",
+    emptyList: "འབྲི་གཞི་གྲངས་མེད།",
+    unitWanYuan: "ཁྲི་སྒོར།",
+    ruleVillageRequired: "གྲོང་ཚོ་འདེམས་རོགས།",
+    ruleMoneyNonNegative: "0་ཡན་གྱི་གྲངས་དགོས།",
+    villageTreeEmpty: "གྲོང་ཚོའི་སྒྲིག་འཛུགས་མ་ལོན，ལས་ཁུངས་ནང་「ཤང་གྲོང→གྲོང་ཚོ」ཡོད་མེད་ཞིབ་རོགས།"
   }
 }

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

@@ -1055,5 +1055,100 @@ export default {
     unitSheepUnit: "绵羊单位",
     dateRangeInvalid: "开始日期不能晚于结束日期",
     emptyList: "暂无预警数据"
+  },
+  livestockOwnershipHousehold: {
+    queryStatYear: "所属年份",
+    queryStatMonth: "所属月份",
+    queryTown: "所属乡镇",
+    queryVillage: "所属村",
+    phVillageSearch: "请选择或输入搜索",
+    phRemark: "选填，不超过 500 字",
+    colStatYear: "所属年份",
+    colStatMonth: "所属月份",
+    statMonthLabel: "{month}月",
+    colTownName: "所属乡镇",
+    colVillageName: "所属村",
+    colWithHousehold: "有畜户户数",
+    colWithPopulation: "有畜户人数",
+    colWithLabor: "有畜户有劳力",
+    colWithAnimal: "有畜户牲畜数",
+    colWithoutHousehold: "无畜户户数",
+    colWithoutPopulation: "无畜户人数",
+    colWithoutLabor: "无畜户有劳力",
+    formStatYear: "所属年份",
+    formStatMonth: "所属月份",
+    formTown: "所属乡镇",
+    formVillage: "所属村",
+    formHouseholdCount: "户数",
+    formPopulationCount: "人数",
+    formLaborCount: "有劳力",
+    formAnimalCount: "牲畜数",
+    formRemark: "备注",
+    sectionBasic: "基本信息",
+    sectionWith: "有畜户",
+    sectionWithout: "无畜户",
+    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: "人",
+    unitHeadPiece: "头只",
+    ruleStatYearRequired: "请选择所属年份",
+    ruleStatMonthRequired: "请选择所属月份",
+    ruleStatMonthFuture: "不可填报未来月份",
+    ruleVillageRequired: "请选择所属村",
+    ruleCountNonNegative: "须为大于等于 0 的整数",
+    villageTreeEmpty: "未加载到村级组织数据，请确认系统部门已维护「乡镇→村」"
+  },
+  ruralThreeAssets: {
+    queryTown: "所属乡镇",
+    queryVillage: "所属村",
+    phVillageSearch: "请选择或输入搜索",
+    phRemark: "选填，不超过 500 字",
+    colTownName: "所属乡镇",
+    colVillageName: "所属村",
+    colOperatingFixedAssets: "经营性固定资产",
+    colNonOperatingFixedAssets: "非经营性固定资产",
+    colFixedAssets: "固定资产",
+    formTown: "所属乡镇",
+    formVillage: "所属村",
+    formOperatingFixedAssets: "经营性固定资产",
+    formNonOperatingFixedAssets: "非经营性固定资产",
+    formFixedAssets: "固定资产",
+    formRemark: "备注",
+    sectionBasic: "基本信息",
+    sectionAssets: "三资情况",
+    dialogAdd: "[新增]农村三资数据",
+    dialogEdit: "[编辑]农村三资数据",
+    confirmDelete: "是否确认删除这条数据？",
+    emptyList: "暂无填报数据",
+    unitWanYuan: "万元",
+    ruleVillageRequired: "请选择所属村",
+    ruleMoneyNonNegative: "须为大于等于 0 的数字",
+    villageTreeEmpty: "未加载到村级组织数据，请确认系统部门已维护「乡镇→村」"
   }
 }

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

@@ -969,12 +969,13 @@ export default {
           return
         }
         this.exporting = true
+        const filename = `${this.exportForm.statYear}年${this.exportForm.statMonth}月农牧户数据.xlsx`
         this.$modal.loading(this.dmT("exportLoading"))
         exportFarmerHousehold(this.exportForm.statYear, this.exportForm.statMonth, this.exportForm.townDeptId)
           .then(async (data) => {
             const isBlob = blobValidate(data)
             if (isBlob) {
-              saveAs(data, `farmer_household_${this.exportForm.statYear}_${this.exportForm.statMonth}_${new Date().getTime()}.xlsx`)
+              saveAs(data, filename)
               this.exportOpen = false
             } else {
               this.$modal.msgError(this.dmT("exportFail"))

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

@@ -0,0 +1,844 @@
+<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:livestockOwnershipHousehold:add']"
+            type="primary"
+            plain
+            icon="el-icon-plus"
+            size="mini"
+            @click="handleAdd"
+          >{{ dmCommon("add") }}</el-button>
+          <el-button
+            v-hasPermi="['dataModel:livestockOwnershipHousehold:import']"
+            type="info"
+            plain
+            icon="el-icon-upload2"
+            size="mini"
+            @click="handleImportOpen"
+          >{{ dmT("btnImport") }}</el-button>
+          <el-button
+            v-hasPermi="['dataModel:livestockOwnershipHousehold: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" fixed />
+        <el-table-column :label="dmT('colStatMonth')" align="center" width="80" fixed>
+          <template slot-scope="scope">{{ formatStatMonth(scope.row.statMonth) }}</template>
+        </el-table-column>
+        <el-table-column :label="dmT('colTownName')" prop="townName" align="center" min-width="100" :show-overflow-tooltip="true" />
+        <el-table-column :label="dmT('colVillageName')" prop="villageName" align="center" min-width="100" :show-overflow-tooltip="true" />
+        <el-table-column :label="dmT('colWithHousehold')" align="center" width="100">
+          <template slot-scope="scope">{{ formatCount(scope.row.withLivestockHouseholdCount) }}</template>
+        </el-table-column>
+        <el-table-column :label="dmT('colWithPopulation')" align="center" width="100">
+          <template slot-scope="scope">{{ formatCount(scope.row.withLivestockPopulationCount) }}</template>
+        </el-table-column>
+        <el-table-column :label="dmT('colWithLabor')" align="center" width="100">
+          <template slot-scope="scope">{{ formatCount(scope.row.withLivestockLaborCount) }}</template>
+        </el-table-column>
+        <el-table-column :label="dmT('colWithAnimal')" align="center" width="110">
+          <template slot-scope="scope">{{ formatCount(scope.row.withLivestockAnimalCount) }}</template>
+        </el-table-column>
+        <el-table-column :label="dmT('colWithoutHousehold')" align="center" width="100">
+          <template slot-scope="scope">{{ formatCount(scope.row.withoutLivestockHouseholdCount) }}</template>
+        </el-table-column>
+        <el-table-column :label="dmT('colWithoutPopulation')" align="center" width="100">
+          <template slot-scope="scope">{{ formatCount(scope.row.withoutLivestockPopulationCount) }}</template>
+        </el-table-column>
+        <el-table-column :label="dmT('colWithoutLabor')" align="center" width="100">
+          <template slot-scope="scope">{{ formatCount(scope.row.withoutLivestockLaborCount) }}</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:livestockOwnershipHousehold:query']" type="text" size="mini" @click="handleView(scope.row)">{{ dmCommon("view") }}</el-button>
+            <el-button v-hasPermi="['dataModel:livestockOwnershipHousehold:edit']" type="text" size="mini" @click="handleEdit(scope.row)">{{ dmCommon("edit") }}</el-button>
+            <el-button v-hasPermi="['dataModel:livestockOwnershipHousehold: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="680px" append-to-body @close="cancel">
+      <el-form :key="formKey" ref="form" :model="form" class="loh-form" label-width="120px" size="small">
+        <div class="loh-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="loh-section-title">{{ dmT("sectionWith") }}</div>
+        <el-form-item prop="withLivestockHouseholdCount" :rules="formRules.count">
+          <template slot="label">{{ dmT("formHouseholdCount") }}</template>
+          <div class="dm-input-with-unit">
+            <el-input-number v-model="form.withLivestockHouseholdCount" :min="0" :precision="0" controls-position="right" class="dm-input-with-unit__input" />
+            <span class="dm-input-with-unit__suffix">{{ dmT("unitHousehold") }}</span>
+          </div>
+        </el-form-item>
+        <el-form-item prop="withLivestockPopulationCount" :rules="formRules.count">
+          <template slot="label">{{ dmT("formPopulationCount") }}</template>
+          <div class="dm-input-with-unit">
+            <el-input-number v-model="form.withLivestockPopulationCount" :min="0" :precision="0" controls-position="right" class="dm-input-with-unit__input" />
+            <span class="dm-input-with-unit__suffix">{{ dmT("unitPerson") }}</span>
+          </div>
+        </el-form-item>
+        <el-form-item prop="withLivestockLaborCount" :rules="formRules.count">
+          <template slot="label">{{ dmT("formLaborCount") }}</template>
+          <div class="dm-input-with-unit">
+            <el-input-number v-model="form.withLivestockLaborCount" :min="0" :precision="0" controls-position="right" class="dm-input-with-unit__input" />
+            <span class="dm-input-with-unit__suffix">{{ dmT("unitPerson") }}</span>
+          </div>
+        </el-form-item>
+        <el-form-item prop="withLivestockAnimalCount" :rules="formRules.count">
+          <template slot="label">{{ dmT("formAnimalCount") }}</template>
+          <div class="dm-input-with-unit">
+            <el-input-number v-model="form.withLivestockAnimalCount" :min="0" :precision="0" controls-position="right" class="dm-input-with-unit__input" />
+            <span class="dm-input-with-unit__suffix">{{ dmT("unitHeadPiece") }}</span>
+          </div>
+        </el-form-item>
+
+        <div class="loh-section-title">{{ dmT("sectionWithout") }}</div>
+        <el-form-item prop="withoutLivestockHouseholdCount" :rules="formRules.count">
+          <template slot="label">{{ dmT("formHouseholdCount") }}</template>
+          <div class="dm-input-with-unit">
+            <el-input-number v-model="form.withoutLivestockHouseholdCount" :min="0" :precision="0" controls-position="right" class="dm-input-with-unit__input" />
+            <span class="dm-input-with-unit__suffix">{{ dmT("unitHousehold") }}</span>
+          </div>
+        </el-form-item>
+        <el-form-item prop="withoutLivestockPopulationCount" :rules="formRules.count">
+          <template slot="label">{{ dmT("formPopulationCount") }}</template>
+          <div class="dm-input-with-unit">
+            <el-input-number v-model="form.withoutLivestockPopulationCount" :min="0" :precision="0" controls-position="right" class="dm-input-with-unit__input" />
+            <span class="dm-input-with-unit__suffix">{{ dmT("unitPerson") }}</span>
+          </div>
+        </el-form-item>
+        <el-form-item prop="withoutLivestockLaborCount" :rules="formRules.count">
+          <template slot="label">{{ dmT("formLaborCount") }}</template>
+          <div class="dm-input-with-unit">
+            <el-input-number v-model="form.withoutLivestockLaborCount" :min="0" :precision="0" controls-position="right" class="dm-input-with-unit__input" />
+            <span class="dm-input-with-unit__suffix">{{ dmT("unitPerson") }}</span>
+          </div>
+        </el-form-item>
+
+        <el-form-item prop="remark" :rules="formRules.remark">
+          <template slot="label">{{ dmT("formRemark") }}</template>
+          <el-input v-model="form.remark" type="textarea" :rows="2" :placeholder="dmT('phRemark')" maxlength="500" show-word-limit />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">{{ dmCommon("ok") }}</el-button>
+        <el-button @click="cancel">{{ dmCommon("cancel") }}</el-button>
+      </div>
+    </el-dialog>
+
+    <el-dialog :title="dmCommon('viewTitle')" :visible.sync="viewOpen" width="680px" append-to-body>
+      <el-form class="dm-view-form loh-form" label-width="120px" size="small">
+        <div class="loh-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="loh-section-title">{{ dmT("sectionWith") }}</div>
+        <el-form-item :label="dmT('formHouseholdCount')">
+          <span>{{ formatWithUnit(formatCount(viewRow.withLivestockHouseholdCount), "unitHousehold") }}</span>
+        </el-form-item>
+        <el-form-item :label="dmT('formPopulationCount')">
+          <span>{{ formatWithUnit(formatCount(viewRow.withLivestockPopulationCount), "unitPerson") }}</span>
+        </el-form-item>
+        <el-form-item :label="dmT('formLaborCount')">
+          <span>{{ formatWithUnit(formatCount(viewRow.withLivestockLaborCount), "unitPerson") }}</span>
+        </el-form-item>
+        <el-form-item :label="dmT('formAnimalCount')">
+          <span>{{ formatWithUnit(formatCount(viewRow.withLivestockAnimalCount), "unitHeadPiece") }}</span>
+        </el-form-item>
+
+        <div class="loh-section-title">{{ dmT("sectionWithout") }}</div>
+        <el-form-item :label="dmT('formHouseholdCount')">
+          <span>{{ formatWithUnit(formatCount(viewRow.withoutLivestockHouseholdCount), "unitHousehold") }}</span>
+        </el-form-item>
+        <el-form-item :label="dmT('formPopulationCount')">
+          <span>{{ formatWithUnit(formatCount(viewRow.withoutLivestockPopulationCount), "unitPerson") }}</span>
+        </el-form-item>
+        <el-form-item :label="dmT('formLaborCount')">
+          <span>{{ formatWithUnit(formatCount(viewRow.withoutLivestockLaborCount), "unitPerson") }}</span>
+        </el-form-item>
+
+        <el-form-item :label="dmT('formRemark')">
+          <span class="loh-view-text">{{ viewRow.remark || dash }}</span>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button v-hasPermi="['dataModel:livestockOwnershipHousehold: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="loh-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 {
+  listLivestockOwnershipHousehold,
+  getLivestockOwnershipHousehold,
+  addLivestockOwnershipHousehold,
+  updateLivestockOwnershipHousehold,
+  delLivestockOwnershipHousehold,
+  listLivestockOwnershipHouseholdYearOptions,
+  listLivestockOwnershipHouseholdMonthOptions,
+  listLivestockOwnershipHouseholdTownOptions,
+  listLivestockOwnershipHouseholdVillageTree,
+  importLivestockOwnershipHousehold,
+  downloadLivestockOwnershipHouseholdTemplate,
+  exportLivestockOwnershipHousehold
+} from "@/api/dataModel/livestockOwnershipHousehold"
+import { blobValidate } from "@/utils/ruoyi"
+import { saveAs } from "file-saver"
+
+const COUNT_PROPS = [
+  "withLivestockHouseholdCount",
+  "withLivestockPopulationCount",
+  "withLivestockLaborCount",
+  "withLivestockAnimalCount",
+  "withoutLivestockHouseholdCount",
+  "withoutLivestockPopulationCount",
+  "withoutLivestockLaborCount"
+]
+
+function getCurrentYearMonth() {
+  const now = new Date()
+  return { statYear: now.getFullYear(), statMonth: now.getMonth() + 1 }
+}
+
+function createEmptyForm() {
+  const form = {
+    id: undefined,
+    statYear: undefined,
+    statMonth: undefined,
+    villageDeptId: undefined,
+    remark: undefined
+  }
+  COUNT_PROPS.forEach((prop) => {
+    form[prop] = undefined
+  })
+  return form
+}
+
+function normalizeForm(data) {
+  const row = Object.assign(createEmptyForm(), data || {})
+  COUNT_PROPS.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
+}
+
+export default {
+  name: "LivestockOwnershipHousehold",
+  mixins: [dataModelLocaleMixin],
+  data() {
+    return {
+      dmNs: "livestockOwnershipHousehold",
+      loading: false,
+      importing: false,
+      exporting: false,
+      open: false,
+      viewOpen: false,
+      importOpen: false,
+      exportOpen: false,
+      dialogEdit: false,
+      formKey: 0,
+      total: 0,
+      tableList: [],
+      yearOptions: [],
+      monthOptions: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12],
+      townOptions: [],
+      villageOptions: [],
+      viewRow: {},
+      importForm: { statYear: undefined, statMonth: undefined },
+      exportForm: { statYear: undefined, statMonth: undefined, townDeptId: undefined },
+      queryParams: {
+        pageNum: 1,
+        pageSize: 20,
+        statYear: undefined,
+        statMonth: undefined,
+        townDeptId: undefined,
+        villageDeptId: undefined
+      },
+      form: createEmptyForm()
+    }
+  },
+  computed: {
+    dash() {
+      return this.$t("dataModel.status.dash")
+    },
+    dialogTitle() {
+      return this.dialogEdit ? this.dmT("dialogEdit") : this.dmT("dialogAdd")
+    },
+    formRules() {
+      return {
+        statYear: [{ required: true, message: this.dmT("ruleStatYearRequired"), trigger: "change" }],
+        statMonth: [
+          { required: true, message: this.dmT("ruleStatMonthRequired"), trigger: "change" },
+          { validator: this.validateFormStatMonth, trigger: "change" }
+        ],
+        villageDeptId: [{ required: true, message: this.dmT("ruleVillageRequired"), trigger: "change" }],
+        count: [{ validator: this.validateOptionalCount, 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() {
+      listLivestockOwnershipHouseholdYearOptions().then((res) => {
+        this.yearOptions = Array.isArray(res.data) ? res.data : []
+      })
+      listLivestockOwnershipHouseholdMonthOptions().then((res) => {
+        if (Array.isArray(res.data) && res.data.length) {
+          this.monthOptions = res.data
+        }
+      })
+      listLivestockOwnershipHouseholdTownOptions().then((res) => {
+        this.townOptions = Array.isArray(res.data) ? res.data : []
+      })
+      this.loadVillageTree()
+    },
+    loadVillageTree() {
+      return listLivestockOwnershipHouseholdVillageTree()
+        .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
+    },
+    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()
+    },
+    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
+      listLivestockOwnershipHousehold(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) {
+      getLivestockOwnershipHousehold(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) {
+      getLivestockOwnershipHousehold(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(() => delLivestockOwnershipHousehold(row.id))
+        .then(() => {
+          this.$modal.msgSuccess(this.dmCommon("msgDelOk"))
+          this.getList()
+        })
+        .catch(() => {})
+    },
+    normalizeCount(val) {
+      return val == null || val === "" ? null : val
+    },
+    buildSubmitPayload() {
+      const payload = {
+        id: this.form.id,
+        statYear: this.form.statYear,
+        statMonth: this.form.statMonth,
+        villageDeptId: this.form.villageDeptId,
+        remark: this.form.remark
+      }
+      COUNT_PROPS.forEach((prop) => {
+        payload[prop] = this.normalizeCount(this.form[prop])
+      })
+      return payload
+    },
+    submitForm() {
+      this.$refs.form.validate((valid) => {
+        if (!valid) {
+          return
+        }
+        const payload = this.buildSubmitPayload()
+        if (this.dialogEdit) {
+          updateLivestockOwnershipHousehold(payload).then(() => {
+            this.$modal.msgSuccess(this.dmCommon("msgEditOk"))
+            this.open = false
+            this.getList()
+          })
+        } else {
+          addLivestockOwnershipHousehold(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() {
+      downloadLivestockOwnershipHouseholdTemplate().then(async (data) => {
+        const isBlob = blobValidate(data)
+        if (isBlob) {
+          saveAs(data, `livestock_ownership_household_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"))
+        importLivestockOwnershipHousehold(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
+        const filename = `${this.exportForm.statYear}年${this.exportForm.statMonth}月有无畜户数据.xlsx`
+        this.$modal.loading(this.dmT("exportLoading"))
+        exportLivestockOwnershipHousehold(this.exportForm.statYear, this.exportForm.statMonth, this.exportForm.townDeptId)
+          .then(async (data) => {
+            const isBlob = blobValidate(data)
+            if (isBlob) {
+              saveAs(
+                data,
+                filename
+              )
+              this.exportOpen = false
+            } else {
+              this.$modal.msgError(this.dmT("exportFail"))
+            }
+          })
+          .finally(() => {
+            this.exporting = false
+            this.$modal.closeLoading()
+          })
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+.loh-section-title {
+  margin: 4px 0 12px;
+  font-weight: 600;
+  color: #303133;
+}
+.loh-import-tip {
+  margin: 0 0 12px;
+  color: #909399;
+  font-size: 12px;
+  line-height: 1.5;
+}
+.loh-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/ruralThreeAssets/index.vue

@@ -0,0 +1,476 @@
+<template>
+  <div class="app-container">
+    <el-card shadow="never">
+      <el-form ref="queryForm" :model="queryParams" size="small" :inline="true">
+        <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:ruralThreeAssets:add']"
+            type="primary"
+            plain
+            icon="el-icon-plus"
+            size="mini"
+            @click="handleAdd"
+          >{{ dmCommon("add") }}</el-button>
+        </el-form-item>
+      </el-form>
+    </el-card>
+
+    <br />
+
+    <el-card shadow="never">
+      <el-table v-loading="loading" :data="tableList" border>
+        <template slot="empty">
+          <span>{{ dmT("emptyList") }}</span>
+        </template>
+        <el-table-column :label="dmT('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('colOperatingFixedAssets')" align="center" min-width="140">
+          <template slot-scope="scope">{{ formatMoney(scope.row.operatingFixedAssets) }}</template>
+        </el-table-column>
+        <el-table-column :label="dmT('colNonOperatingFixedAssets')" align="center" min-width="150">
+          <template slot-scope="scope">{{ formatMoney(scope.row.nonOperatingFixedAssets) }}</template>
+        </el-table-column>
+        <el-table-column :label="dmT('colFixedAssets')" align="center" min-width="120">
+          <template slot-scope="scope">{{ formatMoney(scope.row.fixedAssets) }}</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:ruralThreeAssets:query']" type="text" size="mini" @click="handleView(scope.row)">{{ dmCommon("view") }}</el-button>
+            <el-button v-hasPermi="['dataModel:ruralThreeAssets:edit']" type="text" size="mini" @click="handleEdit(scope.row)">{{ dmCommon("edit") }}</el-button>
+            <el-button v-hasPermi="['dataModel:ruralThreeAssets: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="rta-form" label-width="160px" size="small">
+        <div class="rta-section-title">{{ dmT("sectionBasic") }}</div>
+        <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="rta-section-title">{{ dmT("sectionAssets") }}</div>
+        <el-form-item prop="operatingFixedAssets" :rules="formRules.money">
+          <template slot="label">{{ dmT("formOperatingFixedAssets") }}</template>
+          <div class="dm-input-with-unit">
+            <el-input-number
+              v-model="form.operatingFixedAssets"
+              :min="0"
+              :precision="2"
+              controls-position="right"
+              class="dm-input-with-unit__input"
+            />
+            <span class="dm-input-with-unit__suffix">{{ dmT("unitWanYuan") }}</span>
+          </div>
+        </el-form-item>
+        <el-form-item prop="nonOperatingFixedAssets" :rules="formRules.money">
+          <template slot="label">{{ dmT("formNonOperatingFixedAssets") }}</template>
+          <div class="dm-input-with-unit">
+            <el-input-number
+              v-model="form.nonOperatingFixedAssets"
+              :min="0"
+              :precision="2"
+              controls-position="right"
+              class="dm-input-with-unit__input"
+            />
+            <span class="dm-input-with-unit__suffix">{{ dmT("unitWanYuan") }}</span>
+          </div>
+        </el-form-item>
+        <el-form-item>
+          <template slot="label">{{ dmT("formFixedAssets") }}</template>
+          <div class="dm-input-with-unit">
+            <el-input :value="fixedAssetsDisplay" disabled class="dm-input-with-unit__input" />
+            <span class="dm-input-with-unit__suffix">{{ dmT("unitWanYuan") }}</span>
+          </div>
+        </el-form-item>
+        <el-form-item prop="remark" :rules="formRules.remark">
+          <template slot="label">{{ dmT("formRemark") }}</template>
+          <el-input v-model="form.remark" type="textarea" :rows="2" :placeholder="dmT('phRemark')" maxlength="500" show-word-limit />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">{{ dmCommon("ok") }}</el-button>
+        <el-button @click="cancel">{{ dmCommon("cancel") }}</el-button>
+      </div>
+    </el-dialog>
+
+    <el-dialog :title="dmCommon('viewTitle')" :visible.sync="viewOpen" width="640px" append-to-body>
+      <el-form class="dm-view-form rta-form" label-width="160px" size="small">
+        <div class="rta-section-title">{{ dmT("sectionBasic") }}</div>
+        <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="rta-section-title">{{ dmT("sectionAssets") }}</div>
+        <el-form-item :label="dmT('formOperatingFixedAssets')">
+          <span>{{ formatWithUnit(formatMoney(viewRow.operatingFixedAssets), "unitWanYuan") }}</span>
+        </el-form-item>
+        <el-form-item :label="dmT('formNonOperatingFixedAssets')">
+          <span>{{ formatWithUnit(formatMoney(viewRow.nonOperatingFixedAssets), "unitWanYuan") }}</span>
+        </el-form-item>
+        <el-form-item :label="dmT('formFixedAssets')">
+          <span>{{ formatWithUnit(formatMoney(viewRow.fixedAssets), "unitWanYuan") }}</span>
+        </el-form-item>
+        <el-form-item :label="dmT('formRemark')">
+          <span class="rta-view-text">{{ viewRow.remark || dash }}</span>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button v-hasPermi="['dataModel:ruralThreeAssets:edit']" type="primary" @click="handleEditFromView">{{ dmCommon("edit") }}</el-button>
+        <el-button @click="viewOpen = false">{{ dmCommon("close") }}</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import dataModelLocaleMixin from "@/mixins/dataModelLocaleMixin"
+import {
+  listRuralThreeAssets,
+  getRuralThreeAssets,
+  addRuralThreeAssets,
+  updateRuralThreeAssets,
+  delRuralThreeAssets,
+  listRuralThreeAssetsTownOptions,
+  listRuralThreeAssetsVillageTree
+} from "@/api/dataModel/ruralThreeAssets"
+
+function createEmptyForm() {
+  return {
+    id: undefined,
+    villageDeptId: undefined,
+    operatingFixedAssets: undefined,
+    nonOperatingFixedAssets: undefined,
+    remark: undefined
+  }
+}
+
+function normalizeForm(data) {
+  const row = Object.assign(createEmptyForm(), data || {})
+  ;["operatingFixedAssets", "nonOperatingFixedAssets"].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 calcFixedAssets(operating, nonOperating) {
+  if ((operating == null || operating === "") && (nonOperating == null || nonOperating === "")) {
+    return null
+  }
+  const a = operating == null || operating === "" ? 0 : Number(operating)
+  const b = nonOperating == null || nonOperating === "" ? 0 : Number(nonOperating)
+  if (!Number.isFinite(a) || !Number.isFinite(b)) {
+    return null
+  }
+  return Math.round((a + b) * 100) / 100
+}
+
+export default {
+  name: "RuralThreeAssets",
+  mixins: [dataModelLocaleMixin],
+  data() {
+    return {
+      dmNs: "ruralThreeAssets",
+      loading: false,
+      open: false,
+      viewOpen: false,
+      dialogEdit: false,
+      formKey: 0,
+      total: 0,
+      tableList: [],
+      townOptions: [],
+      villageOptions: [],
+      viewRow: {},
+      queryParams: {
+        pageNum: 1,
+        pageSize: 20,
+        townDeptId: undefined,
+        villageDeptId: undefined
+      },
+      form: createEmptyForm()
+    }
+  },
+  computed: {
+    dash() {
+      return this.$t("dataModel.status.dash")
+    },
+    dialogTitle() {
+      return this.dialogEdit ? this.dmT("dialogEdit") : this.dmT("dialogAdd")
+    },
+    fixedAssetsDisplay() {
+      const sum = calcFixedAssets(this.form.operatingFixedAssets, this.form.nonOperatingFixedAssets)
+      return sum == null ? this.dash : sum.toFixed(2)
+    },
+    formRules() {
+      return {
+        villageDeptId: [{ required: true, message: this.dmT("ruleVillageRequired"), trigger: "change" }],
+        money: [{ validator: this.validateOptionalMoney, trigger: "change" }],
+        remark: [{ max: 500, message: this.dmCommon("ruleLen500"), trigger: "blur" }]
+      }
+    }
+  },
+  created() {
+    this.loadOptions()
+    this.getList()
+  },
+  methods: {
+    loadOptions() {
+      listRuralThreeAssetsTownOptions().then((res) => {
+        this.townOptions = Array.isArray(res.data) ? res.data : []
+      })
+      this.loadVillageTree()
+    },
+    loadVillageTree() {
+      return listRuralThreeAssetsVillageTree()
+        .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 = []
+        })
+    },
+    formatMoney(val) {
+      if (val == null || val === "") {
+        return this.dash
+      }
+      const n = Number(val)
+      if (!Number.isFinite(n)) {
+        return this.dash
+      }
+      return n.toFixed(2)
+    },
+    validateOptionalMoney(rule, value, callback) {
+      if (value == null || value === "") {
+        callback()
+        return
+      }
+      if (typeof value !== "number" || Number.isNaN(value) || value < 0) {
+        callback(new Error(this.dmT("ruleMoneyNonNegative")))
+        return
+      }
+      callback()
+    },
+    buildListQuery() {
+      const q = {
+        pageNum: this.queryParams.pageNum,
+        pageSize: this.queryParams.pageSize
+      }
+      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
+      listRuralThreeAssets(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,
+        townDeptId: undefined,
+        villageDeptId: undefined
+      }
+      this.getList()
+    },
+    handleAdd() {
+      this.dialogEdit = false
+      this.formKey += 1
+      this.form = createEmptyForm()
+      this.open = true
+      this.$nextTick(() => {
+        if (this.$refs.form) {
+          this.$refs.form.clearValidate()
+        }
+      })
+    },
+    handleEdit(row) {
+      getRuralThreeAssets(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) {
+      getRuralThreeAssets(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(() => delRuralThreeAssets(row.id))
+        .then(() => {
+          this.$modal.msgSuccess(this.dmCommon("msgDelOk"))
+          this.getList()
+        })
+        .catch(() => {})
+    },
+    normalizeMoney(val) {
+      return val == null || val === "" ? null : val
+    },
+    buildSubmitPayload() {
+      return {
+        id: this.form.id,
+        villageDeptId: this.form.villageDeptId,
+        operatingFixedAssets: this.normalizeMoney(this.form.operatingFixedAssets),
+        nonOperatingFixedAssets: this.normalizeMoney(this.form.nonOperatingFixedAssets),
+        remark: this.form.remark
+      }
+    },
+    submitForm() {
+      this.$refs.form.validate((valid) => {
+        if (!valid) {
+          return
+        }
+        const payload = this.buildSubmitPayload()
+        if (this.dialogEdit) {
+          updateRuralThreeAssets(payload).then(() => {
+            this.$modal.msgSuccess(this.dmCommon("msgEditOk"))
+            this.open = false
+            this.getList()
+          })
+        } else {
+          addRuralThreeAssets(payload).then(() => {
+            this.$modal.msgSuccess(this.dmCommon("msgAddOk"))
+            this.open = false
+            this.getList()
+          })
+        }
+      })
+    },
+    cancel() {
+      this.open = false
+      this.form = createEmptyForm()
+    }
+  }
+}
+</script>
+
+<style scoped>
+.rta-section-title {
+  margin: 4px 0 12px;
+  font-weight: 600;
+  color: #303133;
+}
+.rta-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/vaccinationData/index.vue

@@ -774,6 +774,7 @@ export default {
           return
         }
         this.exporting = true
+        const filename = `${this.exportForm.statYear}年${this.exportForm.statMonth}月疫苗接种数据.xlsx`
         this.$modal.loading(this.dmT("exportLoading"))
         exportVaccinationData(this.exportForm.statYear, this.exportForm.statMonth, this.exportForm.townDeptId)
           .then(async (data) => {
@@ -781,7 +782,7 @@ export default {
             if (isBlob) {
               saveAs(
                 data,
-                `vaccination_data_${this.exportForm.statYear}_${this.exportForm.statMonth}_${new Date().getTime()}.xlsx`
+                filename
               )
               this.exportOpen = false
             } else {