diff --git a/src/views/Pregnancy_Test/Pregnancy_Test/index.vue b/src/views/Pregnancy_Test/Pregnancy_Test/index.vue index a204268..8a00614 100644 --- a/src/views/Pregnancy_Test/Pregnancy_Test/index.vue +++ b/src/views/Pregnancy_Test/Pregnancy_Test/index.vue @@ -3,7 +3,6 @@
- - - -
-
- - + - + style="width: 200px" + @change="handleQuery" + > + + + @@ -185,8 +189,6 @@ - - @@ -258,10 +260,8 @@ @pagination="getList" /> - - @@ -315,7 +315,20 @@ - + + + @@ -337,7 +350,6 @@ - 配种信息 @@ -388,6 +400,7 @@ import { getBreedInfoByManageTags, searchEarNumbers } from "@/api/Pregnancy_Test/Pregnancy_Test" +import { getUserByPost } from '@/api/common/user' // 新增引入 import { ref, computed, nextTick } from 'vue' import { ArrowUp, ArrowDown, Plus, Delete } from '@element-plus/icons-vue' import {parseTime} from "@/utils/ruoyi.js"; @@ -399,6 +412,9 @@ const earNumberLoading = ref(false) // 耳号加载状态 const isExpanded = ref(false) // 控制耳号展开/折叠状态 const defaultShowCount = 2 // 默认显示的耳号数量 +// 新增:技术员选项 +const technicalOptions = ref([]) + // 计算属性:控制显示的耳号列表 const displayedEarNumbers = computed(() => { if (!queryParams.value.allEarNumbers || queryParams.value.allEarNumbers.length === 0) { @@ -476,6 +492,24 @@ const data = reactive({ const { queryParams, form, rules } = toRefs(data) +// 新增:获取技术员列表 +const fetchTechnicalList = () => { + getUserByPost({ postCode: "techs" }) + .then(res => { + if (res.code === 200 && Array.isArray(res.data)) { + technicalOptions.value = res.data.map(item => ({ + value: item.nickName, + label: item.nickName + })) + } else { + technicalOptions.value = [] + } + }) + .catch(err => { + technicalOptions.value = [] + }) +} + /** 处理粘贴事件 */ function handlePaste(event) { nextTick(() => { @@ -866,6 +900,7 @@ function handleDebugTest() { // 页面初始化 onMounted(() => { + fetchTechnicalList() // 初始化加载技术员列表 console.log("页面初始化,开始加载数据") getList() }) diff --git a/src/views/breed/lambing_records/index.vue b/src/views/breed/lambing_records/index.vue index 652c073..38f9f5e 100644 --- a/src/views/breed/lambing_records/index.vue +++ b/src/views/breed/lambing_records/index.vue @@ -1,10 +1,8 @@ - {{ detailData.femaleEarNumber }} @@ -481,6 +493,7 @@ \ No newline at end of file diff --git a/src/views/miscarriage/miscarriage/index.vue b/src/views/miscarriage/miscarriage/index.vue index 3325cc9..6bb9ce8 100644 --- a/src/views/miscarriage/miscarriage/index.vue +++ b/src/views/miscarriage/miscarriage/index.vue @@ -3,7 +3,6 @@
- - - -
-
- - + - + + + + 搜索 重置 @@ -181,7 +184,6 @@ -