diff --git a/src/views/Breeding_records/Breeding_records/index.vue b/src/views/Breeding_records/Breeding_records/index.vue
index b3b7ed5..81b510d 100644
--- a/src/views/Breeding_records/Breeding_records/index.vue
+++ b/src/views/Breeding_records/Breeding_records/index.vue
@@ -424,6 +424,16 @@
新增
+
+ 删除
+
导出
diff --git a/src/views/Pregnancy_Test/Pregnancy_Test/index.vue b/src/views/Pregnancy_Test/Pregnancy_Test/index.vue
index 386ddc8..a204268 100644
--- a/src/views/Pregnancy_Test/Pregnancy_Test/index.vue
+++ b/src/views/Pregnancy_Test/Pregnancy_Test/index.vue
@@ -186,11 +186,7 @@
-
-
- {{ parseTime(scope.row.datetime, '{y}-{m}-{d}') }}
-
-
+
@@ -198,6 +194,8 @@
孕检
+
+
@@ -205,29 +203,25 @@
-
-
-
-
-
- {{ parseTime(scope.row.matingDate, '{y}-{m}-{d}') }}
-
-
-
-
-
- {{ scope.row.daysAfterMating }}天
- -
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{{ parseTime(scope.row.expectedDate, '{y}-{m}-{d}') }}
@@ -297,6 +291,14 @@
+
+
+
+
+
+
+
+
{
if (valid) {
+ // 四、提示:配种当天不许孕检
+ if (form.value.datetime && breedInfo.value.matingDate) {
+ // 统一格式化为 YYYY-MM-DD 进行字符串比较
+ const matingDateStr = parseTime(breedInfo.value.matingDate, '{y}-{m}-{d}');
+ const pregnancyDateStr = form.value.datetime; // 已是格式化后的字符串
+
+ if (matingDateStr === pregnancyDateStr) {
+ proxy.$modal.msgError("操作拦截:该羊只在 " + matingDateStr + " 刚进行过配种,配种当天不允许进行孕检!");
+ return; // 终止提交
+ }
+ }
// 清理表单数据
if (form.value.manageTags) {
form.value.manageTags = form.value.manageTags.trim()
@@ -790,10 +805,7 @@ function submitForm() {
console.log("修改成功响应", response)
proxy.$modal.msgSuccess("修改成功")
open.value = false
- // 强制刷新页面数据
- setTimeout(() => {
- getList()
- }, 500)
+ getList(); // 修改完直接刷新
}).catch((error) => {
console.error("修改失败", error)
proxy.$modal.msgError("修改失败")
@@ -804,10 +816,8 @@ function submitForm() {
if (response && response.code === 200) {
proxy.$modal.msgSuccess("新增成功")
open.value = false
- // 强制刷新页面数据,延迟执行确保对话框关闭
- setTimeout(() => {
- getList()
- }, 500)
+ // 关键:重置查询条件,防止被之前的搜索框内容过滤掉新数据
+ resetQuery();
} else {
console.error("新增返回异常", response)
proxy.$modal.msgError("新增失败")
diff --git a/src/views/embryo/flush/index.vue b/src/views/embryo/flush/index.vue
index c6d1569..1ef7225 100644
--- a/src/views/embryo/flush/index.vue
+++ b/src/views/embryo/flush/index.vue
@@ -45,6 +45,7 @@
v-hasPermi="['embryo:flush:add']"
>新增
+