diff --git a/src/api/Pregnancy_Test/Pregnancy_Test.js b/src/api/Pregnancy_Test/Pregnancy_Test.js
new file mode 100644
index 0000000..345608e
--- /dev/null
+++ b/src/api/Pregnancy_Test/Pregnancy_Test.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询孕检记录列表
+export function listPregnancy_Test(query) {
+ return request({
+ url: '/Pregnancy_Test/Pregnancy_Test/list',
+ method: 'get',
+ params: query
+ })
+}
+
+// 查询孕检记录详细
+export function getPregnancy_Test(id) {
+ return request({
+ url: '/Pregnancy_Test/Pregnancy_Test/' + id,
+ method: 'get'
+ })
+}
+
+// 新增孕检记录
+export function addPregnancy_Test(data) {
+ return request({
+ url: '/Pregnancy_Test/Pregnancy_Test',
+ method: 'post',
+ data: data
+ })
+}
+
+// 修改孕检记录
+export function updatePregnancy_Test(data) {
+ return request({
+ url: '/Pregnancy_Test/Pregnancy_Test',
+ method: 'put',
+ data: data
+ })
+}
+
+// 删除孕检记录
+export function delPregnancy_Test(id) {
+ return request({
+ url: '/Pregnancy_Test/Pregnancy_Test/' + id,
+ method: 'delete'
+ })
+}
diff --git a/src/api/drymilk/drymilk.js b/src/api/drymilk/drymilk.js
new file mode 100644
index 0000000..da043a8
--- /dev/null
+++ b/src/api/drymilk/drymilk.js
@@ -0,0 +1,52 @@
+import request from '@/utils/request'
+
+// 查询干奶记录列表
+export function listDrymilk(query) {
+ return request({
+ url: '/drymilk/drymilk/list',
+ method: 'get',
+ params: query
+ })
+}
+
+// 查询干奶记录详细
+export function getDrymilk(id) {
+ return request({
+ url: '/drymilk/drymilk/' + id,
+ method: 'get'
+ })
+}
+
+// 根据耳号查询羊只ID
+export function getSheepIdByManageTags(manageTags) {
+ return request({
+ url: '/drymilk/drymilk/sheep/' + manageTags,
+ method: 'get'
+ })
+}
+
+// 新增干奶记录
+export function addDrymilk(data) {
+ return request({
+ url: '/drymilk/drymilk',
+ method: 'post',
+ data: data
+ })
+}
+
+// 修改干奶记录
+export function updateDrymilk(data) {
+ return request({
+ url: '/drymilk/drymilk',
+ method: 'put',
+ data: data
+ })
+}
+
+// 删除干奶记录
+export function delDrymilk(id) {
+ return request({
+ url: '/drymilk/drymilk/' + id,
+ method: 'delete'
+ })
+}
\ No newline at end of file
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/api/mating_plan/generate.js b/src/api/mating_plan/generate.js
new file mode 100644
index 0000000..c224fbb
--- /dev/null
+++ b/src/api/mating_plan/generate.js
@@ -0,0 +1,85 @@
+import request from '@/utils/request'
+
+// 查询配种计划生成列表
+export function listBreedPlanGenerate(query) {
+ return request({
+ url: '/mating_plan/generate/list',
+ method: 'get',
+ params: query
+ })
+}
+
+// 查询配种计划生成详细
+export function getBreedPlanGenerate(id) {
+ return request({
+ url: '/mating_plan/generate/' + id,
+ method: 'get'
+ })
+}
+
+// 筛选符合条件的母羊
+export function selectEligibleEwe() {
+ return request({
+ url: '/mating_plan/generate/selectEwe',
+ method: 'get'
+ })
+}
+
+// 筛选符合条件的公羊
+export function selectEligibleRam() {
+ return request({
+ url: '/mating_plan/generate/selectRam',
+ method: 'get'
+ })
+}
+
+// 自动生成配种计划
+export function autoGenerateBreedPlan(data) {
+ return request({
+ url: '/mating_plan/generate/auto',
+ method: 'post',
+ data: data
+ })
+}
+
+// 新增配种计划生成
+export function addBreedPlanGenerate(data) {
+ return request({
+ url: '/mating_plan/generate',
+ method: 'post',
+ data: data
+ })
+}
+
+// 修改配种计划生成
+export function updateBreedPlanGenerate(data) {
+ return request({
+ url: '/mating_plan/generate',
+ method: 'put',
+ data: data
+ })
+}
+
+// 审批配种计划
+export function approveBreedPlan(id) {
+ return request({
+ url: '/mating_plan/generate/approve/' + id,
+ method: 'put'
+ })
+}
+
+// 查看配种计划详情
+export function viewBreedPlan(id) {
+ return request({
+ url: '/mating_plan/generate/view/' + id,
+ method: 'get'
+ })
+}
+
+// 删除配种计划生成
+export function delBreedPlanGenerate(id) {
+ return request({
+ url: '/mating_plan/generate/' + id,
+ method: 'delete'
+ })
+}
\ No newline at end of file
diff --git a/src/api/mating_plan/mating_plan.js b/src/api/mating_plan/mating_plan.js
new file mode 100644
index 0000000..f856817
--- /dev/null
+++ b/src/api/mating_plan/mating_plan.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询配种计划列表
+export function listMating_plan(query) {
+ return request({
+ url: '/mating_plan/mating_plan/list',
+ method: 'get',
+ params: query
+ })
+}
+
+// 查询配种计划详细
+export function getMating_plan(id) {
+ return request({
+ url: '/mating_plan/mating_plan/' + id,
+ method: 'get'
+ })
+}
+
+// 新增配种计划
+export function addMating_plan(data) {
+ return request({
+ url: '/mating_plan/mating_plan',
+ method: 'post',
+ data: data
+ })
+}
+
+// 修改配种计划
+export function updateMating_plan(data) {
+ return request({
+ url: '/mating_plan/mating_plan',
+ method: 'put',
+ data: data
+ })
+}
+
+// 删除配种计划
+export function delMating_plan(id) {
+ return request({
+ url: '/mating_plan/mating_plan/' + id,
+ method: 'delete'
+ })
+}
diff --git a/src/api/produce/manage_sheep/add_sheep/add_sheep.js b/src/api/produce/manage_sheep/add_sheep.js
similarity index 100%
rename from src/api/produce/manage_sheep/add_sheep/add_sheep.js
rename to src/api/produce/manage_sheep/add_sheep.js
diff --git a/src/api/produce/manage_sheep/trans_group/trans_group.js b/src/api/produce/manage_sheep/trans_group.js
similarity index 100%
rename from src/api/produce/manage_sheep/trans_group/trans_group.js
rename to src/api/produce/manage_sheep/trans_group.js
diff --git a/src/api/produce/manage_sheep/transition_info/transition_info.js b/src/api/produce/manage_sheep/transition_info.js
similarity index 100%
rename from src/api/produce/manage_sheep/transition_info/transition_info.js
rename to src/api/produce/manage_sheep/transition_info.js
diff --git a/src/api/produce/other/castrate/castrate.js b/src/api/produce/other/castrate.js
similarity index 100%
rename from src/api/produce/other/castrate/castrate.js
rename to src/api/produce/other/castrate.js
diff --git a/src/api/produce/other/fixHoof/fixHoof.js b/src/api/produce/other/fixHoof.js
similarity index 100%
rename from src/api/produce/other/fixHoof/fixHoof.js
rename to src/api/produce/other/fixHoof.js
diff --git a/src/views/Pregnancy_Test/Pregnancy_Test/index.vue b/src/views/Pregnancy_Test/Pregnancy_Test/index.vue
new file mode 100644
index 0000000..989d52f
--- /dev/null
+++ b/src/views/Pregnancy_Test/Pregnancy_Test/index.vue
@@ -0,0 +1,294 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+ 新增
+
+
+ 修改
+
+
+ 删除
+
+
+ 导出
+
+
+
+
+
+
+
+
+
+ {{ parseTime(scope.row.datetime, '{y}-{m}-{d}') }}
+
+
+
+
+
+
+
+
+ 修改
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/biosafety/quarantine/index.vue b/src/views/biosafety/quarantine/index.vue
index 5d603c5..b0ad772 100644
--- a/src/views/biosafety/quarantine/index.vue
+++ b/src/views/biosafety/quarantine/index.vue
@@ -1,49 +1,42 @@
-
+
+
-
+
-
-
+
+
- 搜索
+ 搜索
重置
+
-
- 新增
-
-
- 修改
-
-
- 删除
-
-
- 导出
-
-
+ 新增
+ 修改
+ 删除
+ 导出
+
+
-
-
-
- {{ parseTime(scope.row.datetime, '{y}-{m}-{d}') }}
-
+
+
+
+
-
-
@@ -52,235 +45,442 @@
-
-
-
+
-
-
-
+
-
+
+
检疫
- 治疗
+
+ 治疗
+
删除
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ dict.label }}
-
+
+
+
+
+
+
+
+ 耳号不存在
+ 已添加
+ 该羊只已选择
+
+
+
+
+
+ {{ id }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+ 确 定
+ 取 消
+
+
+
+
+
+
+
+
+
+
+
+ {{ editForm.sheepNo }}
+
+
+
+
+
+
+
+
+
+ {{ editForm.sheepType }}
+
+
+
+
+ {{ editForm.monthAge }}
+
+
+
+
+ {{ editForm.breed }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取 消
+ 确 定
\ No newline at end of file
diff --git a/src/views/drymilk/drymilk/index.vue b/src/views/drymilk/drymilk/index.vue
new file mode 100644
index 0000000..004f40b
--- /dev/null
+++ b/src/views/drymilk/drymilk/index.vue
@@ -0,0 +1,330 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+ 新增
+
+
+ 修改
+
+
+ 删除
+
+
+ 导出
+
+
+
+
+
+
+
+
+
+
+
+ {{ parseTime(scope.row.datetime, '{y}-{m}-{d}') }}
+
+
+
+
+ {{ scope.row.status === 1 ? '是' : '否' }}
+
+
+
+
+
+
+ {{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}
+
+
+
+
+
+ 修改
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 是
+ 否
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
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 @@
羊只状态
+
+
+
配种类型
+
+
+
是否性控
+
+
+
入群来源
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
- {{ getGroupName(scope.row.groupId) }}
+ {{ getGroupName(scope.row.group_id) }}
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
修改
@@ -128,6 +154,8 @@
\ No newline at end of file
diff --git a/src/views/mating_plan/mating_plan/index.vue b/src/views/mating_plan/mating_plan/index.vue
new file mode 100644
index 0000000..ab78192
--- /dev/null
+++ b/src/views/mating_plan/mating_plan/index.vue
@@ -0,0 +1,244 @@
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+ 新增
+
+
+ 修改
+
+
+ 删除
+
+
+ 导出
+
+
+
+
+
+
+
+
+
+
+
+
+ 修改
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/produce/manage_sheep/add_sheep/index.vue b/src/views/produce/manage_sheep/add_sheep/index.vue
index 3a8846d..753df17 100644
--- a/src/views/produce/manage_sheep/add_sheep/index.vue
+++ b/src/views/produce/manage_sheep/add_sheep/index.vue
@@ -121,7 +121,7 @@