diff --git a/sub-government-affairs-service/src/apis/land.js b/sub-government-affairs-service/src/apis/land.js index dcb23b4..69d8476 100644 --- a/sub-government-affairs-service/src/apis/land.js +++ b/sub-government-affairs-service/src/apis/land.js @@ -48,6 +48,10 @@ export function delLand(id) { method: 'DELETE', }); } +// 获取地块信息 +export function getLandInfo(landId) { + return request(`/land-resource/landManage/getLandInfo?landId=${landId}`); +} // #endregion /* 土地列表 */ @@ -162,6 +166,10 @@ export function delPlantingStage(params) { method: 'DELETE', }); } +// 获取种植作物列表 +export function getCropsList() { + return request('land-resource/crops/list'); +} //作业记录相关 export function getOperationRecord(params = {}) { diff --git a/sub-government-affairs-service/src/apis/trace/products.js b/sub-government-affairs-service/src/apis/trace/products.js new file mode 100644 index 0000000..06b7c88 --- /dev/null +++ b/sub-government-affairs-service/src/apis/trace/products.js @@ -0,0 +1,29 @@ +import request from '@/utils/axios'; + +// 溯源企业管理 - 列表 +export function getTraceCompanyList(params) { + return request('/trace/traceCompany/page', { + method: 'GET', + params, + }); +} +// 溯源企业管理 - 新增 +export function addTraceCompany(data) { + return request('/trace/traceCompany/save', { + method: 'POST', + data, + }); +} +// 溯源企业管理 - 编辑 +export function editTraceCompany(data) { + return request('/trace/traceCompany/edit', { + method: 'PUT', + data, + }); +} +// 溯源企业管理 - 删除 +export function deleteTraceCompany(ids) { + return request('/trace/traceCompany/delete/' + ids, { + method: 'GET', + }); +} diff --git a/sub-government-affairs-service/src/views/inputSuppliesManage/demandManage/seedDemand.vue b/sub-government-affairs-service/src/views/inputSuppliesManage/demandManage/seedDemand.vue index 3328b33..61129c4 100644 --- a/sub-government-affairs-service/src/views/inputSuppliesManage/demandManage/seedDemand.vue +++ b/sub-government-affairs-service/src/views/inputSuppliesManage/demandManage/seedDemand.vue @@ -7,13 +7,7 @@
- + diff --git a/sub-government-affairs-service/src/views/output-products/output-info/index.vue b/sub-government-affairs-service/src/views/output-products/output-info/index.vue index ab06582..22ec01c 100644 --- a/sub-government-affairs-service/src/views/output-products/output-info/index.vue +++ b/sub-government-affairs-service/src/views/output-products/output-info/index.vue @@ -6,14 +6,14 @@
- - + + - + 查询 重置 @@ -53,7 +53,7 @@ @@ -122,15 +122,18 @@ import inputSuppliesApi from '@/apis/inputSuppliesApi'; const { getMaterailTypes } = inputSuppliesApi; import { GetOutputList, AddOutput, UpdateOutput, DeleteOutput } from '@/apis/outputProducts'; import { getLandList } from '@/apis/inputSuppliesApi/supervisionOfInputs'; -import request from '@/utils/axios'; +import { getCropsList, getLandInfo } from '@/apis/land'; import { GetDictTypeInfo } from '@/apis/system/dictType'; import { useApp } from '@/hooks'; const app = useApp(); // 查询条件 const formInline = reactive({ - name: '', - seedTypeId: '', + regionCode: '', + regionName: '', + gridId: '', + gridName: '', + cropId: '', current: 1, size: 10, }); @@ -164,7 +167,7 @@ const columns = ref([ { label: '生产经营主体类型', prop: 'businessEntityType', width: 150 }, { label: '生产经营主体名称', prop: 'businessEntityName' }, { label: '是否溯源', prop: 'isTrace' }, - { prop: 'action', label: '操作', slotName: 'action', width: 100, fixed: 'right' }, + { prop: 'action', label: '操作', slotName: 'action', width: 150, fixed: 'right' }, ]); const handlePaginationChange = ({ page, pageSize }) => { formInline.current = page; @@ -205,25 +208,6 @@ const loadData = async () => { console.error(error); } }; - -const extractThirdLevelChildren = (dataArray) => { - let result = []; - // 遍历第一层数组 - for (const level1 of dataArray) { - // 检查第一层是否有children且是数组 - if (level1.children && Array.isArray(level1.children)) { - // 遍历第二层数组 - for (const level2 of level1.children) { - // 检查第二层是否有children且是数组 - if (level2.children && Array.isArray(level2.children)) { - // 将第三层的所有对象添加到结果数组中 - result.push(...level2.children); - } - } - } - } - return result; -}; const seedTypeChange = () => { console.log(formInline.seedTypeId); // 重新获取表格数据，需添加参数 @@ -277,32 +261,28 @@ const seeDetails = async (row) => { console.log(row); formDisabled.value = true; dialogForm.landId = row.landId; - getDetails(); - dialogForm.totalYield = row.totalYield ?? 0; + await getDetails(); dialogForm.yield = row.yield; - dialogForm.useUnit = row.useUnit; - dialogForm.detectionTime = row.useTime; + // dialogForm.totalYield = row.totalYield ?? 0; + dialogForm.detectionTime = row.harvestDate; dialogFormVisible.value = true; }; -const handleEdit = (row) => { +const handleEdit = async (row) => { // ElMessage.success('点击编辑!'); nowSelectRow.value = row; dialogTitle.value = '编辑'; console.log(row); formDisabled.value = false; dialogForm.landId = row.landId; - getDetails(); - dialogForm.totalYield = row.totalYield ?? 0; + await getDetails(); dialogForm.yield = row.yield; - dialogForm.useUnit = row.useUnit; - dialogForm.detectionTime = row.useTime; + // dialogForm.totalYield = row.totalYield ?? 0; + dialogForm.detectionTime = row.harvestDate; dialogFormVisible.value = true; }; // 获取地块信息 const getDetails = async () => { - let response = await request({ - url: `/land-resource/landManage/getLandInfo?landId=${dialogForm.landId}`, - }); + let response = await getLandInfo(dialogForm.landId); console.log(response); if (response.code == 200) { if (response.data) { @@ -320,7 +300,6 @@ const setDialogForm = (row) => { dialogForm.regionName = row.fullRegionName; dialogForm.gridId = row.gridId; dialogForm.gridName = row.gridName; - dialogForm.landId = row.id; dialogForm.landName = row.landName; dialogForm.name = row.propertyName; dialogForm.phone = row.propertyPhone; @@ -419,18 +398,14 @@ const restDialogForm = () => { nowSelectRow.value = ref({}); }; -const seedTypeList = ref([]); -const seedTypeDialogList = ref([]); -const getSeedTypeList = async () => { +const cropypeList = ref([]); +const getCropypeList = async () => { try { - let response = await getMaterailTypes({ moduleType: '4' }); + let response = await getCropsList(); console.log(response); if (response.code == 200) { if (response.data?.length > 0) { - seedTypeDialogList.value = response.data[0].children; - let result = extractThirdLevelChildren(response.data); - seedTypeList.value = result; - console.log(seedTypeDialogList.value); + cropypeList.value = response.data; } } } catch (error) { @@ -476,7 +451,7 @@ onMounted(() => { onSubmit(); getLandsList(); getEntityOptions(); - // getSeedTypeList(); + getCropypeList(); });