From a4d605906bc5db260bcc4c0f5fa93d9e198b9ac8 Mon Sep 17 00:00:00 2001 From: zyh <2066096076@qq.com> Date: Fri, 18 Jul 2025 11:35:41 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E8=B9=84=E9=83=A8=E5=88=86?= =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E8=80=B3=E5=8F=B7=E7=9A=84=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/produce/other/fixHoof/fixHoof.js | 20 + .../produce/manage_sheep/add_sheep/index.vue | 26 +- .../manage_sheep/trans_group/index.vue | 8 +- .../manage_sheep/transition_info/index.vue | 418 ++++++++---------- src/views/produce/other/fixHoof/index.vue | 112 ++--- 5 files changed, 271 insertions(+), 313 deletions(-) diff --git a/src/api/produce/other/fixHoof/fixHoof.js b/src/api/produce/other/fixHoof/fixHoof.js index 828746c..a189a91 100644 --- a/src/api/produce/other/fixHoof/fixHoof.js +++ b/src/api/produce/other/fixHoof/fixHoof.js @@ -48,3 +48,23 @@ export function exportFixHoof(query) { responseType: 'blob' // 导出功能需要设置响应类型为blob }) } + + +// 按管理耳号查羊只 +export function checkSheepByManageTags(manageTags) { + return request({ + url: '/sheep/sheep/byManageTags/' + encodeURIComponent(manageTags), + method: 'get' + }) +} + +//获取品种 +export function getVarietyOptions(query){ + return request({ + url:'/base/variety/list', + method:'get', + params:query + }) +} + + diff --git a/src/views/produce/manage_sheep/add_sheep/index.vue b/src/views/produce/manage_sheep/add_sheep/index.vue index dddd5f8..3a8846d 100644 --- a/src/views/produce/manage_sheep/add_sheep/index.vue +++ b/src/views/produce/manage_sheep/add_sheep/index.vue @@ -70,12 +70,7 @@ - + @@ -111,17 +106,8 @@ - +
将文件拖到此处，或点击上传
 @@ -133,12 +119,12 @@ +/* -------------------- 入口 -------------------- */ +onMounted(() => { + getVarietyOptions() + getList() +}) + \ No newline at end of file diff --git a/src/views/produce/other/fixHoof/index.vue b/src/views/produce/other/fixHoof/index.vue index 028e4ca..78729f5 100644 --- a/src/views/produce/other/fixHoof/index.vue +++ b/src/views/produce/other/fixHoof/index.vue @@ -2,8 +2,8 @@
- - + + @@ -19,12 +19,8 @@ - + @@ -37,19 +33,19 @@ 新增 + v-hasPermi="['fixHoof:fixHoof:add']">新增 修改 + v-hasPermi="['fixHoof:fixHoof:edit']">修改 删除 + v-hasPermi="['fixHoof:fixHoof:remove']">删除 导出 + v-hasPermi="['fixHoof:fixHoof:export']">导出 @@ -57,7 +53,7 @@ - + @@ -71,24 +67,21 @@ - + - - + + @@ -118,9 +111,9 @@ \ No newline at end of file From ac1ea8428e5a465ba0e6a4b80ba5a08c39de2234 Mon Sep 17 00:00:00 2001 From: ll <1079863556@qq.com> Date: Fri, 18 Jul 2025 11:49:13 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E9=85=B8=E5=A5=B6=E6=A3=80=E9=AA=8C?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dairyProducts/yogurtTest/yogurtTest.js | 44 ++ .../yogurtTest/yogurtTest/index.vue | 575 ++++++++++++++++++ 2 files changed, 619 insertions(+) create mode 100644 src/api/dairyProducts/yogurtTest/yogurtTest.js create mode 100644 src/views/dairyProducts/yogurtTest/yogurtTest/index.vue diff --git a/src/api/dairyProducts/yogurtTest/yogurtTest.js b/src/api/dairyProducts/yogurtTest/yogurtTest.js new file mode 100644 index 0000000..0287aa9 --- /dev/null +++ b/src/api/dairyProducts/yogurtTest/yogurtTest.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询酸奶生产，成品检疫记录列表 +export function listYogurtTest(query) { + return request({ + url: '/yogurtTest/yogurtTest/list', + method: 'get', + params: query + }) +} + +// 查询酸奶生产，成品检疫记录详细 +export function getYogurtTest(id) { + return request({ + url: '/yogurtTest/yogurtTest/' + id, + method: 'get' + }) +} + +// 新增酸奶生产，成品检疫记录 +export function addYogurtTest(data) { + return request({ + url: '/yogurtTest/yogurtTest', + method: 'post', + data: data + }) +} + +// 修改酸奶生产，成品检疫记录 +export function updateYogurtTest(data) { + return request({ + url: '/yogurtTest/yogurtTest', + method: 'put', + data: data + }) +} + +// 删除酸奶生产，成品检疫记录 +export function delYogurtTest(id) { + return request({ + url: '/yogurtTest/yogurtTest/' + id, + method: 'delete' + }) +} diff --git a/src/views/dairyProducts/yogurtTest/yogurtTest/index.vue b/src/views/dairyProducts/yogurtTest/yogurtTest/index.vue new file mode 100644 index 0000000..39f3898 --- /dev/null +++ b/src/views/dairyProducts/yogurtTest/yogurtTest/index.vue @@ -0,0 +1,575 @@ + + + + + \ No newline at end of file From e9ade10c12cce875fd56467498bbac36cf52928c Mon Sep 17 00:00:00 2001 From: wyt <414651037@qq.com> Date: Fri, 18 Jul 2025 13:01:25 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BE=8A=E5=8F=AA?= =?UTF-8?q?=E6=A1=A3=E6=A1=88=E5=92=8C=E7=BE=8A=E5=8F=AA=E5=88=86=E7=BB=84?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/fileManagement/sheep_grouping.js | 10 +++ src/views/fileManagement/sheep_file/index.vue | 16 ++++ .../fileManagement/sheep_grouping/index.vue | 81 ++++++++++++++++--- 3 files changed, 94 insertions(+), 13 deletions(-) diff --git a/src/api/fileManagement/sheep_grouping.js b/src/api/fileManagement/sheep_grouping.js index 2af0cba..2e74e58 100644 --- a/src/api/fileManagement/sheep_grouping.js +++ b/src/api/fileManagement/sheep_grouping.js @@ -9,6 +9,16 @@ export function listSheep_grouping(query) { }) } + +// 查询羊只分组关联列表（联表） +export function listSheep_grouping_join(query) { + return request({ + url: '/sheep_grouping/sheep_grouping/listJoin', + method: 'get', + params: query + }) +} + // 查询羊只分组关联详细 export function getSheep_grouping(id) { return request({ diff --git a/src/views/fileManagement/sheep_file/index.vue b/src/views/fileManagement/sheep_file/index.vue index bfbb700..a2af697 100644 --- a/src/views/fileManagement/sheep_file/index.vue +++ b/src/views/fileManagement/sheep_file/index.vue @@ -318,6 +318,9 @@ + 配种类型 + 是否性控 + 入群来源 + + + + - - - - - + + + + + - + + + + + + + + + + + + + + + + +