diff --git a/src/views/Breeding_records/Breeding_records/index.vue b/src/views/Breeding_records/Breeding_records/index.vue
index b9675c9..b3b7ed5 100644
--- a/src/views/Breeding_records/Breeding_records/index.vue
+++ b/src/views/Breeding_records/Breeding_records/index.vue
@@ -1,84 +1,419 @@
+<!--<template>-->
+<!--  <div class="app-container">-->
+<!--    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="100px">-->
+<!--      <el-form-item label="供体母羊耳号" prop="eweManageTags">-->
+<!--        <el-input-->
+<!--            v-model="queryParams.eweManageTags"-->
+<!--            placeholder="请输入供体母羊耳号"-->
+<!--            clearable-->
+<!--            @keyup.enter="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="供体公羊耳号" prop="ramManageTags">-->
+<!--        <el-input-->
+<!--            v-model="queryParams.ramManageTags"-->
+<!--            placeholder="请输入公羊耳号"-->
+<!--            clearable-->
+<!--            @keyup.enter="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="供体母羊品种" prop="eweVariety">-->
+<!--        <el-input-->
+<!--            v-model="queryParams.eweVariety"-->
+<!--            placeholder="请输入母羊品种"-->
+<!--            clearable-->
+<!--            @keyup.enter="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="供体公羊品种" prop="ramVariety">-->
+<!--        <el-input-->
+<!--            v-model="queryParams.ramVariety"-->
+<!--            placeholder="请输入公羊品种"-->
+<!--            clearable-->
+<!--            @keyup.enter="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="配种方式" prop="breedType">-->
+<!--        <el-select v-model="queryParams.breedType" placeholder="请选择配种方式" clearable>-->
+<!--          <el-option label="供体母羊配种" value="1"></el-option>-->
+<!--          <el-option label="同期发情人工授精" value="2"></el-option>-->
+<!--          <el-option label="本交" value="3"></el-option>-->
+<!--          <el-option label="胚胎移植" value="4"></el-option>-->
+<!--          <el-option label="自然法请人工授精" value="5"></el-option>-->
+<!--                                               </el-select>-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="技术员" prop="technician">-->
+<!--        <el-input-->
+<!--            v-model="queryParams.technician"-->
+<!--            placeholder="请输入技术员"-->
+<!--            clearable-->
+<!--            @keyup.enter="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="孕检结果" prop="pregnancyResult">-->
+<!--        <el-select v-model="queryParams.pregnancyResult" placeholder="请选择孕检结果" clearable>-->
+<!--          <el-option label="怀孕" value="怀孕"></el-option>-->
+<!--          <el-option label="空怀" value="空怀"></el-option>-->
+<!--          <el-option label="疑似怀孕" value="疑似怀孕"></el-option>-->
+<!--        </el-select>-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="是否孕检" prop="isPregnancyChecked">-->
+<!--        <el-select v-model="queryParams.isPregnancyChecked" placeholder="请选择是否已孕检" clearable>-->
+<!--          <el-option label="已孕检" value="1"></el-option>-->
+<!--          <el-option label="未孕检" value="0"></el-option>-->
+<!--        </el-select>-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="创建人" prop="createBy">-->
+<!--        <el-input-->
+<!--            v-model="queryParams.createBy"-->
+<!--            placeholder="请输入创建人"-->
+<!--            clearable-->
+<!--            @keyup.enter="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="创建日期" prop="createTime">-->
+<!--        <el-date-picker clearable-->
+<!--                        v-model="queryParams.createTime"-->
+<!--                        type="date"-->
+<!--                        value-format="YYYY-MM-DD"-->
+<!--                        placeholder="请选择创建日期">-->
+<!--        </el-date-picker>-->
+<!--      </el-form-item>-->
+<!--      <el-form-item>-->
+<!--        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>-->
+<!--        <el-button icon="Refresh" @click="resetQuery">重置</el-button>-->
+<!--      </el-form-item>-->
+<!--    </el-form>-->
+
+<!--    <el-row :gutter="10" class="mb8">-->
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--            type="primary"-->
+<!--            plain-->
+<!--            icon="Plus"-->
+<!--            @click="handleAdd"-->
+<!--            v-hasPermi="['Breeding_records:Breeding_records:add']"-->
+<!--        >新增</el-button>-->
+<!--      </el-col>-->
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--            type="success"-->
+<!--            plain-->
+<!--            icon="Edit"-->
+<!--            :disabled="single"-->
+<!--            @click="handleUpdate"-->
+<!--            v-hasPermi="['Breeding_records:Breeding_records:edit']"-->
+<!--        >修改</el-button>-->
+<!--      </el-col>-->
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--            type="danger"-->
+<!--            plain-->
+<!--            icon="Delete"-->
+<!--            :disabled="multiple"-->
+<!--            @click="handleDelete"-->
+<!--            v-hasPermi="['Breeding_records:Breeding_records:remove']"-->
+<!--        >删除</el-button>-->
+<!--      </el-col>-->
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--            type="warning"-->
+<!--            plain-->
+<!--            icon="Download"-->
+<!--            @click="handleExport"-->
+<!--            v-hasPermi="['Breeding_records:Breeding_records:export']"-->
+<!--        >导出</el-button>-->
+<!--      </el-col>-->
+<!--      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>-->
+<!--    </el-row>-->
+
+<!--    <el-table-->
+<!--        v-loading="loading"-->
+<!--        :data="Breeding_recordsList"-->
+<!--        @selection-change="handleSelectionChange"-->
+<!--        @sort-change="handleSortChange"-->
+<!--        :default-sort="{prop: 'createTime', order: 'descending'}"-->
+<!--    >-->
+<!--      <el-table-column type="selection" width="55" align="center" />-->
+<!--      &lt;!&ndash; 创建日期作为第一列,支持排序 &ndash;&gt;-->
+<!--      <el-table-column-->
+<!--          label="创建日期"-->
+<!--          align="center"-->
+<!--          prop="createTime"-->
+<!--          width="180"-->
+<!--          fixed="left"-->
+<!--          sortable="custom"-->
+<!--          sort-by="createTime"-->
+<!--      >-->
+<!--        <template #default="scope">-->
+<!--          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}') }}</span>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+<!--      <el-table-column label="耳号" align="center" prop="eweManageTags" width="120" />-->
+<!--      <el-table-column label="品种" align="center" prop="eweVariety" width="100" />-->
+<!--      <el-table-column label="事件类型" align="center" width="100">-->
+<!--        <template #default="scope">-->
+<!--          <el-tag type="success">配种</el-tag>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+<!--      <el-table-column label="配种公羊" align="center" prop="ramManageTags" width="120" />-->
+<!--      <el-table-column label="配种公羊品种" align="center" prop="ramVariety" width="120" />-->
+<!--      <el-table-column label="配种方式" align="center" prop="matingType" width="140">-->
+<!--        <template #default="scope">-->
+<!--          <span>{{ getBreedTypeText(scope.row.breedType) }}</span>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+<!--      <el-table-column label="月龄" align="center" prop="eweMonthAge" width="80" />-->
+<!--      <el-table-column label="配种时羊只类别" align="center" prop="sheepType" width="120" />-->
+<!--      <el-table-column label="胎次" align="center" prop="eweParity" width="80" />-->
+<!--      <el-table-column label="配次" align="center" prop="matingCount" width="80" />-->
+<!--      <el-table-column label="发情后配种时间(小时)" align="center" prop="timeSincePlanning" width="140">-->
+<!--        <template #default="scope">-->
+<!--          <span>{{ scope.row.timeSincePlanning || 0 }}</span>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+<!--      <el-table-column label="当前羊舍" align="center" prop="eweSheepfoldName" width="120" />-->
+<!--      <el-table-column label="技术员" align="center" prop="technician" width="100" />-->
+<!--      <el-table-column label="羊只备注" align="center" prop="eweComment" width="120" show-overflow-tooltip />-->
+<!--      <el-table-column label="繁育状态" align="center" prop="eweBreedStatus" width="100" />-->
+<!--      <el-table-column label="是否性控" align="center" prop="eweControlled" width="100">-->
+<!--        <template #default="scope">-->
+<!--          <el-tag :type="scope.row.eweControlled === 1 ? 'success' : 'info'">-->
+<!--            {{ scope.row.eweControlled === 1 ? '是' : '否' }}-->
+<!--          </el-tag>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+<!--      <el-table-column label="耗精量" align="center" prop="breedDrugs" width="100" />-->
+
+<!--      &lt;!&ndash; 孕检相关字段 &ndash;&gt;-->
+<!--      <el-table-column label="孕检状态" align="center" width="100">-->
+<!--        <template #default="scope">-->
+<!--          <el-tag :type="scope.row.isPregnancyChecked === 1 ? 'success' : 'warning'">-->
+<!--            {{ scope.row.isPregnancyChecked === 1 ? '已孕检' : '未孕检' }}-->
+<!--          </el-tag>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+<!--      <el-table-column label="孕检日期" align="center" prop="pregnancyCheckDate" width="120">-->
+<!--        <template #default="scope">-->
+<!--          <span>{{ scope.row.pregnancyCheckDate ? parseTime(scope.row.pregnancyCheckDate, '{y}-{m}-{d}') : '-' }}</span>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+<!--      <el-table-column label="孕检结果" align="center" prop="pregnancyResult" width="100">-->
+<!--        <template #default="scope">-->
+<!--          <el-tag v-if="scope.row.pregnancyResult"-->
+<!--                  :type="getPregnancyResultType(scope.row.pregnancyResult)">-->
+<!--            {{ scope.row.pregnancyResult }}-->
+<!--          </el-tag>-->
+<!--          <span v-else>-</span>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+<!--      <el-table-column label="胎数" align="center" prop="fetusCount" width="80">-->
+<!--        <template #default="scope">-->
+<!--          <span>{{ scope.row.fetusCount || '-' }}</span>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+<!--      <el-table-column label="孕检方式" align="center" prop="pregnancyWay" width="100">-->
+<!--        <template #default="scope">-->
+<!--          <span>{{ scope.row.pregnancyWay || '-' }}</span>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+<!--      <el-table-column label="配种到孕检间隔(天)" align="center" prop="daysToPregnancyCheck" width="140">-->
+<!--        <template #default="scope">-->
+<!--          <span>{{ scope.row.daysToPregnancyCheck || '-' }}</span>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+
+<!--      <el-table-column label="创建人" align="center" prop="createBy" width="100" />-->
+<!--      <el-table-column label="所在牧场" align="center" prop="ranchName" width="120" />-->
+<!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="160" fixed="right">-->
+<!--        <template #default="scope">-->
+<!--          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['Breeding_records:Breeding_records:edit']">修改</el-button>-->
+<!--          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['Breeding_records:Breeding_records: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"-->
+<!--        :page-sizes="[20,50,100,200, 500, 1000, 2000]"-->
+<!--        @pagination="getList"-->
+<!--    />-->
+
+<!--    &lt;!&ndash; 添加或修改配种记录对话框 &ndash;&gt;-->
+<!--    <el-dialog :title="title" v-model="open" width="800px" append-to-body>-->
+<!--      <el-form ref="Breeding_recordsRef" :model="form" :rules="rules" label-width="120px">-->
+<!--        <el-row>-->
+<!--          <el-col :span="12">-->
+<!--            <el-form-item label="母羊耳号" prop="eweManageTags">-->
+<!--              <el-input v-model="form.eweManageTags" placeholder="请输入母羊耳号" @blur="getEweInfoAndPlan" />-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--          <el-col :span="12">-->
+<!--            <el-form-item label="公羊耳号" prop="ramManageTags">-->
+<!--              <el-input v-model="form.ramManageTags" placeholder="请输入公羊耳号" @blur="getRamInfoByTags" />-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--        </el-row>-->
+<!--        <el-row>-->
+<!--          <el-col :span="12">-->
+<!--            <el-form-item label="配种方式" prop="breedType">-->
+<!--              <el-select v-model="form.breedType" placeholder="请选择配种方式">-->
+<!--                <el-option label="供体母羊配种" value="1"></el-option>-->
+<!--                <el-option label="同期发情人工授精" value="2"></el-option>-->
+<!--                <el-option label="本交" value="3"></el-option>-->
+<!--                <el-option label="胚胎移植" value="4"></el-option>-->
+<!--                <el-option label="自然法请人工授精" value="5"></el-option>-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--          <el-col :span="12">-->
+<!--            <el-form-item label="技术员" prop="technician">-->
+<!--              <el-input v-model="form.technician" placeholder="请输入技术员" />-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--        </el-row>-->
+<!--        <el-row>-->
+<!--          <el-col :span="12">-->
+<!--            <el-form-item label="耗精量" prop="breedDrugs">-->
+<!--              <el-input v-model="form.breedDrugs" placeholder="请输入耗精量" />-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--        </el-row>-->
+<!--        <el-row>-->
+<!--          <el-col :span="24">-->
+<!--            <el-form-item label="备注" prop="comment">-->
+<!--              <el-input v-model="form.comment" type="textarea" placeholder="请输入备注" />-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--        </el-row>-->
+
+<!--        &lt;!&ndash; 显示母羊信息区域 &ndash;&gt;-->
+<!--        <el-row v-if="eweInfo">-->
+<!--          <el-col :span="24">-->
+<!--            <el-divider content-position="left">母羊信息</el-divider>-->
+<!--          </el-col>-->
+<!--          <el-col :span="8">-->
+<!--            <el-form-item label="品种">-->
+<!--              <el-input v-model="eweInfo.variety" readonly />-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--          <el-col :span="8">-->
+<!--            <el-form-item label="月龄">-->
+<!--              <el-input v-model="eweInfo.month_age" readonly />-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--          <el-col :span="8">-->
+<!--            <el-form-item label="胎次">-->
+<!--              <el-input v-model="eweInfo.parity" readonly />-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--          <el-col :span="8">-->
+<!--            <el-form-item label="繁育状态">-->
+<!--              <el-input v-model="eweInfo.breed_status" readonly />-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--          <el-col :span="8">-->
+<!--            <el-form-item label="当前羊舍">-->
+<!--              <el-input v-model="eweInfo.sheepfold_name" readonly />-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--          <el-col :span="8">-->
+<!--            <el-form-item label="是否性控">-->
+<!--              <el-input :value="eweInfo.controlled === 1 ? '是' : '否'" readonly />-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--        </el-row>-->
+
+<!--        &lt;!&ndash; 显示配种计划信息区域 &ndash;&gt;-->
+<!--        <el-row v-if="breedPlan">-->
+<!--          <el-col :span="24">-->
+<!--            <el-divider content-position="left">配种计划信息</el-divider>-->
+<!--          </el-col>-->
+<!--          <el-col :span="12">-->
+<!--            <el-form-item label="计划公羊">-->
+<!--              <el-input v-model="breedPlan.ram_manage_tags" readonly />-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--          <el-col :span="12">-->
+<!--            <el-form-item label="计划配种方式">-->
+<!--              <el-input v-model="breedPlan.breed_type_name" readonly />-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--        </el-row>-->
+
+<!--        &lt;!&ndash; 显示孕检信息区域(如果已有孕检记录) &ndash;&gt;-->
+<!--        <el-row v-if="form.pregnancyResult">-->
+<!--          <el-col :span="24">-->
+<!--            <el-divider content-position="left">孕检信息</el-divider>-->
+<!--          </el-col>-->
+<!--          <el-col :span="8">-->
+<!--            <el-form-item label="孕检日期">-->
+<!--              <el-input :value="form.pregnancyCheckDate ? parseTime(form.pregnancyCheckDate, '{y}-{m}-{d}') : ''" readonly />-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--          <el-col :span="8">-->
+<!--            <el-form-item label="孕检结果">-->
+<!--              <el-input v-model="form.pregnancyResult" readonly />-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--          <el-col :span="8">-->
+<!--            <el-form-item label="胎数">-->
+<!--              <el-input v-model="form.fetusCount" readonly />-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--          <el-col :span="8">-->
+<!--            <el-form-item label="孕检方式">-->
+<!--              <el-input v-model="form.pregnancyWay" readonly />-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--          <el-col :span="8">-->
+<!--            <el-form-item label="孕检技术员">-->
+<!--              <el-input v-model="form.pregnancyTechnician" readonly />-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--          <el-col :span="8">-->
+<!--            <el-form-item label="配种到孕检间隔">-->
+<!--              <el-input :value="form.daysToPregnancyCheck + '天'" readonly />-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--        </el-row>-->
+<!--      </el-form>-->
+<!--      <template #footer>-->
+<!--        <div class="dialog-footer">-->
+<!--          <el-button type="primary" @click="submitForm">确 定</el-button>-->
+<!--          <el-button @click="cancel">取 消</el-button>-->
+<!--        </div>-->
+<!--      </template>-->
+<!--    </el-dialog>-->
+<!--  </div>-->
+
+<!--  <div class="dialog-footer">-->
+<!--    <el-button type="primary" @click="submitForm">确 定</el-button>-->
+<!--    <el-button @click="cancel">取 消</el-button>-->
+<!--  </div>-->
+
+<!--</template>-->
+
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="100px">
-      <el-form-item label="供体母羊耳号" prop="eweManageTags">
-        <el-input
-            v-model="queryParams.eweManageTags"
-            placeholder="请输入供体母羊耳号"
-            clearable
-            @keyup.enter="handleQuery"
-        />
+      <el-form-item label="母羊耳号" prop="eweManageTags">
+        <el-input v-model="queryParams.eweManageTags" placeholder="请输入母羊耳号" clearable @keyup.enter="handleQuery"/>
       </el-form-item>
-      <el-form-item label="供体公羊耳号" prop="ramManageTags">
-        <el-input
-            v-model="queryParams.ramManageTags"
-            placeholder="请输入公羊耳号"
-            clearable
-            @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="供体母羊品种" prop="eweVariety">
-        <el-input
-            v-model="queryParams.eweVariety"
-            placeholder="请输入母羊品种"
-            clearable
-            @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="供体公羊品种" prop="ramVariety">
-        <el-input
-            v-model="queryParams.ramVariety"
-            placeholder="请输入公羊品种"
-            clearable
-            @keyup.enter="handleQuery"
-        />
+      <el-form-item label="冻精号" prop="frozenSemenNo">
+        <el-input v-model="queryParams.frozenSemenNo" placeholder="请输入冻精号" clearable @keyup.enter="handleQuery"/>
       </el-form-item>
       <el-form-item label="配种方式" prop="breedType">
         <el-select v-model="queryParams.breedType" placeholder="请选择配种方式" clearable>
-          <el-option label="供体母羊配种" value="1"></el-option>
-          <el-option label="同期发情人工授精" value="2"></el-option>
-          <el-option label="本交" value="3"></el-option>
-          <el-option label="胚胎移植" value="4"></el-option>
-          <el-option label="自然法请人工授精" value="5"></el-option>
-                                               </el-select>
-      </el-form-item>
-      <el-form-item label="技术员" prop="technician">
-        <el-input
-            v-model="queryParams.technician"
-            placeholder="请输入技术员"
-            clearable
-            @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="孕检结果" prop="pregnancyResult">
-        <el-select v-model="queryParams.pregnancyResult" placeholder="请选择孕检结果" clearable>
-          <el-option label="怀孕" value="怀孕"></el-option>
-          <el-option label="空怀" value="空怀"></el-option>
-          <el-option label="疑似怀孕" value="疑似怀孕"></el-option>
+          <el-option label="供体母羊配种":value="1"></el-option>
+          <el-option label="同期发情人工授精":value="2"></el-option>
+          <el-option label="本交" :value="3"></el-option>
+          <el-option label="胚胎移植" :value="5"></el-option> <el-option label="自然发情人工授精":value="4"></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="是否孕检" prop="isPregnancyChecked">
-        <el-select v-model="queryParams.isPregnancyChecked" placeholder="请选择是否已孕检" clearable>
-          <el-option label="已孕检" value="1"></el-option>
-          <el-option label="未孕检" value="0"></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="创建人" prop="createBy">
-        <el-input
-            v-model="queryParams.createBy"
-            placeholder="请输入创建人"
-            clearable
-            @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="创建日期" prop="createTime">
-        <el-date-picker clearable
-                        v-model="queryParams.createTime"
-                        type="date"
-                        value-format="YYYY-MM-DD"
-                        placeholder="请选择创建日期">
-        </el-date-picker>
-      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
         <el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -87,162 +422,77 @@
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button
-            type="primary"
-            plain
-            icon="Plus"
-            @click="handleAdd"
-            v-hasPermi="['Breeding_records:Breeding_records:add']"
-        >新增</el-button>
+        <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['Breeding_records:Breeding_records:add']">新增</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-            type="success"
-            plain
-            icon="Edit"
-            :disabled="single"
-            @click="handleUpdate"
-            v-hasPermi="['Breeding_records:Breeding_records:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-            type="danger"
-            plain
-            icon="Delete"
-            :disabled="multiple"
-            @click="handleDelete"
-            v-hasPermi="['Breeding_records:Breeding_records:remove']"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-            type="warning"
-            plain
-            icon="Download"
-            @click="handleExport"
-            v-hasPermi="['Breeding_records:Breeding_records:export']"
-        >导出</el-button>
+        <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['Breeding_records:Breeding_records:export']">导出</el-button>
       </el-col>
       <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table
-        v-loading="loading"
-        :data="Breeding_recordsList"
-        @selection-change="handleSelectionChange"
-        @sort-change="handleSortChange"
-        :default-sort="{prop: 'createTime', order: 'descending'}"
-    >
+    <el-table v-loading="loading" :data="Breeding_recordsList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <!-- 创建日期作为第一列,支持排序 -->
-      <el-table-column
-          label="创建日期"
-          align="center"
-          prop="createTime"
-          width="180"
-          fixed="left"
-          sortable="custom"
-          sort-by="createTime"
-      >
-        <template #default="scope">
-          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}') }}</span>
-        </template>
-      </el-table-column>
+
       <el-table-column label="耳号" align="center" prop="eweManageTags" width="120" />
       <el-table-column label="品种" align="center" prop="eweVariety" width="100" />
-      <el-table-column label="事件类型" align="center" width="100">
-        <template #default="scope">
-          <el-tag type="success">配种</el-tag>
-        </template>
+      <el-table-column label="事件类型" align="center" width="100"><template #default>配种</template></el-table-column>
+      <el-table-column label="配种日期" align="center" prop="createTime" width="160">
+        <template #default="scope"><span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span></template>
       </el-table-column>
       <el-table-column label="配种公羊" align="center" prop="ramManageTags" width="120" />
       <el-table-column label="配种公羊品种" align="center" prop="ramVariety" width="120" />
-      <el-table-column label="配种方式" align="center" prop="matingType" width="140">
-        <template #default="scope">
-          <span>{{ getBreedTypeText(scope.row.breedType) }}</span>
-        </template>
+
+      <el-table-column label="供体母羊" align="center" prop="donorEweNo" width="120" />
+      <el-table-column label="供体母羊品种" align="center" prop="donorEweVariety" width="120" />
+      <el-table-column label="供体公羊" align="center" prop="donorRamNo" width="120" />
+      <el-table-column label="供体公羊品种" align="center" prop="donorRamVariety" width="120" />
+      <el-table-column label="移胚数" align="center" prop="embryoCount" width="80" />
+
+      <el-table-column label="配种方式" align="center" prop="breedType" width="140">
+        <template #default="scope"><span>{{ getBreedTypeText(scope.row.breedType) }}</span></template>
       </el-table-column>
+      <el-table-column label="配种子类型" align="center" prop="embryoSubType" width="140" />
+
       <el-table-column label="月龄" align="center" prop="eweMonthAge" width="80" />
       <el-table-column label="配种时羊只类别" align="center" prop="sheepType" width="120" />
       <el-table-column label="胎次" align="center" prop="eweParity" width="80" />
       <el-table-column label="配次" align="center" prop="matingCount" width="80" />
-      <el-table-column label="发情后配种时间(小时)" align="center" prop="timeSincePlanning" width="140">
-        <template #default="scope">
-          <span>{{ scope.row.timeSincePlanning || 0 }}</span>
-        </template>
-      </el-table-column>
+      <el-table-column label="发情后配种时间" align="center" prop="timeSincePlanning" width="100" />
       <el-table-column label="当前羊舍" align="center" prop="eweSheepfoldName" width="120" />
       <el-table-column label="技术员" align="center" prop="technician" width="100" />
+      <el-table-column label="繁殖用药" align="center" prop="breedDrugs" width="100" />
       <el-table-column label="羊只备注" align="center" prop="eweComment" width="120" show-overflow-tooltip />
       <el-table-column label="繁育状态" align="center" prop="eweBreedStatus" width="100" />
-      <el-table-column label="是否性控" align="center" prop="eweControlled" width="100">
-        <template #default="scope">
-          <el-tag :type="scope.row.eweControlled === 1 ? 'success' : 'info'">
-            {{ scope.row.eweControlled === 1 ? '是' : '否' }}
-          </el-tag>
-        </template>
-      </el-table-column>
-      <el-table-column label="耗精量" align="center" prop="breedDrugs" width="100" />
+      <el-table-column label="孕检日期" align="center" prop="pregnancyCheckDate" width="120" />
+      <el-table-column label="孕检结果" align="center" prop="pregnancyResult" width="100" />
+      <el-table-column label="预产日期" align="center" prop="expectedDate" width="120" />
+      <el-table-column label="实产日期" align="center" prop="actualLambingDate" width="120" />
 
-      <!-- 孕检相关字段 -->
-      <el-table-column label="孕检状态" align="center" width="100">
-        <template #default="scope">
-          <el-tag :type="scope.row.isPregnancyChecked === 1 ? 'success' : 'warning'">
-            {{ scope.row.isPregnancyChecked === 1 ? '已孕检' : '未孕检' }}
-          </el-tag>
-        </template>
-      </el-table-column>
-      <el-table-column label="孕检日期" align="center" prop="pregnancyCheckDate" width="120">
-        <template #default="scope">
-          <span>{{ scope.row.pregnancyCheckDate ? parseTime(scope.row.pregnancyCheckDate, '{y}-{m}-{d}') : '-' }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="孕检结果" align="center" prop="pregnancyResult" width="100">
-        <template #default="scope">
-          <el-tag v-if="scope.row.pregnancyResult"
-                  :type="getPregnancyResultType(scope.row.pregnancyResult)">
-            {{ scope.row.pregnancyResult }}
-          </el-tag>
-          <span v-else>-</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="胎数" align="center" prop="fetusCount" width="80">
-        <template #default="scope">
-          <span>{{ scope.row.fetusCount || '-' }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="孕检方式" align="center" prop="pregnancyWay" width="100">
-        <template #default="scope">
-          <span>{{ scope.row.pregnancyWay || '-' }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="配种到孕检间隔(天)" align="center" prop="daysToPregnancyCheck" width="140">
-        <template #default="scope">
-          <span>{{ scope.row.daysToPregnancyCheck || '-' }}</span>
-        </template>
-      </el-table-column>
+      <el-table-column label="配种时产后天数" align="center" prop="daysPostLambing" width="100" />
+      <el-table-column label="配种时泌乳天数" align="center" prop="daysLactation" width="100" />
+      <el-table-column label="配种时配后天数" align="center" prop="daysPostMating" width="100" />
+      <el-table-column label="上次配种日期" align="center" prop="lastMatingDate" width="120" />
 
+      <el-table-column label="冻精号" align="center" prop="frozenSemenNo" width="100" />
+      <el-table-column label="是否性控" align="center" prop="eweControlled" width="80">
+        <template #default="scope">{{ scope.row.eweControlled === 1 ? '是' : '否' }}</template>
+      </el-table-column>
+      <el-table-column label="耗精量" align="center" prop="spermConsumption" width="80" />
       <el-table-column label="创建人" align="center" prop="createBy" width="100" />
+      <el-table-column label="创建日期" align="center" prop="createTime" width="160" />
       <el-table-column label="所在牧场" align="center" prop="ranchName" width="120" />
+      <el-table-column label="备注" align="center" prop="comment" width="120" />
+
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="160" fixed="right">
         <template #default="scope">
-          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['Breeding_records:Breeding_records:edit']">修改</el-button>
-          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['Breeding_records:Breeding_records:remove']">删除</el-button>
+          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)">修改</el-button>
+          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)">删除</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"
-        :page-sizes="[20,50,100,200, 500, 1000, 2000]"
-        @pagination="getList"
-    />
+    <pagination 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="800px" append-to-body>
       <el-form ref="Breeding_recordsRef" :model="form" :rules="rules" label-width="120px">
         <el-row>
@@ -251,135 +501,104 @@
               <el-input v-model="form.eweManageTags" placeholder="请输入母羊耳号" @blur="getEweInfoAndPlan" />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="12" v-if="form.breedType != 5">
             <el-form-item label="公羊耳号" prop="ramManageTags">
               <el-input v-model="form.ramManageTags" placeholder="请输入公羊耳号" @blur="getRamInfoByTags" />
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="配种日期" prop="createTime">
+              <el-date-picker
+                  v-model="form.createTime"
+                  type="date"
+                  value-format="YYYY-MM-DD"
+                  placeholder="请选择配种日期"
+                  style="width: 100%"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row>
           <el-col :span="12">
             <el-form-item label="配种方式" prop="breedType">
-              <el-select v-model="form.breedType" placeholder="请选择配种方式">
-                <el-option label="供体母羊配种" value="1"></el-option>
-                <el-option label="同期发情人工授精" value="2"></el-option>
-                <el-option label="本交" value="3"></el-option>
-                <el-option label="胚胎移植" value="4"></el-option>
-                <el-option label="自然法请人工授精" value="5"></el-option>
+              <el-select v-model="form.breedType" placeholder="请选择" @change="handleBreedTypeChange">
+                <el-option label="供体母羊配种":value="1"></el-option>
+                <el-option label="同期发情人工授精":value="2"></el-option>
+                <el-option label="本交":value="3"></el-option>
+                <el-option label="胚胎移植":value="5"></el-option> <el-option label="自然发情人工授精":value="4"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="技术员" prop="technician">
-              <el-input v-model="form.technician" placeholder="请输入技术员" />
+            <el-form-item label="冻精号" prop="frozenSemenNo">
+              <el-input v-model="form.frozenSemenNo" placeholder="请输入冻精号" />
             </el-form-item>
           </el-col>
         </el-row>
+
+        <template v-if="form.breedType == 5">
+          <el-divider content-position="left"><b style="color: #409EFF">胚胎移植手动录入</b></el-divider>
+
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="供体母号" prop="donorEweNo">
+                <el-input v-model="form.donorEweNo" placeholder="手动输入/自动同步" @blur="getDonorSheepInfo(form.donorEweNo, 'ewe')" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="供体母品种">
+                <el-input v-model="form.donorEweVariety" readonly placeholder="自动关联显示" style="background: #f5f7fa" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="供体公号" prop="donorRamNo">
+                <el-input v-model="form.donorRamNo" placeholder="手动输入供体公羊" @blur="getDonorSheepInfo(form.donorRamNo, 'ram')" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="供体公品种">
+                <el-input v-model="form.donorRamVariety" readonly placeholder="自动关联显示" style="background: #f5f7fa" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="胚胎类型" prop="embryoSubType">
+                <el-select v-model="form.embryoSubType" placeholder="必选类型" style="width: 100%">
+                  <el-option label="体内胚胎冻胚" value="体内胚胎冻胚" />
+                  <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="embryoCount">
+                <el-input-number v-model="form.embryoCount" :min="1" style="width: 100%" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </template>
+
         <el-row>
+          <el-col :span="12">
+            <el-form-item label="技术员" prop="technician">
+              <el-input v-model="form.technician" />
+            </el-form-item>
+          </el-col>
           <el-col :span="12">
             <el-form-item label="耗精量" prop="breedDrugs">
-              <el-input v-model="form.breedDrugs" placeholder="请输入耗精量" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="备注" prop="comment">
-              <el-input v-model="form.comment" type="textarea" placeholder="请输入备注" />
+              <el-input v-model="form.breedDrugs" />
             </el-form-item>
           </el-col>
         </el-row>
 
-        <!-- 显示母羊信息区域 -->
-        <el-row v-if="eweInfo">
-          <el-col :span="24">
-            <el-divider content-position="left">母羊信息</el-divider>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="品种">
-              <el-input v-model="eweInfo.variety" readonly />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="月龄">
-              <el-input v-model="eweInfo.month_age" readonly />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="胎次">
-              <el-input v-model="eweInfo.parity" readonly />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="繁育状态">
-              <el-input v-model="eweInfo.breed_status" readonly />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="当前羊舍">
-              <el-input v-model="eweInfo.sheepfold_name" readonly />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="是否性控">
-              <el-input :value="eweInfo.controlled === 1 ? '是' : '否'" readonly />
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        <!-- 显示配种计划信息区域 -->
-        <el-row v-if="breedPlan">
-          <el-col :span="24">
-            <el-divider content-position="left">配种计划信息</el-divider>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="计划公羊">
-              <el-input v-model="breedPlan.ram_manage_tags" readonly />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="计划配种方式">
-              <el-input v-model="breedPlan.breed_type_name" readonly />
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        <!-- 显示孕检信息区域(如果已有孕检记录) -->
-        <el-row v-if="form.pregnancyResult">
-          <el-col :span="24">
-            <el-divider content-position="left">孕检信息</el-divider>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="孕检日期">
-              <el-input :value="form.pregnancyCheckDate ? parseTime(form.pregnancyCheckDate, '{y}-{m}-{d}') : ''" readonly />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="孕检结果">
-              <el-input v-model="form.pregnancyResult" readonly />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="胎数">
-              <el-input v-model="form.fetusCount" readonly />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="孕检方式">
-              <el-input v-model="form.pregnancyWay" readonly />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="孕检技术员">
-              <el-input v-model="form.pregnancyTechnician" readonly />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="配种到孕检间隔">
-              <el-input :value="form.daysToPregnancyCheck + '天'" readonly />
-            </el-form-item>
-          </el-col>
-        </el-row>
       </el-form>
       <template #footer>
         <div class="dialog-footer">
@@ -389,15 +608,7 @@
       </template>
     </el-dialog>
   </div>
-
-  <div class="dialog-footer">
-    <el-button type="primary" @click="submitForm">确 定</el-button>
-    <el-button @click="cancel">取 消</el-button>
-  </div>
-
 </template>
-
-
 <script setup name="Breeding_records">
 import {
   listBreeding_records,
@@ -479,7 +690,11 @@ const data = reactive({
     ],
     breedType: [
       {required: true, message: "配种方式不能为空", trigger: "change"}
-    ]
+    ],
+    createTime: [{ required: true, message: "配种日期不能为空", trigger: "change" }],
+    donorEweNo: [{ required: true, message: "供体母号不能为空", trigger: "blur" }],
+    donorRamNo: [{ required: true, message: "供体公号不能为空", trigger: "blur" }],
+    embryoSubType: [{ required: true, message: "请选择配种子类型", trigger: "change" }]
   },
   submitting: false
 })
@@ -494,11 +709,87 @@ function getBreedTypeText(breedType) {
   if (breedType === 1) return '供体母羊配种'
   if (breedType === 2) return '同期发情人工授精'
   if (breedType === 3) return '本交'
-  if (breedType === 4) return '胚胎移植'
-  if (breedType === 5) return '自然发情人工授精'
+  if (breedType === 4) return '自然发情人工授精'
+  if (breedType === 5) return '胚胎移植'
   return '-'
 }
 
+/** * Handle Breed Type Change
+ * If Embryo Transfer (5), try to fetch flush record info if Ewe Tag exists
+ */
+/** 切换配种方式触发 */
+function handleBreedTypeChange(val) {
+  // 同步母羊耳号
+  if (form.value.eweManageTags) {
+    form.value.donorEweNo = form.value.eweManageTags;
+    getDonorSheepInfo(form.value.donorEweNo, 'ewe');
+  }
+  // 如果公羊号已有值，也查一下品种
+  if (form.value.donorRamNo) {
+    getDonorSheepInfo(form.value.donorRamNo, 'ram');
+  } else {
+    // 切换回其他类型时，清空移植专有字段
+    form.value.donorEweNo = null;
+    form.value.donorRamNo = null;
+    form.value.donorEweVariety = null; // 仅用于页面展示
+    form.value.donorRamVariety = null; // 仅用于页面展示
+  }
+}
+
+/** 2. 抽取统一的供体信息查询方法 */
+function getDonorSheepInfo(tag, type) {
+  if (!tag) return;
+
+  getSheepInfoByTags(tag).then(response => {
+    if (response.data) {
+      if (type === 'ewe') {
+        // 这里的 donorEweVariety 只绑定在 form 或本地变量用于展示，不存入 insert 接口
+        form.value.donorEweVariety = response.data.variety;
+      } else if (type === 'ram') {
+        form.value.donorRamVariety = response.data.variety;
+      }
+    } else {
+      // 如果查不到，清空品种显示
+      if (type === 'ewe') form.value.donorEweVariety = '未知品种';
+      else form.value.donorRamVariety = '未知品种';
+    }
+  }).catch(() => {
+    console.error("查询供体品种失败");
+  });
+}
+
+/** 供体公羊耳号失去焦点时，关联品种 */
+function getDonorRamInfo() {
+  if (form.value.donorRamNo) {
+    getSheepInfoByTags(form.value.donorRamNo).then(response => {
+      if (response.data) {
+        // 需求2：关联供体公羊品种
+        form.value.donorRamVariety = response.data.variety;
+      }
+    });
+  }
+}
+/** Overriding/Updating getEweInfoAndPlan to handle the Match data */
+function getEweInfoAndPlan() {
+  if (form.value.eweManageTags) {
+    // 仅获取受体母羊的基础信息
+    getSheepInfoByTags(form.value.eweManageTags).then(response => {
+      if (response.data) {
+        eweInfo.value = response.data;
+        form.value.eweId = response.data.id;
+      }
+    });
+
+    // 仅尝试匹配普通配种计划（如果是本交/人工授精等），胚胎移植不再自动匹配
+    getLatestBreedPlanByEweTags(form.value.eweManageTags).then(response => {
+      if (response.data && form.value.breedType != 5) {
+        const plan = response.data;
+        form.value.breedType = plan.breed_type || plan.breedType;
+        form.value.ramManageTags = plan.ram_manage_tags;
+      }
+    });
+  }
+}
 /** 获取孕检结果标签类型 */
 function getPregnancyResultType(result) {
   if (result === '怀孕') return 'success'
@@ -581,6 +872,7 @@ function handleSelectionChange(selection) {
 /** 新增按钮操作 */
 function handleAdd() {
   reset()
+  form.value.createTime = proxy.parseTime(new Date(), '{y}-{m}-{d}')
   open.value = true
   title.value = "添加配种记录"
 }
@@ -601,46 +893,46 @@ function handleUpdate(row) {
   })
 }
 
-/** 根据母羊耳号获取羊只信息和配种计划信息 */
-function getEweInfoAndPlan() {
-  if (form.value.eweManageTags) {
-    // 获取母羊信息
-    getSheepInfoByTags(form.value.eweManageTags).then(response => {
-      if (response.data) {
-        eweInfo.value = response.data
-        form.value.eweId = response.data.id
-      } else {
-        proxy.$modal.msgError("未找到该母羊耳号对应的羊只信息")
-        eweInfo.value = null
-      }
-    }).catch(() => {
-      proxy.$modal.msgError("查询母羊信息失败")
-      eweInfo.value = null
-    })
-
-    // 获取配种计划信息(使用最新的获取方法)
-    getLatestBreedPlanByEweTags(form.value.eweManageTags).then(response => {
-      if (response.data) {
-        breedPlan.value = response.data
-        // 自动填充公羊耳号和配种方式(但允许用户修改)
-        if (!form.value.ramManageTags) {
-          form.value.ramManageTags = response.data.ram_manage_tags
-        }
-        if (!form.value.breedType) {
-          form.value.breedType = response.data.breed_type
-        }
-
-        proxy.$modal.msgSuccess("已自动匹配配种计划信息,可手动调整")
-      } else {
-        breedPlan.value = null
-        proxy.$modal.msgWarning("未找到该母羊的配种计划,请手动输入配种信息")
-      }
-    }).catch(() => {
-      proxy.$modal.msgWarning("查询配种计划失败,请手动输入配种信息")
-      breedPlan.value = null
-    })
-  }
-}
+// /** 根据母羊耳号获取羊只信息和配种计划信息 */
+// function getEweInfoAndPlan() {
+//   if (form.value.eweManageTags) {
+//     // 获取母羊信息
+//     getSheepInfoByTags(form.value.eweManageTags).then(response => {
+//       if (response.data) {
+//         eweInfo.value = response.data
+//         form.value.eweId = response.data.id
+//       } else {
+//         proxy.$modal.msgError("未找到该母羊耳号对应的羊只信息")
+//         eweInfo.value = null
+//       }
+//     }).catch(() => {
+//       proxy.$modal.msgError("查询母羊信息失败")
+//       eweInfo.value = null
+//     })
+//
+//     // 获取配种计划信息(使用最新的获取方法)
+//     getLatestBreedPlanByEweTags(form.value.eweManageTags).then(response => {
+//       if (response.data) {
+//         breedPlan.value = response.data
+//         // 自动填充公羊耳号和配种方式(但允许用户修改)
+//         if (!form.value.ramManageTags) {
+//           form.value.ramManageTags = response.data.ram_manage_tags
+//         }
+//         if (!form.value.breedType) {
+//           form.value.breedType = response.data.breed_type
+//         }
+//
+//         proxy.$modal.msgSuccess("已自动匹配配种计划信息,可手动调整")
+//       } else {
+//         breedPlan.value = null
+//         proxy.$modal.msgWarning("未找到该母羊的配种计划,请手动输入配种信息")
+//       }
+//     }).catch(() => {
+//       proxy.$modal.msgWarning("查询配种计划失败,请手动输入配种信息")
+//       breedPlan.value = null
+//     })
+//   }
+// }
 
 /** 根据公羊耳号获取羊只信息 */
 function getRamInfoByTags() {
diff --git a/src/views/embryo/flush/index.vue b/src/views/embryo/flush/index.vue
index b9c979e..c6d1569 100644
--- a/src/views/embryo/flush/index.vue
+++ b/src/views/embryo/flush/index.vue
@@ -207,29 +207,31 @@
         <!-- 胚胎等级 -->
         <el-divider content-position="left">胚胎等级</el-divider>
         <el-row :gutter="20">
-          <el-col :span="4">
-            <el-form-item label="A+">
-              <el-input-number v-model="form.gradeAPlus" :min="0" controls-position="right" @change="calculateTotal" style="width: 100%" />
+          <el-col :span="6">
+            <el-form-item label="A+级" prop="gradeAPlus" label-width="60px">
+              <el-input-number v-model="form.gradeAPlus" :min="0" @change="calculateTotal" style="width: 100%" />
             </el-form-item>
           </el-col>
-          <el-col :span="4">
-            <el-form-item label="A">
-              <el-input-number v-model="form.gradeA" :min="0" controls-position="right" @change="calculateTotal" style="width: 100%" />
+          <el-col :span="6">
+            <el-form-item label="A级" prop="gradeA" label-width="60px">
+              <el-input-number v-model="form.gradeA" :min="0" @change="calculateTotal" style="width: 100%" />
             </el-form-item>
           </el-col>
-          <el-col :span="4">
-            <el-form-item label="B">
-              <el-input-number v-model="form.gradeB" :min="0" controls-position="right" @change="calculateTotal" style="width: 100%" />
+          <el-col :span="6">
+            <el-form-item label="B级" prop="gradeB" label-width="60px">
+              <el-input-number v-model="form.gradeB" :min="0" @change="calculateTotal" style="width: 100%" />
             </el-form-item>
           </el-col>
-          <el-col :span="4">
-            <el-form-item label="C">
-              <el-input-number v-model="form.gradeC" :min="0" controls-position="right" @change="calculateTotal" style="width: 100%" />
+          <el-col :span="6">
+            <el-form-item label="C级" prop="gradeC" label-width="60px">
+              <el-input-number v-model="form.gradeC" :min="0" @change="calculateTotal" style="width: 100%" />
             </el-form-item>
           </el-col>
-          <el-col :span="4">
-            <el-form-item label="D">
-              <el-input-number v-model="form.gradeD" :min="0" controls-position="right" @change="calculateTotal" style="width: 100%" />
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="D级" prop="gradeD" label-width="60px">
+              <el-input-number v-model="form.gradeD" :min="0" @change="calculateTotal" style="width: 100%" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -237,29 +239,31 @@
         <!-- 发育阶段 -->
         <el-divider content-position="left">发育阶段</el-divider>
         <el-row :gutter="20">
-          <el-col :span="4">
-            <el-form-item label="2/4细胞">
-              <el-input-number v-model="form.cell24" :min="0" controls-position="right" @change="calculateTotal" style="width: 100%" />
+          <el-col :span="6">
+            <el-form-item label="2/4细胞" prop="cell24" label-width="60px">
+              <el-input-number v-model="form.cell24" :min="0" @change="calculateTotal" style="width: 100%" />
             </el-form-item>
           </el-col>
-          <el-col :span="4">
-            <el-form-item label="8细胞">
-              <el-input-number v-model="form.cell8" :min="0" controls-position="right" @change="calculateTotal" style="width: 100%" />
+          <el-col :span="6">
+            <el-form-item label="8细胞" prop="cell8" label-width="60px">
+              <el-input-number v-model="form.cell8" :min="0" @change="calculateTotal" style="width: 100%" />
             </el-form-item>
           </el-col>
-          <el-col :span="4">
-            <el-form-item label="16细胞">
-              <el-input-number v-model="form.cell16" :min="0" controls-position="right" @change="calculateTotal" style="width: 100%" />
+          <el-col :span="6">
+            <el-form-item label="16细胞" prop="cell16" label-width="60px">
+              <el-input-number v-model="form.cell16" :min="0" @change="calculateTotal" style="width: 100%" />
             </el-form-item>
           </el-col>
-          <el-col :span="4">
-            <el-form-item label="未受精">
-              <el-input-number v-model="form.unfertilized" :min="0" controls-position="right" @change="calculateTotal" style="width: 100%" />
+          <el-col :span="6">
+            <el-form-item label="未受精" prop="unfertilized" label-width="60px">
+              <el-input-number v-model="form.unfertilized" :min="0" @change="calculateTotal" style="width: 100%" />
             </el-form-item>
           </el-col>
-          <el-col :span="4">
-            <el-form-item label="退化">
-              <el-input-number v-model="form.degenerated" :min="0" controls-position="right" @change="calculateTotal" style="width: 100%" />
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="退化" prop="degenerated" label-width="60px">
+              <el-input-number v-model="form.degenerated" :min="0" @change="calculateTotal" style="width: 100%" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -310,7 +314,11 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="去向" prop="destination">
-              <el-input v-model="form.destination" placeholder="默认遗弃可自行修改" />
+              <el-select v-model="form.destination" placeholder="请选择去向" style="width: 100%">
+                <el-option label="冷冻保存" value="冷冻保存" />
+                <el-option label="移植" value="移植" />
+                <el-option label="遗弃" value="遗弃" />
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -511,15 +519,22 @@ function handleFlushTimeChange(val) {
 /** 供体母羊选择变化 */
 function handleDonorFemaleChange(val) {
   if (!val) {
-    form.value.donorFemaleVariety = null
-    form.value.donorMaleNo = null
-    form.value.donorMaleVariety = null
-    form.value.embryoVariety = null
-    form.value.ranchId = null
-    form.value.ranchName = null
-    form.value.embryoAge = null
-    matingDateCache.value = null
-    return
+    if (!val) { /* 清空逻辑... */ return; }
+
+    getDonorInfo(val).then(response => {
+      console.log("后端返回的数据:", response.data); // 检查这里是否有 embryoVariety 字段
+      const info = response.data || {};
+      // 确保这些字段名与后端 result.put(...) 的 Key 一致
+      form.value.donorFemaleVariety = info.donorFemaleVariety || null;
+      form.value.donorMaleNo = info.donorMaleNo || null;       // 匹配成功后会自动填入
+      form.value.donorMaleVariety = info.donorMaleVariety || null;
+      form.value.embryoVariety = info.embryoVariety || null;  // 自动计算后的品种
+      form.value.ranchId = info.ranchId || null;
+      form.value.ranchName = info.ranchName || null;
+
+      matingDateCache.value = info.matingDate || null;
+      calculateEmbryoAge(); // 计算胎龄
+    });
   }
 
   // 调用接口获取关联信息
diff --git a/src/views/mating_plan/mating_plan/generate/index.vue b/src/views/mating_plan/mating_plan/generate/index.vue
index c517c2d..403fc84 100644
--- a/src/views/mating_plan/mating_plan/generate/index.vue
+++ b/src/views/mating_plan/mating_plan/generate/index.vue
@@ -1,1090 +1,3 @@
-<!--<template>-->
-<!--  <div class="app-container">-->
-<!--    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">-->
-<!--      <el-form-item label="计划名称" prop="planName">-->
-<!--        <el-input-->
-<!--            v-model="queryParams.planName"-->
-<!--            placeholder="请输入计划名称"-->
-<!--            clearable-->
-<!--            @keyup.enter="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="计划类型" prop="planType">-->
-<!--        <el-select v-model="queryParams.planType" placeholder="请选择计划类型" clearable>-->
-<!--          <el-option label="同期发情配种计划" value="1"></el-option>-->
-<!--          <el-option label="本交配种计划" value="2"></el-option>-->
-<!--        </el-select>-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="计划日期" prop="planDate">-->
-<!--        <el-date-picker-->
-<!--            v-model="dateRange"-->
-<!--            style="width: 240px"-->
-<!--            value-format="YYYY-MM-DD"-->
-<!--            type="daterange"-->
-<!--            range-separator="-"-->
-<!--            start-placeholder="开始日期"-->
-<!--            end-placeholder="结束日期"-->
-<!--            @change="handleDateRangeChange"-->
-<!--        ></el-date-picker>-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="状态" prop="status">-->
-<!--        <el-select v-model="queryParams.status" placeholder="请选择状态" clearable>-->
-<!--          <el-option label="待审批" value="0"></el-option>-->
-<!--          <el-option label="已审批" value="1"></el-option>-->
-<!--          <el-option label="已拒绝" value="2"></el-option>-->
-<!--        </el-select>-->
-<!--      </el-form-item>-->
-<!--      <el-form-item>-->
-<!--        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>-->
-<!--        <el-button icon="Refresh" @click="resetQuery">重置</el-button>-->
-<!--      </el-form-item>-->
-<!--    </el-form>-->
-
-<!--    <el-row :gutter="10" class="mb8">-->
-<!--      <el-col :span="1.5">-->
-<!--        <el-button-->
-<!--            type="primary"-->
-<!--            plain-->
-<!--            icon="Plus"-->
-<!--            @click="handleGenerate"-->
-<!--            v-hasPermi="['mating_plan:generate:add']"-->
-<!--        >生成配种计划</el-button>-->
-<!--      </el-col>-->
-<!--      <el-col :span="1.5">-->
-<!--        <el-button-->
-<!--            type="danger"-->
-<!--            plain-->
-<!--            icon="Delete"-->
-<!--            :disabled="multiple"-->
-<!--            @click="handleDelete"-->
-<!--            v-hasPermi="['mating_plan:generate:remove']"-->
-<!--        >删除</el-button>-->
-<!--      </el-col>-->
-<!--      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>-->
-<!--    </el-row>-->
-
-<!--    <el-table v-loading="loading" :data="breedPlanGenerateList" @selection-change="handleSelectionChange">-->
-<!--      <el-table-column type="selection" width="55" align="center" />-->
-<!--      <el-table-column label="计划名称" align="center" prop="planName" />-->
-<!--      <el-table-column label="计划类型" align="center" prop="planType">-->
-<!--        <template #default="scope">-->
-<!--          <el-tag v-if="scope.row.planType === 1" type="primary">同期发情配种计划</el-tag>-->
-<!--          <el-tag v-else-if="scope.row.planType === 2" type="success">本交配种计划</el-tag>-->
-<!--          <el-tag v-else type="info">未知类型</el-tag>-->
-<!--        </template>-->
-<!--      </el-table-column>-->
-<!--      <el-table-column label="计划日期" align="center" prop="planDate" width="180">-->
-<!--        <template #default="scope">-->
-<!--          <span>{{ scope.row.planDate }}</span>-->
-<!--        </template>-->
-<!--      </el-table-column>-->
-<!--      <el-table-column label="母羊数量" align="center" prop="totalEweCount" />-->
-<!--      <el-table-column label="公羊数量" align="center" prop="totalRamCount" />-->
-<!--      <el-table-column label="配种比例" align="center" prop="breedRatio" />-->
-<!--      <el-table-column label="状态" align="center" prop="status">-->
-<!--        <template #default="scope">-->
-<!--          <el-tag v-if="scope.row.status === 0" type="warning">待审批</el-tag>-->
-<!--          <el-tag v-else-if="scope.row.status === 1" type="success">已审批</el-tag>-->
-<!--          <el-tag v-else-if="scope.row.status === 2" type="danger">已拒绝</el-tag>-->
-<!--          <el-tag v-else type="info">未知状态</el-tag>-->
-<!--        </template>-->
-<!--      </el-table-column>-->
-<!--      <el-table-column label="审批人" align="center" prop="approver" />-->
-<!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
-<!--        <template #default="scope">-->
-<!--          <el-button-->
-<!--              link-->
-<!--              type="primary"-->
-<!--              icon="View"-->
-<!--              @click="handleView(scope.row)"-->
-<!--              v-hasPermi="['mating_plan:generate:view']"-->
-<!--          >查看</el-button>-->
-<!--          <el-button-->
-<!--              link-->
-<!--              type="success"-->
-<!--              icon="Check"-->
-<!--              @click="handleApprove(scope.row)"-->
-<!--              v-hasPermi="['mating_plan:generate:approve']"-->
-<!--              v-if="scope.row.status == 0"-->
-<!--          >审批</el-button>-->
-
-<!--          <el-button-->
-<!--              link-->
-<!--              type="primary"-->
-<!--              icon="Delete"-->
-<!--              @click="handleDelete(scope.row)"-->
-<!--              v-hasPermi="['mating_plan:generate: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"-->
-<!--    />-->
-
-<!--    &lt;!&ndash; 生成配种计划对话框 &ndash;&gt;-->
-<!--    <el-dialog title="生成配种计划" v-model="generateOpen" width="1200px" append-to-body>-->
-<!--      <el-form ref="generateFormRef" :model="generateForm" :rules="generateRules" label-width="120px">-->
-<!--        <el-row>-->
-<!--          <el-col :span="24">-->
-<!--            <el-form-item label="计划类型" prop="planType">-->
-<!--              <el-radio-group v-model="generateForm.planType">-->
-<!--                <el-radio :label="1">同期发情配种计划</el-radio>-->
-<!--                <el-radio :label="2">本交配种计划</el-radio>-->
-<!--              </el-radio-group>-->
-<!--              <div style="margin-top: 10px; color: #666; font-size: 12px;">-->
-<!--                计划名称将自动生成为：{{ getCurrentDate() }}{{ getPlanTypeName(generateForm.planType) }}-->
-<!--              </div>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
-<!--        </el-row>-->
-<!--      </el-form>-->
-
-<!--      <el-tabs v-model="activeTab" @tab-click="handleTabClick">-->
-<!--        <el-tab-pane label="符合条件的母羊" name="ewe">-->
-<!--          <div style="display: flex; align-items: center; gap: 10px; flex-wrap: wrap;">-->
-<!--            &lt;!&ndash; 主选择器：不显示已选标签 &ndash;&gt;-->
-<!--            <el-select-->
-<!--                v-model="queryParams.allEarNumbers"-->
-<!--                multiple-->
-<!--                filterable-->
-<!--                remote-->
-<!--                reserve-keyword-->
-<!--                placeholder="输入耳号搜索"-->
-<!--                :remote-method="searchEarNumber"-->
-<!--                :loading="earNumberLoading"-->
-<!--                allow-create-->
-<!--                default-first-option-->
-<!--                collapse-tags-->
-<!--                :max-collapse-tags="0"-->
-<!--                style="width: 300px"-->
-<!--                @change="handleEarNumberChange"-->
-<!--            >-->
-<!--              <el-option-->
-<!--                  v-for="item in earNumberOptions"-->
-<!--                  :key="item"-->
-<!--                  :label="item"-->
-<!--                  :value="item"-->
-<!--              />-->
-<!--            </el-select>-->
-
-<!--            &lt;!&ndash; 辅助粘贴输入框 &ndash;&gt;-->
-<!--            <el-input-->
-<!--                v-model="pasteInput"-->
-<!--                placeholder="或粘贴多个耳号(空格/换行/逗号分隔)"-->
-<!--                style="width: 300px"-->
-<!--                @paste="handlePaste"-->
-<!--                @keyup.enter="handlePasteSubmit"-->
-<!--                clearable-->
-<!--            >-->
-<!--              <template #append>-->
-<!--                <el-button @click="handlePasteSubmit" :icon="Plus">添加</el-button>-->
-<!--              </template>-->
-<!--            </el-input>-->
-
-<!--            &lt;!&ndash; 耳号计数显示 &ndash;&gt;-->
-<!--            <el-tag-->
-<!--                v-if="queryParams.allEarNumbers && queryParams.allEarNumbers.length > 0"-->
-<!--                type="info"-->
-<!--                effect="plain"-->
-<!--                size="large"-->
-<!--            >-->
-<!--              已选: {{ queryParams.allEarNumbers.length }} 个-->
-<!--            </el-tag>-->
-
-<!--            &lt;!&ndash; 清空按钮 &ndash;&gt;-->
-<!--            <el-button-->
-<!--                type="danger"-->
-<!--                plain-->
-<!--                @click="clearAllEarNumbers"-->
-<!--                v-if="queryParams.allEarNumbers && queryParams.allEarNumbers.length > 0"-->
-<!--                :icon="Delete"-->
-<!--            >-->
-<!--              清空全部-->
-<!--            </el-button>-->
-<!--          </div>-->
-
-<!--          &lt;!&ndash; 已选耳号展示区域（默认显示2个，可展开） &ndash;&gt;-->
-<!--          <div-->
-<!--              v-if="queryParams.allEarNumbers && queryParams.allEarNumbers.length > 0"-->
-<!--              class="selected-ear-numbers-display"-->
-<!--              style="margin-top: 10px;"-->
-<!--          >-->
-<!--            &lt;!&ndash; 显示前2个或全部耳号 &ndash;&gt;-->
-<!--            <el-tag-->
-<!--                v-for="(tag, index) in displayedEarNumbers"-->
-<!--                :key="tag"-->
-<!--                closable-->
-<!--                @close="handleRemoveEarNumber(tag)"-->
-<!--                style="margin: 4px;"-->
-<!--                type="success"-->
-<!--            >-->
-<!--              {{ tag }}-->
-<!--            </el-tag>-->
-
-<!--            &lt;!&ndash; 展开/收起按钮 &ndash;&gt;-->
-<!--            <el-button-->
-<!--                v-if="queryParams.allEarNumbers.length > defaultShowCount"-->
-<!--                type="primary"-->
-<!--                link-->
-<!--                @click="toggleExpand"-->
-<!--                style="margin-left: 8px;"-->
-<!--            >-->
-<!--              {{ isExpanded ? '收起' : `展开剩余 ${queryParams.allEarNumbers.length - defaultShowCount} 个` }}-->
-<!--              <el-icon class="el-icon&#45;&#45;right">-->
-<!--                <component :is="isExpanded ? ArrowUp : ArrowDown" />-->
-<!--              </el-icon>-->
-<!--            </el-button>-->
-<!--          </div>-->
-<!--          <el-table-->
-<!--              v-loading="eweLoading"-->
-<!--              :data="eligibleEweList"-->
-<!--              @selection-change="handleEweSelectionChange"-->
-<!--              max-height="400"-->
-<!--          >-->
-<!--            <el-table-column type="selection" width="55" align="center" />-->
-<!--            <el-table-column label="管理耳号" align="center" prop="bs_manage_tags" />-->
-<!--            <el-table-column label="品种" align="center" prop="variety" />-->
-<!--            <el-table-column label="家系" align="center" prop="family" />-->
-<!--            <el-table-column label="羊只类型" align="center" prop="sheep_type" />-->
-<!--            <el-table-column label="月龄" align="center" prop="month_age" />-->
-<!--            <el-table-column label="当前体重(kg)" align="center" prop="current_weight" />-->
-<!--            <el-table-column label="产后天数" align="center" prop="post_lambing_day" />-->
-<!--            <el-table-column label="繁殖状态" align="center" prop="breed" />-->
-<!--          </el-table>-->
-<!--        </el-tab-pane>-->
-
-<!--        <el-tab-pane label="符合条件的公羊" name="ram">-->
-<!--          <el-row :gutter="10" class="mb8">-->
-<!--            <el-col :span="6">-->
-<!--              <el-input-->
-<!--                  v-model="eweSearchTag"-->
-<!--                  placeholder="输入公羊耳号搜索"-->
-<!--                  clearable-->
-<!--                  @keyup.enter="selectEligibleEwe"-->
-<!--              >-->
-<!--                <template #append>-->
-<!--                  <el-button icon="Search" @click="selectEligibleEwe" />-->
-<!--                </template>-->
-<!--              </el-input>-->
-<!--            </el-col>-->
-<!--            <el-col :span="1.5">-->
-<!--              <el-button type="primary" @click="selectEligibleEwe">执行筛选</el-button>-->
-<!--            </el-col>-->
-<!--            <el-col :span="1.5">-->
-<!--              <el-button type="info">已选择: {{ selectedEwe.length }} 只</el-button>-->
-<!--            </el-col>-->
-<!--          </el-row>-->
-<!--          <el-table-->
-<!--              v-loading="ramLoading"-->
-<!--              :data="eligibleRamList"-->
-<!--              @selection-change="handleRamSelectionChange"-->
-<!--              max-height="400"-->
-<!--          >-->
-<!--            <el-table-column type="selection" width="55" align="center" />-->
-<!--            <el-table-column label="管理耳号" align="center" prop="bs_manage_tags" />-->
-<!--            <el-table-column label="品种" align="center" prop="variety" />-->
-<!--            <el-table-column label="家系" align="center" prop="family" />-->
-<!--            <el-table-column label="羊只类型" align="center" prop="sheep_type" />-->
-<!--            <el-table-column label="月龄" align="center" prop="month_age" />-->
-<!--            <el-table-column label="当前体重(kg)" align="center" prop="current_weight" />-->
-<!--            <el-table-column label="繁殖状态" align="center" prop="breed" />-->
-<!--          </el-table>-->
-<!--        </el-tab-pane>-->
-<!--      </el-tabs>-->
-
-<!--      <template #footer>-->
-<!--        <div class="dialog-footer">-->
-<!--          <el-button type="primary" @click="generateBreedPlan" :disabled="selectedEwe.length === 0 || selectedRam.length === 0">-->
-<!--            生成配种计划-->
-<!--          </el-button>-->
-<!--          <el-button @click="generateOpen = false">取 消</el-button>-->
-<!--        </div>-->
-<!--      </template>-->
-<!--    </el-dialog>-->
-
-
-
-<!--    &lt;!&ndash; 审批配种计划对话框 &ndash;&gt;-->
-<!--    <el-dialog title="审批配种计划" v-model="approveOpen" width="1400px" append-to-body>-->
-<!--      <el-descriptions :column="3" border class="mb8">-->
-<!--        <el-descriptions-item label="计划名称">{{ approveData.planInfo.planName }}</el-descriptions-item>-->
-<!--        <el-descriptions-item label="计划类型">-->
-<!--          <el-tag v-if="approveData.planInfo.planType === 1" type="primary">同期发情配种计划</el-tag>-->
-<!--          <el-tag v-else-if="approveData.planInfo.planType === 2" type="success">本交配种计划</el-tag>-->
-<!--        </el-descriptions-item>-->
-<!--        <el-descriptions-item label="计划日期">{{ approveData.planInfo.planDate }}</el-descriptions-item>-->
-<!--        <el-descriptions-item label="母羊数量">{{ approveData.planInfo.totalEweCount }}</el-descriptions-item>-->
-<!--        <el-descriptions-item label="公羊数量">{{ approveData.planInfo.totalRamCount }}</el-descriptions-item>-->
-<!--        <el-descriptions-item label="配种比例">{{ approveData.planInfo.breedRatio }}</el-descriptions-item>-->
-<!--      </el-descriptions>-->
-
-<!--      <el-divider content-position="left">配种计划详情（可编辑）</el-divider>-->
-<!--      <el-table-->
-<!--          :data="approveData.planDetails"-->
-<!--          style="width: 100%"-->
-<!--          max-height="500"-->
-<!--          border-->
-<!--      >-->
-<!--        <el-table-column label="序号" type="index" width="60" align="center" />-->
-<!--        <el-table-column label="母羊耳号" align="center" prop="ewe_manage_tags" width="120" />-->
-<!--        <el-table-column label="母羊品种" align="center" prop="ewe_variety" width="100" />-->
-<!--        <el-table-column label="核心羊群" align="center" width="100">-->
-<!--          <template #default="scope">-->
-<!--            <el-tag v-if="scope.row.ewe_is_core" type="success">是</el-tag>-->
-<!--            <el-tag v-else type="info">否</el-tag>-->
-<!--          </template>-->
-<!--        </el-table-column>-->
-<!--        <el-table-column label="是否种用" align="center" width="100">-->
-<!--          <template #default="scope">-->
-<!--            <el-tag v-if="scope.row.ewe_is_breeding" type="success">是</el-tag>-->
-<!--            <el-tag v-else type="info">否</el-tag>-->
-<!--          </template>-->
-<!--        </el-table-column>-->
-<!--        <el-table-column label="详情" align="center" width="80">-->
-<!--          <template #default="scope">-->
-<!--            <el-button link type="primary" icon="View" @click="showEweDetail(scope.row)">查看</el-button>-->
-<!--          </template>-->
-<!--        </el-table-column>-->
-
-<!--        <el-table-column label="配种公羊" align="center" width="200">-->
-<!--          <template #default="scope">-->
-<!--            <el-select-->
-<!--                v-model="scope.row.ram_id"-->
-<!--                placeholder="选择公羊(可为空)"-->
-<!--                @change="handleRamChange(scope.$index, scope.row)"-->
-<!--                filterable-->
-<!--                clearable-->
-<!--            >-->
-<!--              <el-option label="不参与配种" :value="null" />-->
-<!--              <el-option-->
-<!--                  v-for="ram in availableRamList"-->
-<!--                  :key="ram.id"-->
-<!--                  :label="ram.bs_manage_tags"-->
-<!--                  :value="ram.id"-->
-<!--              />-->
-<!--            </el-select>-->
-<!--            &lt;!&ndash; 如果当前选中的公羊不在可选列表中，显示当前公羊耳号 &ndash;&gt;-->
-<!--            <div v-if="scope.row.ram_id && !availableRamList.find(r => r.id == scope.row.ram_id)"-->
-<!--                 style="font-size: 12px; color: #666; margin-top: 4px;">-->
-<!--              当前: {{ scope.row.ram_manage_tags || scope.row.ram_id }}-->
-<!--            </div>-->
-<!--          </template>-->
-<!--        </el-table-column>-->
-
-<!--        <el-table-column label="公羊品种" align="center" prop="ram_variety" width="100" />-->
-<!--        <el-table-column label="详情" align="center" width="80">-->
-<!--          <template #default="scope">-->
-<!--            <el-button-->
-<!--                link-->
-<!--                type="primary"-->
-<!--                icon="View"-->
-<!--                @click="showRamDetail(scope.row)"-->
-<!--                :disabled="!scope.row.ram_id"-->
-<!--            >查看</el-button>-->
-<!--          </template>-->
-<!--        </el-table-column>-->
-<!--      </el-table>-->
-
-<!--      <template #footer>-->
-<!--        <div class="dialog-footer">-->
-<!--          <el-button type="success" @click="confirmApprove">确认审批</el-button>-->
-<!--          <el-button type="danger" @click="rejectApprove">拒绝审批</el-button>-->
-<!--          <el-button @click="approveOpen = false">取 消</el-button>-->
-<!--        </div>-->
-<!--      </template>-->
-<!--    </el-dialog>-->
-
-<!--    &lt;!&ndash; 查看配种计划详情对话框 &ndash;&gt;-->
-<!--    <el-dialog title="配种计划详情" v-model="viewOpen" width="1200px" append-to-body>-->
-<!--      <el-descriptions :column="3" border>-->
-<!--        <el-descriptions-item label="计划名称">{{ planInfo.planName }}</el-descriptions-item>-->
-<!--        <el-descriptions-item label="计划类型">-->
-<!--          <el-tag v-if="planInfo.planType === 1" type="primary">同期发情配种计划</el-tag>-->
-<!--          <el-tag v-else-if="planInfo.planType === 2" type="success">本交配种计划</el-tag>-->
-<!--        </el-descriptions-item>-->
-<!--        <el-descriptions-item label="计划日期">{{ planInfo.planDate }}</el-descriptions-item>-->
-<!--        <el-descriptions-item label="状态">-->
-<!--          <el-tag v-if="planInfo.status === 0" type="warning">待审批</el-tag>-->
-<!--          <el-tag v-else-if="planInfo.status === 1" type="success">已审批</el-tag>-->
-<!--          <el-tag v-else-if="planInfo.status === 2" type="danger">已拒绝</el-tag>-->
-<!--          <el-tag v-else type="info">未知状态</el-tag>-->
-<!--        </el-descriptions-item>-->
-<!--        <el-descriptions-item label="母羊数量">{{ planInfo.totalEweCount }}</el-descriptions-item>-->
-<!--        <el-descriptions-item label="公羊数量">{{ planInfo.totalRamCount }}</el-descriptions-item>-->
-<!--        <el-descriptions-item label="配种比例">{{ planInfo.breedRatio }}</el-descriptions-item>-->
-<!--        <el-descriptions-item label="创建人">{{ planInfo.createBy }}</el-descriptions-item>-->
-<!--        <el-descriptions-item label="创建时间">{{ planInfo.createTime }}</el-descriptions-item>-->
-<!--        <el-descriptions-item label="审批人">{{ planInfo.approver }}</el-descriptions-item>-->
-<!--      </el-descriptions>-->
-
-<!--      &lt;!&ndash; 只有已审批状态才显示导出按钮 &ndash;&gt;-->
-<!--      <el-row :gutter="10" class="mb8" style="margin-top: 16px;" v-if="planInfo.status === 1">-->
-<!--        <el-col :span="1.5">-->
-<!--          <el-button type="success" icon="Download" @click="exportBreedPlanDetails">导出配种计划详情</el-button>-->
-<!--        </el-col>-->
-<!--      </el-row>-->
-
-<!--      <el-divider content-position="left">配种计划详情</el-divider>-->
-<!--      <el-table :data="planDetails" max-height="600" border stripe>-->
-<!--        <el-table-column label="序号" type="index" width="60" align="center" />-->
-<!--        <el-table-column label="母羊耳号" align="center" prop="ewe_manage_tags" width="120" />-->
-<!--        <el-table-column label="母羊品种" align="center" prop="ewe_variety" width="100" />-->
-<!--        <el-table-column label="核心羊群" align="center" width="100">-->
-<!--          <template #default="scope">-->
-<!--            <el-tag v-if="scope.row.ewe_is_core" type="success">是</el-tag>-->
-<!--            <el-tag v-else type="info">否</el-tag>-->
-<!--          </template>-->
-<!--        </el-table-column>-->
-<!--        <el-table-column label="是否种用" align="center" width="100">-->
-<!--          <template #default="scope">-->
-<!--            <el-tag v-if="scope.row.ewe_is_breeding" type="success">是</el-tag>-->
-<!--            <el-tag v-else type="info">否</el-tag>-->
-<!--          </template>-->
-<!--        </el-table-column>-->
-<!--        <el-table-column label="母羊详情" align="center" width="100">-->
-<!--          <template #default="scope">-->
-<!--            <el-button link type="primary" icon="View" @click="showEweDetail(scope.row)">查看</el-button>-->
-<!--          </template>-->
-<!--        </el-table-column>-->
-
-<!--        <el-table-column label="公羊耳号" align="center" prop="ram_manage_tags" width="120" />-->
-<!--        <el-table-column label="公羊品种" align="center" prop="ram_variety" width="100" />-->
-<!--        <el-table-column label="公羊详情" align="center" width="100">-->
-<!--          <template #default="scope">-->
-<!--            <el-button-->
-<!--                link-->
-<!--                type="primary"-->
-<!--                icon="View"-->
-<!--                @click="showRamDetail(scope.row)"-->
-<!--                :disabled="!scope.row.ram_id"-->
-<!--            >查看</el-button>-->
-<!--          </template>-->
-<!--        </el-table-column>-->
-
-<!--        <el-table-column label="配种类型" align="center" prop="breed_type" width="120">-->
-<!--          <template #default="scope">-->
-<!--            <el-tag v-if="scope.row.breed_type === 1" type="primary">同期发情</el-tag>-->
-<!--            <el-tag v-else-if="scope.row.breed_type === 2" type="success">本交</el-tag>-->
-<!--            <el-tag v-else type="warning">未知类型</el-tag>-->
-<!--          </template>-->
-<!--        </el-table-column>-->
-<!--      </el-table>-->
-<!--    </el-dialog>-->
-
-<!--    &lt;!&ndash; 羊只详情对话框 &ndash;&gt;-->
-<!--    <el-dialog :title="sheepDetailTitle" v-model="sheepDetailOpen" width="800px" append-to-body>-->
-<!--      <el-descriptions :column="2" border>-->
-<!--        <el-descriptions-item label="耳号">{{ sheepDetail.manage_tags }}</el-descriptions-item>-->
-<!--        <el-descriptions-item label="品种">{{ sheepDetail.variety }}</el-descriptions-item>-->
-<!--        <el-descriptions-item label="家系">{{ sheepDetail.family }}</el-descriptions-item>-->
-<!--        <el-descriptions-item label="羊只类别">{{ sheepDetail.sheep_type }}</el-descriptions-item>-->
-<!--        <el-descriptions-item label="繁育状态" v-if="sheepDetail.breed_status">{{ sheepDetail.breed_status }}</el-descriptions-item>-->
-<!--        <el-descriptions-item label="生日" v-if="sheepDetail.birthday">{{ sheepDetail.birthday }}</el-descriptions-item>-->
-<!--        <el-descriptions-item label="月龄">{{ sheepDetail.month_age }}</el-descriptions-item>-->
-<!--        <el-descriptions-item label="当前体重">{{ sheepDetail.current_weight }}kg</el-descriptions-item>-->
-<!--        <el-descriptions-item label="胎次" v-if="sheepDetail.parity">{{ sheepDetail.parity }}</el-descriptions-item>-->
-<!--        <el-descriptions-item label="是否核心羊群" v-if="sheepDetail.is_core !== undefined">-->
-<!--          <el-tag v-if="sheepDetail.is_core" type="success">是</el-tag>-->
-<!--          <el-tag v-else type="info">否</el-tag>-->
-<!--        </el-descriptions-item>-->
-<!--        <el-descriptions-item label="是否种用" v-if="sheepDetail.is_breeding !== undefined">-->
-<!--          <el-tag v-if="sheepDetail.is_breeding" type="success">是</el-tag>-->
-<!--          <el-tag v-else type="info">否</el-tag>-->
-<!--        </el-descriptions-item>-->
-<!--        <el-descriptions-item label="羊舍" v-if="sheepDetail.sheepfold_name">{{ sheepDetail.sheepfold_name }}</el-descriptions-item>-->
-<!--        <el-descriptions-item label="备注" v-if="sheepDetail.comment">{{ sheepDetail.comment }}</el-descriptions-item>-->
-<!--        <el-descriptions-item label="繁殖情况" v-if="sheepDetail.reproduction_info">{{ sheepDetail.reproduction_info }}</el-descriptions-item>-->
-<!--      </el-descriptions>-->
-<!--    </el-dialog>-->
-<!--  </div>-->
-<!--</template>-->
-
-<!--<script setup name="BreedPlanGenerate">-->
-<!--import {ref, reactive, toRefs, onMounted, getCurrentInstance} from 'vue'-->
-<!--import {-->
-<!--  listBreedPlanGenerate,-->
-<!--  getBreedPlanGenerate,-->
-<!--  delBreedPlanGenerate,-->
-<!--  selectEligibleEwe as apiSelectEligibleEwe,-->
-<!--  selectEligibleRam as apiSelectEligibleRam,-->
-<!--  autoGenerateBreedPlan,-->
-<!--  getApproveBreedPlan,-->
-<!--  confirmApproveBreedPlan,-->
-<!--  viewBreedPlan-->
-<!--} from "@/api/mating_plan/generate"-->
-
-<!--const {proxy} = getCurrentInstance()-->
-
-<!--const breedPlanGenerateList = ref([])-->
-<!--const eligibleEweList = ref([])-->
-<!--const eligibleRamList = ref([])-->
-<!--const availableRamList = ref([])-->
-<!--const selectedEwe = ref([])-->
-<!--const selectedRam = ref([])-->
-<!--const planInfo = ref({})-->
-<!--const planDetails = ref([])-->
-<!--const approveData = ref({-->
-<!--  planInfo: {},-->
-<!--  planDetails: []-->
-<!--})-->
-<!--const sheepDetail = ref({})-->
-<!--const sheepDetailTitle = ref('')-->
-<!--const generateOpen = ref(false)-->
-<!--const viewOpen = ref(false)-->
-<!--const approveOpen = ref(false)-->
-<!--const sheepDetailOpen = ref(false)-->
-<!--const loading = ref(true)-->
-<!--const eweLoading = ref(false)-->
-<!--const ramLoading = ref(false)-->
-<!--const showSearch = ref(true)-->
-<!--const ids = ref([])-->
-<!--const multiple = ref(true)-->
-<!--const total = ref(0)-->
-<!--const activeTab = ref('ewe')-->
-<!--const dateRange = ref([])-->
-
-<!--const pasteInput = ref('')           // 批量粘贴输入框-->
-<!--const eweSearchTag = ref('') // 母羊搜索输入-->
-<!--const ramSearchTag = ref('') // 公羊搜索输入-->
-<!--const earNumberOptions = ref([]) // 搜索建议-->
-<!--const earNumberLoading = ref(false)-->
-<!--const isExpanded = ref(false)        // 控制耳号展开/折叠状态-->
-<!--const defaultShowCount = 2           // 默认显示的耳号数量-->
-
-<!--// 计算属性：控制显示的耳号列表-->
-<!--const displayedEarNumbers = computed(() => {-->
-<!--  if (!queryParams.value.allEarNumbers || queryParams.value.allEarNumbers.length === 0) {-->
-<!--    return []-->
-<!--  }-->
-
-<!--  // 如果展开或总数<=2，显示全部；否则只显示前2个-->
-<!--  if (isExpanded.value || queryParams.value.allEarNumbers.length <= defaultShowCount) {-->
-<!--    return queryParams.value.allEarNumbers-->
-<!--  } else {-->
-<!--    return queryParams.value.allEarNumbers.slice(0, defaultShowCount)-->
-<!--  }-->
-<!--})-->
-
-<!--const data = reactive({-->
-<!--  queryParams: {-->
-<!--    pageNum: 1,-->
-<!--    pageSize: 10,-->
-<!--    planName: null,-->
-<!--    planType: null,-->
-<!--    allEarNumbers: [],-->
-<!--    status: null,-->
-<!--    params: {}-->
-<!--  },-->
-<!--  generateForm: {-->
-<!--    planType: 1-->
-<!--  },-->
-<!--  generateRules: {-->
-<!--    planType: [-->
-<!--      { required: true, message: '请选择计划类型', trigger: 'change' }-->
-<!--    ]-->
-<!--  }-->
-<!--})-->
-
-<!--const {queryParams, generateForm, generateRules} = toRefs(data)-->
-
-<!--/** 查询配种计划生成列表 */-->
-<!--function getList() {-->
-<!--  loading.value = true-->
-<!--  listBreedPlanGenerate(queryParams.value).then(response => {-->
-<!--    breedPlanGenerateList.value = response.rows || []-->
-<!--    total.value = response.total || 0-->
-<!--    loading.value = false-->
-<!--  }).catch(error => {-->
-<!--    console.error('获取列表失败:', error)-->
-<!--    loading.value = false-->
-<!--    breedPlanGenerateList.value = []-->
-<!--    total.value = 0-->
-<!--  })-->
-<!--}-->
-
-<!--/** 搜索按钮操作 */-->
-<!--function handleQuery() {-->
-<!--  queryParams.value.pageNum = 1-->
-<!--  getList()-->
-<!--}-->
-
-<!--/** 重置按钮操作 */-->
-<!--function resetQuery() {-->
-<!--  dateRange.value = []-->
-<!--  queryParams.value.params = {}-->
-<!--  proxy.resetForm("queryRef")-->
-<!--  handleQuery()-->
-<!--}-->
-
-<!--/** 日期范围变化处理 */-->
-<!--function handleDateRangeChange(dates) {-->
-<!--  if (dates && dates.length === 2) {-->
-<!--    queryParams.value.params.beginTime = dates[0]-->
-<!--    queryParams.value.params.endTime = dates[1]-->
-<!--  } else {-->
-<!--    queryParams.value.params = {}-->
-<!--  }-->
-<!--}-->
-
-<!--/** 获取当前日期 */-->
-<!--function getCurrentDate() {-->
-<!--  const today = new Date()-->
-<!--  const year = today.getFullYear()-->
-<!--  const month = String(today.getMonth() + 1).padStart(2, '0')-->
-<!--  const day = String(today.getDate()).padStart(2, '0')-->
-<!--  return `${year}-${month}-${day}`-->
-<!--}-->
-
-<!--/** 获取计划类型名称 */-->
-<!--function getPlanTypeName(planType) {-->
-<!--  return planType === 1 ? '同期发情配种计划' : '本交配种计划'-->
-<!--}-->
-
-<!--// 多选框选中数据-->
-<!--function handleSelectionChange(selection) {-->
-<!--  ids.value = selection.map(item => item.id)-->
-<!--  multiple.value = !selection.length-->
-<!--}-->
-
-<!--// 母羊选择变化-->
-<!--function handleEweSelectionChange(selection) {-->
-<!--  selectedEwe.value = selection.map(item => item.id)-->
-<!--}-->
-
-<!--// 公羊选择变化-->
-<!--function handleRamSelectionChange(selection) {-->
-<!--  selectedRam.value = selection.map(item => item.id)-->
-<!--}-->
-
-<!--// 标签页切换-->
-<!--function handleTabClick(tab) {-->
-<!--  activeTab.value = tab.name-->
-<!--}-->
-
-<!--/** 生成配种计划按钮操作 */-->
-<!--function handleGenerate() {-->
-<!--  generateOpen.value = true-->
-<!--  generateForm.value.planType = 1-->
-<!--  selectedEwe.value = []-->
-<!--  selectedRam.value = []-->
-<!--  eligibleEweList.value = []-->
-<!--  eligibleRamList.value = []-->
-<!--}-->
-
-<!--/** 筛选符合条件的母羊 */-->
-<!--function selectEligibleEwe() {-->
-<!--  eweLoading.value = true-->
-<!--  // 修改 api 调用，传入搜索参数-->
-<!--  apiSelectEligibleEwe(eweSearchTag.value).then(response => {-->
-<!--    eligibleEweList.value = response.data-->
-<!--    eweLoading.value = false-->
-<!--  })-->
-<!--}-->
-
-<!--/** 筛选符合条件的公羊 */-->
-<!--function selectEligibleRam() {-->
-<!--  ramLoading.value = true-->
-<!--  apiSelectEligibleRam(ramSearchTag.value).then(response => {-->
-<!--    eligibleRamList.value = response.data-->
-<!--    ramLoading.value = false-->
-<!--  })-->
-<!--}-->
-
-<!--/** 生成配种计划 */-->
-<!--function generateBreedPlan() {-->
-<!--  proxy.$refs.generateFormRef.validate((valid) => {-->
-<!--    if (!valid) return-->
-
-<!--    if (selectedEwe.value.length === 0) {-->
-<!--      proxy.$modal.msgError("请选择母羊")-->
-<!--      return-->
-<!--    }-->
-<!--    if (selectedRam.value.length === 0) {-->
-<!--      proxy.$modal.msgError("请选择公羊")-->
-<!--      return-->
-<!--    }-->
-
-<!--    const params = {-->
-<!--      planType: generateForm.value.planType,-->
-<!--      eweIds: selectedEwe.value,-->
-<!--      ramIds: selectedRam.value-->
-<!--    }-->
-
-<!--    autoGenerateBreedPlan(params).then(response => {-->
-<!--      proxy.$modal.msgSuccess("配种计划生成成功")-->
-<!--      generateOpen.value = false-->
-<!--      getList()-->
-<!--      // 重置表单和选择-->
-<!--      generateForm.value = { planType: 1 }-->
-<!--      selectedEwe.value = []-->
-<!--      selectedRam.value = []-->
-<!--      eligibleEweList.value = []-->
-<!--      eligibleRamList.value = []-->
-<!--    }).catch(error => {-->
-<!--      console.error('生成配种计划失败:', error)-->
-<!--      proxy.$modal.msgError("生成配种计划失败")-->
-<!--    })-->
-<!--  })-->
-<!--}-->
-
-
-
-<!--/** 查看配种计划详情 */-->
-<!--function handleView(row) {-->
-<!--  viewBreedPlan(row.id).then(response => {-->
-<!--    planInfo.value = response.data.planInfo-->
-<!--    planDetails.value = response.data.planDetails-->
-<!--    viewOpen.value = true-->
-<!--  })-->
-<!--}-->
-
-<!--/** 审批配种计划 */-->
-<!--function handleApprove(row) {-->
-<!--  getApproveBreedPlan(row.id).then(response => {-->
-<!--    approveData.value = response.data-->
-<!--    availableRamList.value = response.data.availableRams || []-->
-
-<!--    // 确保每行数据都有正确的公羊ID映射-->
-<!--    if (approveData.value.planDetails) {-->
-<!--      approveData.value.planDetails.forEach(detail => {-->
-<!--        // 如果ram_id是字符串，转换为数字用于下拉框匹配-->
-<!--        if (detail.ram_id && typeof detail.ram_id === 'string') {-->
-<!--          detail.ram_id = parseInt(detail.ram_id, 10)-->
-<!--        }-->
-
-<!--        // 如果当前公羊不在可选列表中，添加到列表中以显示当前选择-->
-<!--        if (detail.ram_id && detail.ram_manage_tags &&-->
-<!--            !availableRamList.value.find(ram => ram.id === detail.ram_id)) {-->
-<!--          availableRamList.value.push({-->
-<!--            id: detail.ram_id,-->
-<!--            bs_manage_tags: detail.ram_manage_tags-->
-<!--          })-->
-<!--        }-->
-<!--      })-->
-<!--    }-->
-
-<!--    approveOpen.value = true-->
-<!--  })-->
-<!--}-->
-
-<!--/** 公羊选择变化处理 */-->
-<!--function handleRamChange(index, row) {-->
-<!--  if (row.ram_id === null) {-->
-<!--    // 不参与配种-->
-<!--    row.ram_manage_tags = ''-->
-<!--    row.ram_variety = ''-->
-<!--    row.ram_family = ''-->
-<!--    row.ram_sheep_type = ''-->
-<!--    row.ram_birthday = ''-->
-<!--    row.ram_month_age = ''-->
-<!--    row.ram_current_weight = ''-->
-<!--    row.breed_type = null-->
-<!--  } else {-->
-<!--    // 确保ram_id是数字类型进行匹配-->
-<!--    const ramId = typeof row.ram_id === 'string' ? parseInt(row.ram_id, 10) : row.ram_id-->
-<!--    const selectedRam = availableRamList.value.find(ram => ram.id === ramId)-->
-
-<!--    if (selectedRam) {-->
-<!--      row.ram_manage_tags = selectedRam.bs_manage_tags-->
-<!--      row.ram_variety = selectedRam.variety-->
-<!--      row.ram_family = selectedRam.family-->
-<!--      row.ram_sheep_type = selectedRam.sheep_type-->
-<!--      row.ram_birthday = selectedRam.birthday-->
-<!--      row.ram_month_age = selectedRam.month_age-->
-<!--      row.ram_current_weight = selectedRam.current_weight-->
-<!--      // 设置默认配种类型-->
-<!--      if (!row.breed_type) {-->
-<!--        row.breed_type = 1 // 默认同期发情-->
-<!--      }-->
-<!--    }-->
-<!--  }-->
-<!--}-->
-
-<!--/** 显示母羊详情 */-->
-<!--function showEweDetail(row) {-->
-<!--  sheepDetail.value = {-->
-<!--    manage_tags: row.ewe_manage_tags,-->
-<!--    variety: row.ewe_variety,-->
-<!--    family: row.ewe_family,-->
-<!--    sheep_type: row.ewe_sheep_type,-->
-<!--    breed_status: row.ewe_breed_status,-->
-<!--    parity: row.ewe_parity,-->
-<!--    month_age: row.ewe_month_age,-->
-<!--    current_weight: row.ewe_current_weight,-->
-<!--    is_core: row.ewe_is_core,-->
-<!--    is_breeding: row.ewe_is_breeding,-->
-<!--    sheepfold_name: row.ewe_sheepfold_name,-->
-<!--    comment: row.ewe_comment,-->
-<!--    reproduction_info: row.ewe_reproduction_info-->
-<!--  }-->
-<!--  sheepDetailTitle.value = '母羊详情'-->
-<!--  sheepDetailOpen.value = true-->
-<!--}-->
-
-<!--/** 显示公羊详情 */-->
-<!--function showRamDetail(row) {-->
-<!--  if (!row.ram_id) {-->
-<!--    proxy.$modal.msgWarning("该母羊未分配公羊")-->
-<!--    return-->
-<!--  }-->
-
-<!--  sheepDetail.value = {-->
-<!--    manage_tags: row.ram_manage_tags,-->
-<!--    variety: row.ram_variety,-->
-<!--    family: row.ram_family,-->
-<!--    sheep_type: row.ram_sheep_type,-->
-<!--    birthday: row.ram_birthday,-->
-<!--    month_age: row.ram_month_age,-->
-<!--    current_weight: row.ram_current_weight-->
-<!--  }-->
-<!--  sheepDetailTitle.value = '公羊详情'-->
-<!--  sheepDetailOpen.value = true-->
-<!--}-->
-
-<!--/** 确认审批 */-->
-<!--function confirmApprove() {-->
-<!--  proxy.$modal.confirm('确认审批通过此配种计划？').then(function () {-->
-<!--    const params = {-->
-<!--      planId: approveData.value.planInfo.id,-->
-<!--      planDetails: approveData.value.planDetails,-->
-<!--      status: 1,-->
-<!--      approveRemark: '审批通过'-->
-<!--    }-->
-<!--    return confirmApproveBreedPlan(params)-->
-<!--  }).then(() => {-->
-<!--    proxy.$modal.msgSuccess("审批成功")-->
-<!--    approveOpen.value = false-->
-<!--    getList()-->
-<!--  }).catch(() => {})-->
-<!--}-->
-
-<!--/** 拒绝审批 */-->
-<!--function rejectApprove() {-->
-<!--  proxy.$modal.prompt('请输入拒绝原因', '拒绝审批', {-->
-<!--    confirmButtonText: '确定',-->
-<!--    cancelButtonText: '取消',-->
-<!--    inputPattern: /.+/,-->
-<!--    inputErrorMessage: '拒绝原因不能为空'-->
-<!--  }).then(({ value }) => {-->
-<!--    const params = {-->
-<!--      planId: approveData.value.planInfo.id,-->
-<!--      status: 2,-->
-<!--      approveRemark: value-->
-<!--    }-->
-<!--    return confirmApproveBreedPlan(params)-->
-<!--  }).then(() => {-->
-<!--    proxy.$modal.msgSuccess("已拒绝审批")-->
-<!--    approveOpen.value = false-->
-<!--    getList()-->
-<!--  }).catch(() => {})-->
-<!--}-->
-
-<!--/** 删除按钮操作 */-->
-<!--function handleDelete(row) {-->
-<!--  const _ids = row.id || ids.value-->
-<!--  proxy.$modal.confirm('是否确认删除配种计划编号为"' + _ids + '"的数据项？').then(function () {-->
-<!--    return delBreedPlanGenerate(_ids)-->
-<!--  }).then(() => {-->
-<!--    proxy.$modal.msgSuccess("删除成功")-->
-<!--    getList()-->
-<!--  }).catch(() => {})-->
-<!--}-->
-
-<!--/** 处理粘贴事件 */-->
-<!--function handlePaste(event) {-->
-<!--  nextTick(() => {-->
-<!--    handlePasteSubmit()-->
-<!--  })-->
-<!--}-->
-
-<!--/** 处理粘贴内容提交 */-->
-<!--function handlePasteSubmit() {-->
-<!--  if (!pasteInput.value || pasteInput.value.trim() === '') {-->
-<!--    return-->
-<!--  }-->
-
-<!--  // 支持多种分隔符: 空格、换行、逗号、制表符-->
-<!--  const separators = /[\s,，\n\r\t]+/-->
-<!--  const earNumbers = pasteInput.value-->
-<!--      .trim()-->
-<!--      .split(separators)-->
-<!--      .filter(item => item.trim() !== '')-->
-<!--      .map(item => item.trim())-->
-
-<!--  if (earNumbers.length === 0) {-->
-<!--    return-->
-<!--  }-->
-
-<!--  // 去重并添加到已选列表-->
-<!--  const existingSet = new Set(queryParams.value.allEarNumbers || [])-->
-<!--  const newEarNumbers = []-->
-<!--  const duplicates = []-->
-
-<!--  earNumbers.forEach(earNumber => {-->
-<!--    if (!existingSet.has(earNumber)) {-->
-<!--      newEarNumbers.push(earNumber)-->
-<!--      existingSet.add(earNumber)-->
-<!--    } else {-->
-<!--      duplicates.push(earNumber)-->
-<!--    }-->
-<!--  })-->
-
-<!--  // 添加新耳号-->
-<!--  if (newEarNumbers.length > 0) {-->
-<!--    queryParams.value.allEarNumbers = [-->
-<!--      ...(queryParams.value.allEarNumbers || []),-->
-<!--      ...newEarNumbers-->
-<!--    ]-->
-
-<!--    const message = `成功添加 ${newEarNumbers.length} 个耳号，当前共 ${queryParams.value.allEarNumbers.length} 个` +-->
-<!--        (duplicates.length > 0 ? `，已忽略 ${duplicates.length} 个重复耳号` : '')-->
-
-<!--    proxy.$modal.msgSuccess(message)-->
-<!--  } else if (duplicates.length > 0) {-->
-<!--    proxy.$modal.msgWarning(`所有耳号均已存在，当前共 ${queryParams.value.allEarNumbers.length} 个`)-->
-<!--  }-->
-
-<!--  // 清空输入框-->
-<!--  pasteInput.value = ''-->
-<!--}-->
-
-<!--/** 远程搜索耳号 */-->
-<!--function searchEarNumber(query) {-->
-<!--  if (query !== '') {-->
-<!--    earNumberLoading.value = true-->
-
-<!--    const queries = query.trim().split(/[\s,，]+/).filter(q => q)-->
-
-<!--    if (queries.length === 1) {-->
-<!--      // 单个耳号模糊搜索-->
-<!--      searchEarNumbers(query).then(response => {-->
-<!--        earNumberOptions.value = response.data || []-->
-<!--        earNumberLoading.value = false-->
-<!--      }).catch(() => {-->
-<!--        earNumberOptions.value = []-->
-<!--        earNumberLoading.value = false-->
-<!--      })-->
-<!--    } else {-->
-<!--      // 多个耳号直接作为选项-->
-<!--      earNumberOptions.value = queries-->
-<!--      earNumberLoading.value = false-->
-<!--    }-->
-<!--  } else {-->
-<!--    earNumberOptions.value = []-->
-<!--  }-->
-<!--}-->
-
-<!--/** 耳号选择变化处理 */-->
-<!--function handleEarNumberChange(value) {-->
-<!--  queryParams.value.allEarNumbers = [...new Set(value)]-->
-<!--  console.log(`已选择 ${queryParams.value.allEarNumbers.length} 个耳号:`, queryParams.value.allEarNumbers)-->
-<!--}-->
-
-<!--/** 切换展开/收起状态 */-->
-<!--function toggleExpand() {-->
-<!--  isExpanded.value = !isExpanded.value-->
-<!--}-->
-
-<!--/** 移除单个耳号 */-->
-<!--function handleRemoveEarNumber(tag) {-->
-<!--  const index = queryParams.value.allEarNumbers.indexOf(tag)-->
-<!--  if (index > -1) {-->
-<!--    queryParams.value.allEarNumbers.splice(index, 1)-->
-<!--    proxy.$modal.msgSuccess('已移除该耳号')-->
-<!--  }-->
-
-<!--  // 如果删除后剩余<=2个，自动收起-->
-<!--  if (queryParams.value.allEarNumbers.length <= defaultShowCount) {-->
-<!--    isExpanded.value = false-->
-<!--  }-->
-<!--}-->
-
-<!--/** 清空所有耳号 */-->
-<!--function clearAllEarNumbers() {-->
-<!--  proxy.$modal.confirm('确定要清空所有已选择的耳号吗？').then(() => {-->
-<!--    queryParams.value.allEarNumbers = []-->
-<!--    pasteInput.value = ''-->
-<!--    earNumberOptions.value = []-->
-<!--    isExpanded.value = false  // 重置展开状态-->
-<!--    proxy.$modal.msgSuccess('已清空所有耳号')-->
-<!--  }).catch(() => {})-->
-<!--}-->
-
-<!--/** 导出配种计划详情 */-->
-<!--function exportBreedPlanDetails() {-->
-<!--  if (!planInfo.value || !planDetails.value || planDetails.value.length === 0) {-->
-<!--    proxy.$modal.msgError("暂无数据可导出")-->
-<!--    return-->
-<!--  }-->
-
-<!--  // 检查是否已审批-->
-<!--  if (planInfo.value.status !== 1) {-->
-<!--    proxy.$modal.msgError("只有已审批的配种计划才能导出")-->
-<!--    return-->
-<!--  }-->
-
-<!--  // 使用proxy.download方法，会自动携带认证信息-->
-<!--  proxy.download(`/mating_plan/generate/export/${planInfo.value.id}`, {}, `${planInfo.value.planName}_配种计划详情_${new Date().getTime()}.xlsx`)-->
-<!--}-->
-
-<!--// 页面挂载时加载数据-->
-<!--onMounted(() => {-->
-<!--  getList()-->
-<!--})-->
-<!--</script>-->
-
-<!--<style scoped>-->
-<!--.mb8 {-->
-<!--  margin-bottom: 8px;-->
-<!--}-->
-
-<!--/* 已选耳号展示区样式 */-->
-<!--.selected-ear-numbers-display {-->
-<!--  max-height: 150px;-->
-<!--  overflow-y: auto;-->
-<!--  padding: 8px;-->
-<!--  background-color: #f5f7fa;-->
-<!--  border-radius: 4px;-->
-<!--  border: 1px dashed #dcdfe6;-->
-<!--  display: flex;-->
-<!--  flex-wrap: wrap;-->
-<!--  align-items: center;-->
-<!--}-->
-
-<!--.selected-ear-numbers-display::-webkit-scrollbar {-->
-<!--  width: 6px;-->
-<!--  height: 6px;-->
-<!--}-->
-
-<!--.selected-ear-numbers-display::-webkit-scrollbar-thumb {-->
-<!--  background-color: #dcdfe6;-->
-<!--  border-radius: 3px;-->
-<!--}-->
-
-<!--.selected-ear-numbers-display::-webkit-scrollbar-track {-->
-<!--  background-color: #f5f7fa;-->
-<!--}-->
-
-<!--.selected-ear-numbers-display .el-tag {-->
-<!--  margin: 4px;-->
-<!--  cursor: pointer;-->
-<!--}-->
-
-<!--.selected-ear-numbers-display .el-tag:hover {-->
-<!--  opacity: 0.8;-->
-<!--}-->
-
-<!--/* 隐藏 el-select 的下拉箭头（可选） */-->
-<!--:deep(.el-select__caret) {-->
-<!--  display: none;-->
-<!--}-->
-<!--</style>-->
 
 <template>
   <div class="app-container">
@@ -1627,10 +540,10 @@
 
         <el-table-column label="配种类型" align="center" prop="breed_type" width="120">
           <template #default="scope">
-            <el-tag v-if="approveData.planInfo.planType === 1" type="warning">供体母羊配种</el-tag>
-            <el-tag v-else-if="approveData.planInfo.planType === 2" type="primary">同期发情人工授精</el-tag>
-            <el-tag v-else-if="approveData.planInfo.planType === 3" type="success">本交</el-tag>
-            <el-tag v-else-if="approveData.planInfo.planType === 4" type="info">自然发情人工授精</el-tag>
+            <el-tag v-if="planInfo.planType === 1" type="warning">供体母羊配种</el-tag>
+            <el-tag v-else-if="planInfo.planType === 2" type="primary">同期发情人工授精</el-tag>
+            <el-tag v-else-if="planInfo.planType === 3" type="success">本交</el-tag>
+            <el-tag v-else-if=" planInfo.planType === 4" type="info">自然发情人工授精</el-tag>
             <el-tag v-else type="warning">未知类型</el-tag>
           </template>
         </el-table-column>