diff --git a/sub-government-affairs-service/src/views/inputSuppliesManage/supervisionOfInputs/seedRegulation.vue b/sub-government-affairs-service/src/views/inputSuppliesManage/supervisionOfInputs/seedRegulation.vue index dc34f99..3cb49c2 100644 --- a/sub-government-affairs-service/src/views/inputSuppliesManage/supervisionOfInputs/seedRegulation.vue +++ b/sub-government-affairs-service/src/views/inputSuppliesManage/supervisionOfInputs/seedRegulation.vue @@ -147,10 +147,11 @@ const columns = ref([ { prop: 'landName', label: '地块名称' }, { prop: 'provenanceId', label: '种子编号' }, { prop: 'provenanceName', label: '种子名称' }, - { prop: 'provenanceId', label: '使用量' }, - { prop: 'provenanceName', label: '使用时间' }, - { prop: 'phone', label: '生产经营主体编码' }, - { prop: 'name', label: '生产经营主体名称' }, + { prop: 'useNumber', label: '使用量' }, + { prop: 'useUnit', label: '使用单位' }, + { prop: 'useTime', label: '使用时间' }, + { prop: 'businessEntityCode', label: '生产经营主体编码' }, + { prop: 'businessEntityName', label: '生产经营主体名称' }, // { prop: 'action', label: '操作', slotName: 'action', width: 230, fixed: 'right' }, ]); const handlePaginationChange = ({ page, pageSize }) => { diff --git a/sub-government-affairs-service/src/views/outputProductsManage/output.js b/sub-government-affairs-service/src/views/outputProductsManage/output.js index 4ba5302..1eb704d 100644 --- a/sub-government-affairs-service/src/views/outputProductsManage/output.js +++ b/sub-government-affairs-service/src/views/outputProductsManage/output.js @@ -63,27 +63,6 @@ export const mockData = [ price: 18.5, outputValue: 207200, }, - { - AreaCode: '530504', - gridCode: 'G004', - landCode: 'L004', - enterCode: 'E004', - enterType: '农户', - enterName: '叶嘎', - isTrace: '否', - productName: '橡胶', - landName: '河外胶林', - area: 42, - gridName: '河外村第二网格', - gridAreaName: '耿马县孟定镇河外村', - contactInfo: '187****5546', - harvestTime: '2023-11-01', - yieldPerMu: 95, - totalYield: 3990, - quality: '中等', - price: 10.2, - outputValue: 40698, - }, { AreaCode: '530505', gridCode: 'G005', 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 index 687774a..b94a195 100644 --- 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 @@ -57,7 +57,7 @@ const crudOptions = ref({ { label: '所属行政区域', prop: 'regionName' }, { label: '所属网格', prop: 'gridName' }, { label: '具体位置', prop: 'adress' }, - { label: '经纬度', prop: 'longitude' }, + { label: '经纬度', prop: 'coordinate', formatter: (row) => `${row.longitude}, ${row.latitude}` }, { label: '气候条件', prop: 'weather' }, { label: '海拔(米)', prop: 'altitude' }, { label: '面积(亩)', prop: 'area', formatter: (row, column, cellValue) => `${Number(cellValue).toFixed(2)} 亩` },