diff --git a/src/api/Weaning/weaning_record.js b/src/api/Weaning/weaning_record.js index a97180a..73dfcb8 100644 --- a/src/api/Weaning/weaning_record.js +++ b/src/api/Weaning/weaning_record.js @@ -51,10 +51,17 @@ export function getSheepIdByEarNumber(earNumber) { }) } +<<<<<<< HEAD +// 新增：模糊查询耳号列表 (用于远程搜索) +export function searchEarNumbers(query) { + return request({ + url: '/Weaning/weaning_record/search_ear_numbers', +======= // 模糊查询母羊耳号列表 export function searchEarNumbers(query) { return request({ url: '/Weaning/weaning_record/search_ear_numbers', // 根据实际路径修改 +>>>>>>> 685ce2654e63aa48459b87ee43e319a6e547a8a4 method: 'get', params: { query } }) diff --git a/src/api/drymilk/drymilk.js b/src/api/drymilk/drymilk.js index ef861c3..5f36af5 100644 --- a/src/api/drymilk/drymilk.js +++ b/src/api/drymilk/drymilk.js @@ -51,6 +51,23 @@ export function delDrymilk(id) { }) } +<<<<<<< HEAD +// 查询羊舍列表下拉框 +export function listSheepfoldOptions() { + return request({ + url: '/drymilk/drymilk/sheepfoldList', + method: 'get' + }) +} + +// 查询技术员列表下拉框 +export function listTechnicianOptions() { + return request({ + url: '/drymilk/drymilk/technicianList', + method: 'get' + }) +} +======= export function searchEarNumbers(query) { return request({ url: '/drymilk/drymilk/search_ear_numbers', @@ -76,3 +93,4 @@ export function validateEarTag(manageTags) { }) } +>>>>>>> 685ce2654e63aa48459b87ee43e319a6e547a8a4 diff --git a/src/api/sheep_death/death.js b/src/api/sheep_death/death.js index 42de759..41157b2 100644 --- a/src/api/sheep_death/death.js +++ b/src/api/sheep_death/death.js @@ -43,7 +43,7 @@ export function delDeath(id) { }) } -// 根据管理耳号查询羊只信息 +// 根据耳号查询羊只信息 export function getSheepInfo(manageTags) { return request({ url: '/sheep_death/death/sheepInfo/' + manageTags, @@ -59,10 +59,37 @@ export function getDiseaseTree() { }) } +<<<<<<< HEAD +// --- 远程搜索 API --- + +// 搜索耳号 +export function searchEarNo(query) { + return request({ + url: '/sheep_death/death/search/earNo', + method: 'get', + params: { query } + }) +} + +// 搜索技术员 +export function searchTechnician(query) { + return request({ + url: '/sheep_death/death/search/technician', + method: 'get', + params: { query } + }) +} + +// 搜索处理人 +export function searchHandler(query) { + return request({ + url: '/sheep_death/death/search/handler', +======= // 模糊查询母羊耳号列表 export function searchEarNumbers(query) { return request({ url: '/sheep_death/death/search_ear_numbers', // 根据实际路径修改 +>>>>>>> 685ce2654e63aa48459b87ee43e319a6e547a8a4 method: 'get', params: { query } }) diff --git a/src/views/Weaning/weaning_record/index.vue b/src/views/Weaning/weaning_record/index.vue index 4a0720f..80caaa9 100644 --- a/src/views/Weaning/weaning_record/index.vue +++ b/src/views/Weaning/weaning_record/index.vue @@ -1,7 +1,29 @@