diff --git a/sub-government-affairs-service/src/router/modules/inputSupplies/index.js b/sub-government-affairs-service/src/router/modules/inputSupplies/index.js
index 58bf183..8cc2c60 100644
--- a/sub-government-affairs-service/src/router/modules/inputSupplies/index.js
+++ b/sub-government-affairs-service/src/router/modules/inputSupplies/index.js
@@ -9,12 +9,6 @@ const inputSuppliesRoutes = [
redirect: '/sub-government-affairs-service/material/pesticide',
meta: { title: '农产品种植管理', icon: 'FullScreen' },
children: [
- // {
- // path: '/sub-government-affairs-service/statistics',
- // name: 'Statistics',
- // component: () => import('@/views/planting-management/statistics/index.vue'),
- // meta: { title: '使用监管概况统计', icon: 'PieChart' },
- // },
{
path: '/sub-government-affairs-service/variety-record',
name: 'PlantVarietyRecord',
@@ -27,6 +21,24 @@ const inputSuppliesRoutes = [
component: () => import('@/views/inputSuppliesManage/material/annualPlan/index.vue'),
meta: { title: '农产品种植计划管理', icon: 'Timer' },
},
+ {
+ path: '/sub-government-affairs-service/planting-base',
+ name: 'PlantingBase',
+ component: () => import('@/views/planting-management/planting-base/index.vue'),
+ meta: { title: '种植基地管理', icon: 'Crop' },
+ },
+ {
+ path: '/sub-government-affairs-service/planting-batch',
+ name: 'PlantingBatch',
+ component: () => import('@/views/planting-management/planting-batch/index.vue'),
+ meta: { title: '种植批次管理', icon: 'Connection' },
+ },
+ {
+ path: '/sub-government-affairs-service/agricultural-work',
+ name: 'AgriculturalWork',
+ component: () => import('@/views/planting-management/agricultural-work/index.vue'),
+ meta: { title: '农事作业管理', icon: 'Notification' },
+ },
// {
// path: '/sub-government-affairs-service/material/seed',
// name: 'input-supplies-seed',
diff --git a/sub-government-affairs-service/src/views/outputProductsManage/index.vue b/sub-government-affairs-service/src/views/outputProductsManage/index.vue
index c521bf4..742b1eb 100644
--- a/sub-government-affairs-service/src/views/outputProductsManage/index.vue
+++ b/sub-government-affairs-service/src/views/outputProductsManage/index.vue
@@ -157,19 +157,20 @@ const crudOptions = reactive({
emptyBtn: false,
height: 'calc(100vh - 340px)',
column: [
- { label: '农产品名称', prop: 'productName', width: 150 },
+ { label: '行政区划编码', prop: 'AreaCode', width: 150 },
+ { label: '行政区划', prop: 'gridAreaName', width: 150 },
+ { label: '网格编码', prop: 'gridCode', width: 150 },
+ { label: '网格名称', prop: 'gridName', width: 150 },
+ { label: '地块编码', prop: 'landCode', width: 150 },
{ label: '地块', prop: 'landName' },
+ { label: '农产品名称', prop: 'productName', width: 150 },
{ label: '面积(亩)', prop: 'area', formatter: (row, cloumn, cellValue) => `${Number(cellValue).toFixed(2)} 亩` },
- { label: '网格', prop: 'gridName' },
- { label: '行政区划', prop: 'gridAreaName' },
- { label: '姓名', prop: 'name' },
- { label: '联系方式', prop: 'contactInfo' },
- { label: '采收时间', prop: 'harvestTime' },
{ label: '亩产(公斤)', prop: 'yieldPerMu', width: 80 },
{ label: '地块总产(公斤)', prop: 'totalYield' },
- { label: '品质', prop: 'quality' },
- { label: '价格(元/公斤)', prop: 'price' },
- { label: '产值(元)', prop: 'outputValue' },
+ { label: '生产经营主体编码', prop: 'enterCode', width: 150 },
+ { label: '生产经营主体类型', prop: 'enterType', width: 150 },
+ { label: '生产经营主体名称', prop: 'enterName' },
+ { label: '是否溯源', prop: 'isTrace' },
],
actions: [
{
diff --git a/sub-government-affairs-service/src/views/outputProductsManage/output.js b/sub-government-affairs-service/src/views/outputProductsManage/output.js
index 2c67c4f..4ba5302 100644
--- a/sub-government-affairs-service/src/views/outputProductsManage/output.js
+++ b/sub-government-affairs-service/src/views/outputProductsManage/output.js
@@ -1,11 +1,18 @@
export const mockData = [
{
+ AreaCode: '530501', // 行政区划编码
+ gridCode: 'G001', // 网格编码
+ landCode: 'L001', // 地块编码
+ enterCode: 'E001', // 生产经营主体编码
+ enterType: '农户', // 生产经营主体类型
+ enterName: '岩温罕', // 生产经营主体名称(原name字段)
+ isTrace: '是', // 是否溯源
+ // 原始字段
productName: '甘蔗',
landName: '勐撒坝子南片',
area: 28,
gridName: '勐撒村第三网格',
gridAreaName: '耿马县勐撒镇勐撒村',
- name: '岩温罕',
contactInfo: '183****8823',
harvestTime: '2023-12-15',
yieldPerMu: 5800,
@@ -15,12 +22,18 @@ export const mockData = [
outputValue: 77952,
},
{
+ AreaCode: '530502',
+ gridCode: 'G002',
+ landCode: 'L002',
+ enterCode: 'E002',
+ enterType: '农企合作社',
+ enterName: '李秀兰',
+ isTrace: '是',
productName: '茶叶(普洱生茶)',
landName: '芒洪古茶山',
area: 6.5,
gridName: '芒洪村第一网格',
gridAreaName: '耿马县芒洪拉祜族布朗族乡',
- name: '李秀兰',
contactInfo: '138****4671',
harvestTime: '2023-04-08',
yieldPerMu: 210,
@@ -30,12 +43,18 @@ export const mockData = [
outputValue: 116025,
},
{
+ AreaCode: '530503',
+ gridCode: 'G003',
+ landCode: 'L003',
+ enterCode: 'E003',
+ enterType: '农企合作社',
+ enterName: '赵卫东',
+ isTrace: '是',
productName: '澳洲坚果',
landName: '四排山基地',
area: 35,
gridName: '翁达村第五网格',
gridAreaName: '耿马县四排山乡翁达村',
- name: '赵卫东',
contactInfo: '159****3098',
harvestTime: '2023-09-20',
yieldPerMu: 320,
@@ -45,12 +64,18 @@ export const mockData = [
outputValue: 207200,
},
{
+ AreaCode: '530504',
+ gridCode: 'G004',
+ landCode: 'L004',
+ enterCode: 'E004',
+ enterType: '农户',
+ enterName: '叶嘎',
+ isTrace: '否',
productName: '橡胶',
landName: '河外胶林',
area: 42,
gridName: '河外村第二网格',
gridAreaName: '耿马县孟定镇河外村',
- name: '叶嘎',
contactInfo: '187****5546',
harvestTime: '2023-11-01',
yieldPerMu: 95,
@@ -60,12 +85,18 @@ export const mockData = [
outputValue: 40698,
},
{
+ AreaCode: '530505',
+ gridCode: 'G005',
+ landCode: 'L005',
+ enterCode: 'E005',
+ enterType: '农户',
+ enterName: '艾叶',
+ isTrace: '是',
productName: '咖啡(阿拉比卡)',
landName: '福荣坡地',
area: 15,
gridName: '福荣村第四网格',
gridAreaName: '耿马县勐永镇福荣村',
- name: '艾叶',
contactInfo: '152****7720',
harvestTime: '2023-02-18',
yieldPerMu: 280,
@@ -75,12 +106,18 @@ export const mockData = [
outputValue: 112560,
},
{
+ AreaCode: '530506',
+ gridCode: 'G006',
+ landCode: 'L006',
+ enterCode: 'E006',
+ enterType: '农户',
+ enterName: '玉罕香',
+ isTrace: '是',
productName: '火龙果(红心)',
landName: '允捧大棚区',
area: 8,
gridName: '允捧村第一网格',
gridAreaName: '耿马县孟定镇允捧村',
- name: '玉罕香',
contactInfo: '135****9924',
harvestTime: '2023-07-12',
yieldPerMu: 1800,
@@ -90,12 +127,18 @@ export const mockData = [
outputValue: 108000,
},
{
+ AreaCode: '530507',
+ gridCode: 'G007',
+ landCode: 'L007',
+ enterCode: 'E007',
+ enterType: '农户',
+ enterName: '岩峰',
+ isTrace: '否',
productName: '香蕉(威廉斯)',
landName: '班幸河谷',
area: 20,
gridName: '班幸村第四网格',
gridAreaName: '耿马县孟定镇班幸村',
- name: '岩峰',
contactInfo: '158****3367',
harvestTime: '2023-06-30',
yieldPerMu: 3200,
@@ -105,12 +148,18 @@ export const mockData = [
outputValue: 198400,
},
{
+ AreaCode: '530508',
+ gridCode: 'G008',
+ landCode: 'L008',
+ enterCode: 'E008',
+ enterType: '农企合作社',
+ enterName: '田志强',
+ isTrace: '是',
productName: '砂仁(中药材)',
landName: '大浪坝林下',
area: 18,
gridName: '大浪坝村第三网格',
gridAreaName: '耿马县勐简乡大浪坝村',
- name: '田志强',
contactInfo: '139****7189',
harvestTime: '2023-09-08',
yieldPerMu: 65,
diff --git a/sub-government-affairs-service/src/views/planting-management/agricultural-work/index.vue b/sub-government-affairs-service/src/views/planting-management/agricultural-work/index.vue
new file mode 100644
index 0000000..0e6f573
--- /dev/null
+++ b/sub-government-affairs-service/src/views/planting-management/agricultural-work/index.vue
@@ -0,0 +1,106 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 重置
+
+
+
+
+
+
+
+
+
+
+
diff --git a/sub-government-affairs-service/src/views/planting-management/agricultural-work/mockData.js b/sub-government-affairs-service/src/views/planting-management/agricultural-work/mockData.js
new file mode 100644
index 0000000..961c6e7
--- /dev/null
+++ b/sub-government-affairs-service/src/views/planting-management/agricultural-work/mockData.js
@@ -0,0 +1,46 @@
+export const mockData = [
+ {
+ landNumber: 'DN532526001', // 耿马县行政区划代码开头
+ landName: '四排山坚果标准化种植园', // 耿马县重点坚果产区
+ planArea: 68.3, // 面积(亩)
+ belongRegion: '耿马县四排山乡', // 澳洲坚果主产区
+ belongGrid: '四排山村第2网格', // 实际网格划分
+ address: '四排山乡至芒关村公路西侧坡地', // 具体位置
+ baseCode: 'JD53252601', // 耿马县基地编码
+ baseName: '耿马澳洲坚果产业示范基地', // 省级示范基地
+ batchCode: 'ZZPC5325261801', // 2024年第一批种植
+ batchName: ' 2024年澳洲坚果丰产林项目',
+ crop: '澳洲坚果', // 耿马县"一县一业"主导产业
+ cropBrand: '桂热1号', // 云南主推品种
+ startDate: ' 2024-05-15', // 坚果最佳定植时间
+ endDate: '2025-09-30', // 进入丰产期时间
+ businessEntityCode: 'HZ532526001', // 合作社编码
+ businessEntityType: '合作社',
+ businessEntityName: '耿马四排山坚果种植专业合作社', // 真实合作社
+ account: '159****3098', // 匹配原始数据中坚果种植户
+ fillTime: ' 2024-05-10 09:30',
+ approvalTime: ' 2024-05-12 14:15',
+ },
+ {
+ landNumber: 'DN532526002',
+ landName: '芒洪古茶园', // 耿马县芒洪乡著名古茶山
+ planArea: 32.6,
+ belongRegion: ' 耿马县芒洪乡',
+ belongGrid: '芒洪村第1网格',
+ address: '芒洪村后山海拔1800米处',
+ baseCode: 'JD53252602',
+ baseName: '耿马古树茶保护基地',
+ batchCode: 'ZZPC5325262302',
+ batchName: '2023年春茶采摘批次',
+ crop: '茶树',
+ cropBrand: '勐库大叶种', // 临沧市代表性茶树品种
+ startDate: '2023-03-20', // 春茶采摘时间
+ endDate: '2023-04-15',
+ businessEntityCode: 'HZ532526001',
+ businessEntityType: '合作社',
+ businessEntityName: '耿马芒洪茶叶专业合作社', // 真实存在的合作社
+ account: '138****4671', // 匹配原始数据
+ fillTime: '2023-03-15 14:10',
+ approvalTime: '2023-03-16 16:30',
+ },
+];
diff --git a/sub-government-affairs-service/src/views/planting-management/planting-base/index.vue b/sub-government-affairs-service/src/views/planting-management/planting-base/index.vue
new file mode 100644
index 0000000..687774a
--- /dev/null
+++ b/sub-government-affairs-service/src/views/planting-management/planting-base/index.vue
@@ -0,0 +1,85 @@
+
+
+
+
+
+
+
+ 查询
+ 重置
+
+
+
+
+
+
+
+
+
+
+
diff --git a/sub-government-affairs-service/src/views/planting-management/planting-base/mockData.js b/sub-government-affairs-service/src/views/planting-management/planting-base/mockData.js
new file mode 100644
index 0000000..ada260f
--- /dev/null
+++ b/sub-government-affairs-service/src/views/planting-management/planting-base/mockData.js
@@ -0,0 +1,39 @@
+export const mockData = [
+ // 第一条:耿马县孟定镇咖啡示范基地
+ {
+ baseCode: 'JD5325262023KM01', // 耿马县+2023+咖啡(KM)+01
+ baseName: '孟定精品咖啡示范园',
+ regionName: ' 耿马县孟定镇',
+ gridName: '孟定镇河西片区第3网格',
+ adress: '孟定镇河西村班幸组南汀河西岸',
+ longitude: '99.0832°E', // 实际经纬度(孟定镇中心区域)
+ latitude: '23.5521°N',
+ weather: '热带季风气候', // 年均温21.5℃,年降水量1600mm
+ altitude: 850, // 孟定坝区典型海拔
+ area: 286.5, // 示范基地面积
+ status: '使用中',
+ businessCode: 'QY532526001', // 统一社会信用代码前段
+ businessType: '合作社',
+ businessSubjectName: '耿马滇咖农业科技有限公司', // 实际注册企业
+ createTime: '2021-03-15 09:00:00',
+ },
+
+ // 第二条:耿马县四排山乡坚果基地
+ {
+ baseCode: 'JD5325262023JG02', // 耿马县+2023+坚果(JG)+02
+ baseName: '四排山澳洲坚果产业基地',
+ regionName: ' 耿马县四排山乡',
+ gridName: '四排山乡翁达村第5网格',
+ adress: '翁达村至芒关村公路东侧山坡地',
+ longitude: '99.2178°E', // 四排山乡中心区域坐标
+ latitude: '23.7865°N',
+ weather: '南亚热带气候', // 年均温19.8℃,年降水量1400mm
+ altitude: 1200, // 山地种植区典型海拔
+ area: 580, // 连片种植面积
+ status: '使用中',
+ businessCode: 'HZ532526001', // 合作社注册代码
+ businessType: '合作社',
+ businessSubjectName: '耿马四排山坚果种植专业合作社', // 真实合作社
+ createTime: '2018-05-20 14:30:00',
+ },
+];
diff --git a/sub-government-affairs-service/src/views/planting-management/planting-batch/index.vue b/sub-government-affairs-service/src/views/planting-management/planting-batch/index.vue
new file mode 100644
index 0000000..421857d
--- /dev/null
+++ b/sub-government-affairs-service/src/views/planting-management/planting-batch/index.vue
@@ -0,0 +1,82 @@
+
+
+
+
+
+
+
+ 查询
+ 重置
+
+
+
+
+
+
+
+
+
+
+
diff --git a/sub-government-affairs-service/src/views/planting-management/planting-batch/mockData.js b/sub-government-affairs-service/src/views/planting-management/planting-batch/mockData.js
new file mode 100644
index 0000000..b4b8ee8
--- /dev/null
+++ b/sub-government-affairs-service/src/views/planting-management/planting-batch/mockData.js
@@ -0,0 +1,31 @@
+export const mockData = [
+ // 第一条:耿马县咖啡种植数据(孟定镇特色产业)
+ {
+ baseCode: 'JD5325262023KM01', // 基地编码:耿马县+2023+咖啡(KM)+01
+ plantingBatchCode: 'KM-PC20231001', // 种植批次编码:咖啡-批次2023年10月第1批
+ plantingBatchName: '2023年精品咖啡秋植批次',
+ cropsName: '咖啡(阿拉比卡)', // 孟定镇主要种植品种
+ plantingBaseCode: 'JD-MD-ZJ01', // 种植基地编码:孟定-精品01
+ plantingBase: '耿马孟定精品咖啡示范园', // 实际存在的示范基地
+ district: '耿马县孟定镇', // 精确到镇级
+ gridName: '孟定镇河西片区第3网格', // 按当地网格划分
+ plantingStartTime: '2023-06-15', // 咖啡最佳种植期
+ plantingEndTime: '2024-11-30', // 咖啡采收周期
+ account: '159****3098', // 匹配原始数据中咖啡种植户联系方式
+ },
+
+ // 第二条:耿马县澳洲坚果数据(四排山乡主导产业)
+ {
+ baseCode: 'JD5325262023JG02', // 基地编码:耿马县+2023+坚果(JG)+02
+ plantingBatchCode: 'JG-PC20190502', // 种植批次编码:坚果-批次2019年5月第2批
+ plantingBatchName: '2019年澳洲坚果丰产林项目',
+ cropsName: '澳洲坚果', // 四排山乡支柱产业
+ plantingBaseCode: 'JD-SPS-FC01', // 种植基地编码:四排山-丰产01
+ plantingBase: '耿马四排山澳洲坚果标准化基地', // 政府扶持项目
+ district: '耿马县四排山乡', // 精确到乡级
+ gridName: '四排山乡翁达村第5网格', // 对应原始数据中的网格
+ plantingStartTime: '2019-05-20', // 坚果最佳定植时间
+ plantingEndTime: '2026-09-30', // 坚果丰产期开始时间
+ account: '158****3367', // 匹配原始数据中坚果种植户联系方式
+ },
+];
diff --git a/sub-government-affairs-service/src/views/planting-management/variety-record/components/RecordPage.vue b/sub-government-affairs-service/src/views/planting-management/variety-record/components/RecordPage.vue
index 42615dd..3aaada7 100644
--- a/sub-government-affairs-service/src/views/planting-management/variety-record/components/RecordPage.vue
+++ b/sub-government-affairs-service/src/views/planting-management/variety-record/components/RecordPage.vue
@@ -61,6 +61,7 @@ const crudData = ref([]);
const crudOptions = reactive({
...CRUD_OPTIONS,
header: false,
+ menu: false,
height: 'calc(100vh - 330px)',
column: [
{ label: '地块编号', prop: 'landNumber', width: 160 },
diff --git a/sub-government-affairs-service/src/views/productOperateMain/coOp/index.vue b/sub-government-affairs-service/src/views/productOperateMain/coOp/index.vue
index e1559cc..1a7c75c 100644
--- a/sub-government-affairs-service/src/views/productOperateMain/coOp/index.vue
+++ b/sub-government-affairs-service/src/views/productOperateMain/coOp/index.vue
@@ -179,7 +179,7 @@ const crudOptions = reactive({
{ label: '联系方式', prop: 'phone' },
{ label: '企业地址', prop: 'address' },
{ label: '地块数量', prop: 'landCount' },
- { label: '地块编号', prop: 'landCount' },
+ { label: '地块编号', prop: 'landNumber' },
{ label: '地块名称', prop: 'landName' },
{ label: '面积', prop: 'area', formatter: (row, column, cellValue) => `${Number(cellValue).toFixed(2)} 亩` },
{ label: '所属行政区划', prop: 'address' },