From 68654cecfe924a4c529c2971d84d32a360851956 Mon Sep 17 00:00:00 2001 From: wyt <414651037@qq.com> Date: Tue, 15 Jul 2025 17:33:37 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E5=88=A0=E9=99=A4=20src/views/group=5Fmana?= =?UTF-8?q?gement/group=5Fmanagement/index.vue?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../group_management/index.vue | 275 ------------------ 1 file changed, 275 deletions(-) delete mode 100644 src/views/group_management/group_management/index.vue diff --git a/src/views/group_management/group_management/index.vue b/src/views/group_management/group_management/index.vue deleted file mode 100644 index 579202c..0000000 --- a/src/views/group_management/group_management/index.vue +++ /dev/null @@ -1,275 +0,0 @@ - - - \ No newline at end of file From 9c4840762e41d0c0f185e226304829169859fbe3 Mon Sep 17 00:00:00 2001 From: wyt <414651037@qq.com> Date: Tue, 15 Jul 2025 17:33:56 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E5=88=A0=E9=99=A4=20src/views/sheep=5Ffile?= =?UTF-8?q?/sheep=5Ffile/index.vue?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/sheep_file/sheep_file/index.vue | 1264 --------------------- 1 file changed, 1264 deletions(-) delete mode 100644 src/views/sheep_file/sheep_file/index.vue diff --git a/src/views/sheep_file/sheep_file/index.vue b/src/views/sheep_file/sheep_file/index.vue deleted file mode 100644 index d53d6bc..0000000 --- a/src/views/sheep_file/sheep_file/index.vue +++ /dev/null @@ -1,1264 +0,0 @@ - - - - - \ No newline at end of file From 0797ef71b7c7374f2add0dff93c5b426b197044e Mon Sep 17 00:00:00 2001 From: wyt <414651037@qq.com> Date: Tue, 15 Jul 2025 17:34:09 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E5=88=A0=E9=99=A4=20src/views/sheepfold=5F?= =?UTF-8?q?management/sheepfold=5Fmanagement/index.vue?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sheepfold_management/index.vue | 417 ------------------ 1 file changed, 417 deletions(-) delete mode 100644 src/views/sheepfold_management/sheepfold_management/index.vue diff --git a/src/views/sheepfold_management/sheepfold_management/index.vue b/src/views/sheepfold_management/sheepfold_management/index.vue deleted file mode 100644 index 1722282..0000000 --- a/src/views/sheepfold_management/sheepfold_management/index.vue +++ /dev/null @@ -1,417 +0,0 @@ - - - - - - \ No newline at end of file From 1ad4b3ea3d5d36fc8771a536ec512a42f0753523 Mon Sep 17 00:00:00 2001 From: wyt <414651037@qq.com> Date: Tue, 15 Jul 2025 17:34:40 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E5=88=A0=E9=99=A4=20src/api/group=5Fmanage?= =?UTF-8?q?ment/group=5Fmanagement.js?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/group_management/group_management.js | 44 -------------------- 1 file changed, 44 deletions(-) delete mode 100644 src/api/group_management/group_management.js diff --git a/src/api/group_management/group_management.js b/src/api/group_management/group_management.js deleted file mode 100644 index c8fc036..0000000 --- a/src/api/group_management/group_management.js +++ /dev/null @@ -1,44 +0,0 @@ -import request from '@/utils/request' - -// 查询分组管理列表 -export function listGroup_management(query) { - return request({ - url: '/group_management/group_management/list', - method: 'get', - params: query - }) -} - -// 查询分组管理详细 -export function getGroup_management(groupId) { - return request({ - url: '/group_management/group_management/' + groupId, - method: 'get' - }) -} - -// 新增分组管理 -export function addGroup_management(data) { - return request({ - url: '/group_management/group_management', - method: 'post', - data: data - }) -} - -// 修改分组管理 -export function updateGroup_management(data) { - return request({ - url: '/group_management/group_management', - method: 'put', - data: data - }) -} - -// 删除分组管理 -export function delGroup_management(groupId) { - return request({ - url: '/group_management/group_management/' + groupId, - method: 'delete' - }) -} From d87950bb70d54eb4e17296d961b9bbc72c962b27 Mon Sep 17 00:00:00 2001 From: wyt <414651037@qq.com> Date: Tue, 15 Jul 2025 17:34:54 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E5=88=A0=E9=99=A4=20src/api/sheep=5Ffile/s?= =?UTF-8?q?heep=5Ffile.js?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/sheep_file/sheep_file.js | 27 --------------------------- 1 file changed, 27 deletions(-) delete mode 100644 src/api/sheep_file/sheep_file.js diff --git a/src/api/sheep_file/sheep_file.js b/src/api/sheep_file/sheep_file.js deleted file mode 100644 index 892580a..0000000 --- a/src/api/sheep_file/sheep_file.js +++ /dev/null @@ -1,27 +0,0 @@ -import request from '@/utils/request' - -// 查询羊只档案列表 -export function listSheep_file(query) { - return request({ - url: '/sheep_file/sheep_file/list', - method: 'get', - params: query - }) -} - -// 查询羊只档案详细 -export function getSheep_file(id) { - return request({ - url: '/sheep_file/sheep_file/' + id, - method: 'get' - }) -} - - -// 删除羊只档案 -export function delSheep_file(id) { - return request({ - url: '/sheep_file/sheep_file/' + id, - method: 'delete' - }) -} From f64c59b2d5f43431ccf3c72f4a365dbe53cfeba3 Mon Sep 17 00:00:00 2001 From: wyt <414651037@qq.com> Date: Tue, 15 Jul 2025 17:35:07 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E5=88=A0=E9=99=A4=20src/api/sheepfold=5Fma?= =?UTF-8?q?nagement/sheepfold=5Fmanagement.js?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sheepfold_management.js | 44 ------------------- 1 file changed, 44 deletions(-) delete mode 100644 src/api/sheepfold_management/sheepfold_management.js diff --git a/src/api/sheepfold_management/sheepfold_management.js b/src/api/sheepfold_management/sheepfold_management.js deleted file mode 100644 index beba15f..0000000 --- a/src/api/sheepfold_management/sheepfold_management.js +++ /dev/null @@ -1,44 +0,0 @@ -import request from '@/utils/request' - -// 查询羊舍管理列表 -export function listSheepfold_management(query) { - return request({ - url: '/sheepfold_management/sheepfold_management/list', - method: 'get', - params: query - }) -} - -// 查询羊舍管理详细 -export function getSheepfold_management(id) { - return request({ - url: '/sheepfold_management/sheepfold_management/' + id, - method: 'get' - }) -} - -// 新增羊舍管理 -export function addSheepfold_management(data) { - return request({ - url: '/sheepfold_management/sheepfold_management', - method: 'post', - data: data - }) -} - -// 修改羊舍管理 -export function updateSheepfold_management(data) { - return request({ - url: '/sheepfold_management/sheepfold_management', - method: 'put', - data: data - }) -} - -// 删除羊舍管理 -export function delSheepfold_management(id) { - return request({ - url: '/sheepfold_management/sheepfold_management/' + id, - method: 'delete' - }) -} From edab958f7c8c8f7158390a9aab92aa891f57bcbc Mon Sep 17 00:00:00 2001 From: zyh <2066096076@qq.com> Date: Tue, 15 Jul 2025 18:39:38 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=BE=8A=E5=8F=AA?= =?UTF-8?q?=EF=BC=8C=E8=BD=AC=E7=BE=A4=E5=8A=9F=E8=83=BD=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/produce/sheep/sheep.js | 10 ++++ .../produce/manage_sheep/add_sheep/index.vue | 11 ++-- .../manage_sheep/trans_group/index.vue | 55 ++++++++++++++----- 3 files changed, 58 insertions(+), 18 deletions(-) create mode 100644 src/api/produce/sheep/sheep.js diff --git a/src/api/produce/sheep/sheep.js b/src/api/produce/sheep/sheep.js new file mode 100644 index 0000000..bd2c361 --- /dev/null +++ b/src/api/produce/sheep/sheep.js @@ -0,0 +1,10 @@ +import request from '@/utils/request'; + +// 新增羊只基本信息 +export function addSheep(data) { + return request({ + url: '/produce/sheep', // 确保这是正确的后端接口地址 + method: 'post', + data: data + }); +} \ No newline at end of file diff --git a/src/views/produce/manage_sheep/add_sheep/index.vue b/src/views/produce/manage_sheep/add_sheep/index.vue index 9ac7adf..693158f 100644 --- a/src/views/produce/manage_sheep/add_sheep/index.vue +++ b/src/views/produce/manage_sheep/add_sheep/index.vue @@ -143,21 +143,24 @@ const rules = { }; -//表单验证 +//表单验证 提交表单数据 const submitForm = () => { formRef.value.validate((valid) => { - console.log('表单验证结果:', valid); if (valid) { - addSheep(form.value) + addSheep(form.value) // 调用 API 方法，addSheep 应已在 @/api/sheep/sheep.js 中定义 .then(response => { - console.log('后端响应:', response); if (response.code === 200) { alert('新增成功'); resetForm(); + // 可以在这里添加刷新列表的逻辑，例如调用 list 方法 } else { alert(response.msg || '新增失败'); } }) + .catch(error => { + console.error('新增失败:', error); + alert('新增失败，请稍后重试'); + }); } else { alert('请填写所有必填字段'); } diff --git a/src/views/produce/manage_sheep/trans_group/index.vue b/src/views/produce/manage_sheep/trans_group/index.vue index 0102d07..cd0e671 100644 --- a/src/views/produce/manage_sheep/trans_group/index.vue +++ b/src/views/produce/manage_sheep/trans_group/index.vue @@ -107,9 +107,8 @@ - - + + @@ -134,15 +133,16 @@ - - - - + + + + - + @@ -165,6 +165,7 @@ import { listTrans_group, getTrans_group, delTrans_group, addTrans_group, updateTrans_group } from "@/api/produce/manage_sheep/trans_group/trans_group" import { listSheepfold_management as listSheepfold } from '@/api/sheepfold_management/sheepfold_management'; + const { proxy } = getCurrentInstance() const { trans_group_reason, status } = proxy.useDict('trans_group_reason', 'status') @@ -284,9 +285,12 @@ function handleUpdate(row) { reset() const _id = row.id || ids.value getTrans_group(_id).then(response => { - form.value = response.data + const data = response.data + data.foldFrom = Number(data.foldFrom) + data.foldTo = Number(data.foldTo) + data.reason = String(data.reason) + form.value = data open.value = true - title.value = "修改转群记录" }) } @@ -329,7 +333,6 @@ function handleExport() { }, `trans_group_${new Date().getTime()}.xlsx`); } -getList() // 审批记录的对话框 const approveDialog = ref(false); @@ -337,7 +340,6 @@ const approveForm = ref({}); // 审批按钮操作 function handleApprove(row) { - // 打开审批对话框 approveForm.value = { ...row }; approveDialog.value = true; } @@ -366,7 +368,7 @@ function handleApproveReject() { }); } -//羊舍名称 +//加载所有羊舍 const sheepfoldOptions = ref([]); function getSheepfoldOptions() { @@ -376,7 +378,32 @@ function getSheepfoldOptions() { } onMounted(() => { - getList(); getSheepfoldOptions(); }); + + +const sheepfoldNameMap = ref({}) + +function loadSheepfoldMap() { + listSheepfold({ pageNum: 1, pageSize: 9999 }).then(res => { + sheepfoldNameMap.value = res.rows.reduce((acc, item) => { + acc[item.id] = item.sheepfoldName + return acc + }, {}) + }) +} + +onMounted(() => { + nextTick(() => { + if (trans_group_reason.value && trans_group_reason.value.length) { + trans_group_reason.value.forEach(item => { + item.value = Number(item.value) + }) + } + loadSheepfoldMap() + }) +}) + + +getList() From 369ed7a0529d4a0277d691e7572e23e0b142baf0 Mon Sep 17 00:00:00 2001 From: zyh <2066096076@qq.com> Date: Tue, 15 Jul 2025 19:10:13 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=BE=8A=E5=8F=AA?= =?UTF-8?q?=EF=BC=8C=E8=BD=AC=E7=BE=A4=E5=8A=9F=E8=83=BD=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/produce/manage_sheep/add_sheep/index.vue | 2 +- src/views/produce/manage_sheep/trans_group/index.vue | 2 +- src/views/produce/other/castrate/index.vue | 2 +- src/views/produce/other/fixHoof/index.vue | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/produce/manage_sheep/add_sheep/index.vue b/src/views/produce/manage_sheep/add_sheep/index.vue index 693158f..2e41ad3 100644 --- a/src/views/produce/manage_sheep/add_sheep/index.vue +++ b/src/views/produce/manage_sheep/add_sheep/index.vue @@ -109,7 +109,7 @@