diff --git a/src/api/Breeding_records/Breeding_records.js b/src/api/Breeding_records/Breeding_records.js index 24a5bff..42a430a 100644 --- a/src/api/Breeding_records/Breeding_records.js +++ b/src/api/Breeding_records/Breeding_records.js @@ -57,4 +57,29 @@ export function getBreedPlanByEweTags(manageTags) { url: '/Breeding_records/Breeding_records/getBreedPlan/' + manageTags, method: 'get' }) +} + +// 根据母羊耳号获取最新配种计划信息（优先从配种计划生成表获取） +export function getLatestBreedPlanByEweTags(manageTags) { + return request({ + url: '/Breeding_records/Breeding_records/getLatestBreedPlan/' + manageTags, + method: 'get' + }) +} + +// 同步孕检结果到配种记录 +export function syncPregnancyResult(data) { + return request({ + url: '/Breeding_records/Breeding_records/syncPregnancyResult', + method: 'post', + data: data + }) +} + +// 根据羊只ID和时间范围查询配种记录 +export function getBreedRecordsByTimeRange(sheepId, startDate, endDate) { + return request({ + url: `/Breeding_records/Breeding_records/getByTimeRange/${sheepId}/${startDate}/${endDate}`, + method: 'get' + }) } \ No newline at end of file diff --git a/src/api/mating_plan/generate.js b/src/api/mating_plan/generate.js index c224fbb..abee51a 100644 --- a/src/api/mating_plan/generate.js +++ b/src/api/mating_plan/generate.js @@ -60,11 +60,20 @@ export function updateBreedPlanGenerate(data) { }) } -// 审批配种计划 -export function approveBreedPlan(id) { +// 获取审批配种计划详情 +export function getApproveBreedPlan(id) { return request({ url: '/mating_plan/generate/approve/' + id, - method: 'put' + method: 'get' + }) +} + +// 确认审批配种计划 +export function confirmApproveBreedPlan(data) { + return request({ + url: '/mating_plan/generate/approve/confirm', + method: 'put', + data: data }) } @@ -76,6 +85,24 @@ export function viewBreedPlan(id) { }) } +// 导出配种计划详情 +export function exportBreedPlanDetails(id) { + return request({ + url: '/mating_plan/generate/export/' + id, + method: 'get', + responseType: 'blob' + }) +} + +// 修改配种计划详情 +export function updateBreedPlan(data) { + return request({ + url: '/mating_plan/generate/update', + method: 'put', + data: data + }) +} + // 删除配种计划生成 export function delBreedPlanGenerate(id) { return request({ diff --git a/src/api/mating_plan/mating_plan.js b/src/api/mating_plan/mating_plan.js index f856817..7d46169 100644 --- a/src/api/mating_plan/mating_plan.js +++ b/src/api/mating_plan/mating_plan.js @@ -41,4 +41,4 @@ export function delMating_plan(id) { url: '/mating_plan/mating_plan/' + id, method: 'delete' }) -} +} \ No newline at end of file diff --git a/src/views/Breeding_records/Breeding_records/index.vue b/src/views/Breeding_records/Breeding_records/index.vue index 0f447f3..10dfb79 100644 --- a/src/views/Breeding_records/Breeding_records/index.vue +++ b/src/views/Breeding_records/Breeding_records/index.vue @@ -1,6 +1,6 @@ + + + + + + + + + + + + + + + + + + + + +