From 91f372d7cd3b477332ad7d9800a7945aa56a3ea7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=AD=E6=B0=B8=E8=B6=85?= <2090205686@qq.com> Date: Tue, 1 Jul 2025 14:19:13 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=95=E5=85=A5=E5=93=81=E9=9C=80=E6=B1=82?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E5=88=97=E8=A1=A8=E5=AF=B9=E6=8E=A5=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/apis/inputSuppliesApi/demandManage.js | 4 ++-- .../demandManage/fertilizerDemand.vue | 18 +++++++------- .../demandManage/pesticideDemand.vue | 18 +++++++------- .../trace/planting/seedling/basic/index.vue | 24 +++++++++++++++++-- 4 files changed, 42 insertions(+), 22 deletions(-) diff --git a/sub-government-affairs-service/src/apis/inputSuppliesApi/demandManage.js b/sub-government-affairs-service/src/apis/inputSuppliesApi/demandManage.js index 6099fc1..b92c1cf 100644 --- a/sub-government-affairs-service/src/apis/inputSuppliesApi/demandManage.js +++ b/sub-government-affairs-service/src/apis/inputSuppliesApi/demandManage.js @@ -32,7 +32,7 @@ export function getRowDetails({ url, id }) { /* 肥料需求-列表 */ export function getFertilizeDemandRecords(params) { - return request('/inputGoods/supervise/fertilize/page', { + return request('/inputGoods/demand/fertilize/page', { params, }); } @@ -57,7 +57,7 @@ export function delFertilizeDemand(ids) { /* 农药需求-列表 */ export function getPesticideDemandRecords(params) { - return request('/inputGoods/supervise/pesticide/page', { + return request('/inputGoods/demand/pesticide/page', { params, }); } diff --git a/sub-government-affairs-service/src/views/inputSuppliesManage/demandManage/fertilizerDemand.vue b/sub-government-affairs-service/src/views/inputSuppliesManage/demandManage/fertilizerDemand.vue index 0b942bd..7f4b25f 100644 --- a/sub-government-affairs-service/src/views/inputSuppliesManage/demandManage/fertilizerDemand.vue +++ b/sub-government-affairs-service/src/views/inputSuppliesManage/demandManage/fertilizerDemand.vue @@ -165,12 +165,12 @@ const columns = ref([ { prop: 'regionName', label: '行政区域名称' }, { prop: 'gridId', label: '网格编码' }, { prop: 'gridName', label: '网格名称' }, - { prop: 'landId', label: '地块编码' }, + { prop: 'landNumber', label: '地块编码' }, { prop: 'landName', label: '地块名称' }, - { prop: 'extent', label: '面积(亩)' }, + { prop: 'area', label: '面积(亩)' }, { prop: 'useNumber', label: '肥料需求', slotName: 'useNumber' }, - { prop: 'businessEntityCode', label: '生产经营主体编码' }, - { prop: 'businessEntityName', label: '生产经营主体名称' }, + { prop: 'subjectName', label: '生产经营主体编码' }, + { prop: 'subjectNumber', label: '生产经营主体名称' }, // { prop: 'action', label: '操作', slotName: 'action', width: 230, fixed: 'right' }, ]); const handlePaginationChange = ({ page, pageSize }) => { @@ -181,14 +181,14 @@ const handlePaginationChange = ({ page, pageSize }) => { let landNums = ref(0); let totalArea = computed(() => { const sum = selectedRows.value.reduce((sum, item) => { - return sum + Math.round(item.extent * 100); + return sum + Math.round(item.area * 100); }, 0); const result = sum / 100; return parseFloat(result.toFixed(2)); }); let totalSeed = computed(() => { const sum = selectedRows.value.reduce((sum, item) => { - return sum + Math.round(item.useNumber * 100); + return sum + Math.round(item.demandCount * 100); }, 0); const result = sum / 100; return parseFloat(result.toFixed(2)); @@ -211,9 +211,9 @@ const loadData = async () => { tableTotal.value = response.data.total; // 没有接口，添加模拟数据 - tableData.value.forEach((el, index) => { - el.extent = extentArr[index].extent; - }); + // tableData.value.forEach((el, index) => { + // el.extent = extentArr[index].extent; + // }); } } catch (error) { tableLoading.value = false; diff --git a/sub-government-affairs-service/src/views/inputSuppliesManage/demandManage/pesticideDemand.vue b/sub-government-affairs-service/src/views/inputSuppliesManage/demandManage/pesticideDemand.vue index e371582..a0be289 100644 --- a/sub-government-affairs-service/src/views/inputSuppliesManage/demandManage/pesticideDemand.vue +++ b/sub-government-affairs-service/src/views/inputSuppliesManage/demandManage/pesticideDemand.vue @@ -165,12 +165,12 @@ const columns = ref([ { prop: 'regionName', label: '行政区域名称' }, { prop: 'gridId', label: '网格编码' }, { prop: 'gridName', label: '网格名称' }, - { prop: 'landId', label: '地块编码' }, + { prop: 'landNumber', label: '地块编码' }, { prop: 'landName', label: '地块名称' }, - { prop: 'extent', label: '面积(亩)' }, + { prop: 'area', label: '面积(亩)' }, { prop: 'useNumber', label: '农药需求', slotName: 'useNumber' }, - { prop: 'businessEntityCode', label: '生产经营主体编码' }, - { prop: 'businessEntityName', label: '生产经营主体名称' }, + { prop: 'subjectName', label: '生产经营主体编码' }, + { prop: 'subjectNumber', label: '生产经营主体名称' }, // { prop: 'action', label: '操作', slotName: 'action', width: 230, fixed: 'right' }, ]); const handlePaginationChange = ({ page, pageSize }) => { @@ -181,14 +181,14 @@ const handlePaginationChange = ({ page, pageSize }) => { let landNums = ref(0); let totalArea = computed(() => { const sum = selectedRows.value.reduce((sum, item) => { - return sum + Math.round(item.extent * 100); + return sum + Math.round(item.area * 100); }, 0); const result = sum / 100; return parseFloat(result.toFixed(2)); }); let totalSeed = computed(() => { const sum = selectedRows.value.reduce((sum, item) => { - return sum + Math.round(item.useNumber * 100); + return sum + Math.round(item.demandCount * 100); }, 0); const result = sum / 100; return parseFloat(result.toFixed(2)); @@ -211,9 +211,9 @@ const loadData = async () => { tableTotal.value = response.data.total; // 没有接口，添加模拟数据 - tableData.value.forEach((el, index) => { - el.extent = extentArr[index].extent; - }); + // tableData.value.forEach((el, index) => { + // el.extent = extentArr[index].extent; + // }); } } catch (error) { tableLoading.value = false; diff --git a/sub-government-affairs-service/src/views/trace/planting/seedling/basic/index.vue b/sub-government-affairs-service/src/views/trace/planting/seedling/basic/index.vue index 76c6419..d84d1b9 100644 --- a/sub-government-affairs-service/src/views/trace/planting/seedling/basic/index.vue +++ b/sub-government-affairs-service/src/views/trace/planting/seedling/basic/index.vue @@ -166,8 +166,28 @@ const loadData = async () => { // tableData.value = response.data.records; // tableTotal.value = response.data.total; - tableData.value = createMockData; - tableTotal.value = createMockData.length; + let analogData = [ + { + provenanceId: 'GMZZ001', + provenanceName: '黄皮甘蔗', + varietyName: '黄蔗', + brand: '云蔗牌', + manufacturer: '耿马县农业发展公司', + seedTypeName: '水果种子', + productUnit: '500克/袋', + }, + { + provenanceId: 'GMZZ002', + provenanceName: '圆茄', + varietyName: '绿圆', + brand: '绿圆牌', + manufacturer: '云南绿色蔬菜有限公司', + seedTypeName: '蔬菜种子', + productUnit: '200粒/包', + }, + ]; + tableData.value = analogData; + tableTotal.value = analogData.length; } } catch (error) { tableLoading.value = false;