diff --git a/src/api/Pregnancy_Test/Pregnancy_Test.js b/src/api/Pregnancy_Test/Pregnancy_Test.js
index 345608e..8547e00 100644
--- a/src/api/Pregnancy_Test/Pregnancy_Test.js
+++ b/src/api/Pregnancy_Test/Pregnancy_Test.js
@@ -42,3 +42,14 @@ export function delPregnancy_Test(id) {
     method: 'delete'
   })
 }
+
+// 根据耳号查询羊只信息
+export function getSheepByManageTags(manageTags) {
+  return request({
+    url: '/Pregnancy_Test/Pregnancy_Test/getSheepByManageTags',
+    method: 'get',
+    params: {
+      manageTags: manageTags
+    }
+  })
+}
\ No newline at end of file
diff --git a/src/views/Pregnancy_Test/Pregnancy_Test/index.vue b/src/views/Pregnancy_Test/Pregnancy_Test/index.vue
index 989d52f..9b423b9 100644
--- a/src/views/Pregnancy_Test/Pregnancy_Test/index.vue
+++ b/src/views/Pregnancy_Test/Pregnancy_Test/index.vue
@@ -1,45 +1,43 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="耳号" prop="manageTags">
+        <el-input
+            v-model="queryParams.manageTags"
+            placeholder="请输入耳号，多个耳号用逗号分隔"
+            clearable
+            @keyup.enter="handleQuery"
+        />
+      </el-form-item>
       <el-form-item label="孕检日期" prop="datetime">
         <el-date-picker clearable
-          v-model="queryParams.datetime"
-          type="date"
-          value-format="YYYY-MM-DD"
-          placeholder="请选择孕检日期">
+                        v-model="queryParams.datetime"
+                        type="date"
+                        value-format="YYYY-MM-DD"
+                        placeholder="请选择孕检日期">
         </el-date-picker>
       </el-form-item>
       <el-form-item label="孕检结果" prop="result">
-        <el-input
-          v-model="queryParams.result"
-          placeholder="请输入孕检结果"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="${comment}" prop="number">
-        <el-input
-          v-model="queryParams.number"
-          placeholder="请输入${comment}"
-          clearable
-          @keyup.enter="handleQuery"
-        />
+        <el-select v-model="queryParams.result" placeholder="请选择孕检结果" clearable>
+          <el-option label="怀孕" value="怀孕" />
+          <el-option label="未孕" value="未孕" />
+          <el-option label="流产" value="流产" />
+        </el-select>
       </el-form-item>
       <el-form-item label="技术员" prop="technician">
         <el-input
-          v-model="queryParams.technician"
-          placeholder="请输入技术员"
-          clearable
-          @keyup.enter="handleQuery"
+            v-model="queryParams.technician"
+            placeholder="请输入技术员"
+            clearable
+            @keyup.enter="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="${comment}" prop="way">
-        <el-input
-          v-model="queryParams.way"
-          placeholder="请输入${comment}"
-          clearable
-          @keyup.enter="handleQuery"
-        />
+      <el-form-item label="孕检方式" prop="way">
+        <el-select v-model="queryParams.way" placeholder="请选择孕检方式" clearable>
+          <el-option label="B超" value="B超" />
+          <el-option label="试纸" value="试纸" />
+          <el-option label="血检" value="血检" />
+        </el-select>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -50,40 +48,40 @@
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
-          type="primary"
-          plain
-          icon="Plus"
-          @click="handleAdd"
-          v-hasPermi="['Pregnancy_Test:Pregnancy_Test:add']"
+            type="primary"
+            plain
+            icon="Plus"
+            @click="handleAdd"
+            v-hasPermi="['Pregnancy_Test:Pregnancy_Test:add']"
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="success"
-          plain
-          icon="Edit"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['Pregnancy_Test:Pregnancy_Test:edit']"
+            type="success"
+            plain
+            icon="Edit"
+            :disabled="single"
+            @click="handleUpdate"
+            v-hasPermi="['Pregnancy_Test:Pregnancy_Test:edit']"
         >修改</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="danger"
-          plain
-          icon="Delete"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['Pregnancy_Test:Pregnancy_Test:remove']"
+            type="danger"
+            plain
+            icon="Delete"
+            :disabled="multiple"
+            @click="handleDelete"
+            v-hasPermi="['Pregnancy_Test:Pregnancy_Test:remove']"
         >删除</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="warning"
-          plain
-          icon="Download"
-          @click="handleExport"
-          v-hasPermi="['Pregnancy_Test:Pregnancy_Test:export']"
+            type="warning"
+            plain
+            icon="Download"
+            @click="handleExport"
+            v-hasPermi="['Pregnancy_Test:Pregnancy_Test:export']"
         >导出</el-button>
       </el-col>
       <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
@@ -91,55 +89,166 @@
 
     <el-table v-loading="loading" :data="Pregnancy_TestList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="${comment}" align="center" prop="id" />
-      <el-table-column label="孕检日期" align="center" prop="datetime" width="180">
+      <el-table-column label="耳号" align="center" prop="manageTags" width="120" />
+      <el-table-column label="品种" align="center" prop="variety" width="100" />
+      <el-table-column label="事件类型" align="center" width="80">
+        <template #default="scope">
+          <span>孕检</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="孕检日期" align="center" prop="datetime" width="120">
         <template #default="scope">
           <span>{{ parseTime(scope.row.datetime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="孕检结果" align="center" prop="result" />
-      <el-table-column label="${comment}" align="center" prop="number" />
-      <el-table-column label="技术员" align="center" prop="technician" />
-      <el-table-column label="${comment}" align="center" prop="way" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="孕检结果" align="center" prop="result" width="80" />
+      <el-table-column label="配种公羊" align="center" prop="fatherManageTags" width="100" />
+      <el-table-column label="配种公羊品种" align="center" prop="fatherVariety" width="120" />
+      <el-table-column label="配种类型" align="center" prop="matingTypeName" width="80" />
+      <el-table-column label="配种日期" align="center" prop="matingDate" width="120">
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.matingDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="胎儿数量" align="center" prop="fetusCount" width="80" />
+      <el-table-column label="月龄" align="center" prop="monthAge" width="60" />
+      <el-table-column label="孕检时羊只类别" align="center" prop="breedStatus" width="120" />
+      <el-table-column label="胎次" align="center" prop="parity" width="60" />
+      <el-table-column label="配次" align="center" prop="matingCounts" width="60" />
+      <el-table-column label="当前羊舍" align="center" prop="sheepfoldName" width="100" />
+      <el-table-column label="技术员" align="center" prop="technician" width="80" />
+      <el-table-column label="繁育状态" align="center" prop="breedStatus" width="80" />
+      <el-table-column label="预产日期" align="center" prop="expectedDate" width="120">
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.expectedDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="上次事件日期" align="center" prop="lastEventDate" width="120">
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.lastEventDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="孕检方式" align="center" prop="way" width="80" />
+      <el-table-column label="创建人" align="center" prop="createBy" width="80" />
+      <el-table-column label="创建日期" align="center" prop="createTime" width="120">
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="所在牧场" align="center" prop="ranchName" width="100" />
+      <el-table-column label="备注" align="center" prop="remark" width="120" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150" fixed="right">
         <template #default="scope">
           <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['Pregnancy_Test:Pregnancy_Test:edit']">修改</el-button>
           <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['Pregnancy_Test:Pregnancy_Test:remove']">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
-      v-show="total>0"
-      :total="total"
-      v-model:page="queryParams.pageNum"
-      v-model:limit="queryParams.pageSize"
-      @pagination="getList"
+        v-show="total>0"
+        :total="total"
+        v-model:page="queryParams.pageNum"
+        v-model:limit="queryParams.pageSize"
+        @pagination="getList"
     />
 
     <!-- 添加或修改孕检记录对话框 -->
-    <el-dialog :title="title" v-model="open" width="500px" append-to-body>
-      <el-form ref="Pregnancy_TestRef" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="孕检日期" prop="datetime">
-          <el-date-picker clearable
-            v-model="form.datetime"
-            type="date"
-            value-format="YYYY-MM-DD"
-            placeholder="请选择孕检日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="孕检结果" prop="result">
-          <el-input v-model="form.result" placeholder="请输入孕检结果" />
-        </el-form-item>
-        <el-form-item label="${comment}" prop="number">
-          <el-input v-model="form.number" placeholder="请输入${comment}" />
-        </el-form-item>
-        <el-form-item label="技术员" prop="technician">
-          <el-input v-model="form.technician" placeholder="请输入技术员" />
-        </el-form-item>
-        <el-form-item label="${comment}" prop="way">
-          <el-input v-model="form.way" placeholder="请输入${comment}" />
-        </el-form-item>
+    <el-dialog :title="title" v-model="open" width="800px" append-to-body>
+      <el-form ref="Pregnancy_TestRef" :model="form" :rules="rules" label-width="120px">
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="耳号" prop="manageTags">
+              <el-input v-model="form.manageTags" placeholder="请输入耳号" @blur="getSheepInfo" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="孕检日期" prop="datetime">
+              <el-date-picker clearable
+                              v-model="form.datetime"
+                              type="date"
+                              value-format="YYYY-MM-DD"
+                              placeholder="请选择孕检日期">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="孕检结果" prop="result">
+              <el-select v-model="form.result" placeholder="请选择孕检结果">
+                <el-option label="怀孕" value="怀孕" />
+                <el-option label="未孕" value="未孕" />
+                <el-option label="流产" value="流产" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="胎儿数量" prop="fetusCount">
+              <el-input-number v-model="form.fetusCount" :min="0" :max="10" placeholder="请输入胎儿数量" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="技术员" prop="technician">
+              <el-input v-model="form.technician" placeholder="请输入技术员" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="孕检方式" prop="way">
+              <el-select v-model="form.way" placeholder="请选择孕检方式">
+                <el-option label="B超" value="B超" />
+                <el-option label="试纸" value="试纸" />
+                <el-option label="血检" value="血检" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="24">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model="form.remark" type="textarea" placeholder="请输入备注" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <!-- 羊只信息显示 -->
+        <el-divider content-position="left">羊只信息</el-divider>
+        <el-row :gutter="20" v-if="sheepInfo.id">
+          <el-col :span="8">
+            <el-form-item label="品种">
+              <el-input v-model="sheepInfo.variety" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="月龄">
+              <el-input v-model="sheepInfo.monthAge" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="胎次">
+              <el-input v-model="sheepInfo.parity" disabled />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20" v-if="sheepInfo.id">
+          <el-col :span="8">
+            <el-form-item label="配次">
+              <el-input v-model="sheepInfo.matingCounts" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="当前羊舍">
+              <el-input v-model="sheepInfo.sheepfoldName" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="繁育状态">
+              <el-input v-model="sheepInfo.breedStatus" disabled />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <template #footer>
         <div class="dialog-footer">
@@ -152,7 +261,7 @@
 </template>
 
 <script setup name="Pregnancy_Test">
-import { listPregnancy_Test, getPregnancy_Test, delPregnancy_Test, addPregnancy_Test, updatePregnancy_Test } from "@/api/Pregnancy_Test/Pregnancy_Test"
+import { listPregnancy_Test, getPregnancy_Test, delPregnancy_Test, addPregnancy_Test, updatePregnancy_Test, getSheepByManageTags } from "@/api/Pregnancy_Test/Pregnancy_Test"
 
 const { proxy } = getCurrentInstance()
 
@@ -165,19 +274,35 @@ const single = ref(true)
 const multiple = ref(true)
 const total = ref(0)
 const title = ref("")
+const sheepInfo = ref({})
 
 const data = reactive({
   form: {},
   queryParams: {
     pageNum: 1,
     pageSize: 10,
+    manageTags: null,
     datetime: null,
     result: null,
-    number: null,
     technician: null,
     way: null,
   },
   rules: {
+    manageTags: [
+      { required: true, message: "耳号不能为空", trigger: "blur" }
+    ],
+    datetime: [
+      { required: true, message: "孕检日期不能为空", trigger: "change" }
+    ],
+    result: [
+      { required: true, message: "孕检结果不能为空", trigger: "change" }
+    ],
+    technician: [
+      { required: true, message: "技术员不能为空", trigger: "blur" }
+    ],
+    way: [
+      { required: true, message: "孕检方式不能为空", trigger: "change" }
+    ]
   }
 })
 
@@ -193,6 +318,22 @@ function getList() {
   })
 }
 
+/** 根据耳号获取羊只信息 */
+function getSheepInfo() {
+  if (form.value.manageTags) {
+    getSheepByManageTags(form.value.manageTags).then(response => {
+      if (response.data) {
+        sheepInfo.value = response.data
+        form.value.sheepId = response.data.id
+      } else {
+        proxy.$modal.msgError("未找到该耳号的羊只信息")
+        sheepInfo.value = {}
+        form.value.sheepId = null
+      }
+    })
+  }
+}
+
 // 取消按钮
 function cancel() {
   open.value = false
@@ -203,14 +344,18 @@ function cancel() {
 function reset() {
   form.value = {
     id: null,
+    sheepId: null,
+    manageTags: null,
     datetime: null,
     result: null,
-    number: null,
+    fetusCount: null,
     technician: null,
     way: null,
+    remark: null,
     createBy: null,
     createTime: null
   }
+  sheepInfo.value = {}
   proxy.resetForm("Pregnancy_TestRef")
 }
 
@@ -246,6 +391,11 @@ function handleUpdate(row) {
   const _id = row.id || ids.value
   getPregnancy_Test(_id).then(response => {
     form.value = response.data
+    form.value.manageTags = response.data.manageTags
+    // 获取羊只信息用于显示
+    if (response.data.manageTags) {
+      getSheepInfo()
+    }
     open.value = true
     title.value = "修改孕检记录"
   })
@@ -292,3 +442,12 @@ function handleExport() {
 
 getList()
 </script>
+
+<style scoped>
+.el-table {
+  font-size: 12px;
+}
+.el-table .cell {
+  padding: 0 5px;
+}
+</style>
\ No newline at end of file