admin/zhyc-sheep-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

断奶录入问题，断奶查询问题，干奶录入问题，干奶查询问题，死亡录入问题，死亡查询问题

Browse Source
This commit is contained in:
ll
2026-02-01 23:28:28 +08:00
parent 4f8d09f00d
commit 5d9c7b56c8
6 changed files with 156 additions and 950 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/api/Weaning/weaning_record.js
View File

@@ -51,17 +51,10 @@ export function getSheepIdByEarNumber(earNumber) {
})
}
<<<<<<< HEAD
// 新增：模糊查询耳号列表 (用于远程搜索)
export function searchEarNumbers(query) {
return request({
url: '/Weaning/weaning_record/search_ear_numbers',
=======
// 模糊查询母羊耳号列表
export function searchEarNumbers(query) {
return request({
url: '/Weaning/weaning_record/search_ear_numbers', // 根据实际路径修改
>>>>>>> 685ce2654e63aa48459b87ee43e319a6e547a8a4
method: 'get',
params: { query }
})

28
src/api/drymilk/drymilk.js
View File

@@ -51,7 +51,6 @@ export function delDrymilk(id) {
})
}
<<<<<<< HEAD
// 查询羊舍列表下拉框
export function listSheepfoldOptions() {
return request({
@@ -67,30 +66,3 @@ export function listTechnicianOptions() {
method: 'get'
})
}
=======
export function searchEarNumbers(query) {
return request({
url: '/drymilk/drymilk/search_ear_numbers',
method: 'get',
params: { query }
})
}
// 搜索耳号（新增）
export function searchEarTags(manageTags) {
return request({
url: '/drymilk/drymilk/searchEarTags',
method: 'get',
params: { manageTags }
})
}
// 验证耳号（新增）
export function validateEarTag(manageTags) {
return request({
url: '/drymilk/drymilk/validateEarTag',
method: 'get',
params: { manageTags }
})
}
>>>>>>> 685ce2654e63aa48459b87ee43e319a6e547a8a4

7
src/api/sheep_death/death.js
View File

@@ -59,7 +59,6 @@ export function getDiseaseTree() {
})
}
<<<<<<< HEAD
// --- 远程搜索 API ---
// 搜索耳号
@@ -84,12 +83,6 @@ export function searchTechnician(query) {
export function searchHandler(query) {
return request({
url: '/sheep_death/death/search/handler',
=======
// 模糊查询母羊耳号列表
export function searchEarNumbers(query) {
return request({
url: '/sheep_death/death/search_ear_numbers', // 根据实际路径修改
>>>>>>> 685ce2654e63aa48459b87ee43e319a6e547a8a4
method: 'get',
params: { query }
})

307
src/views/Weaning/weaning_record/index.vue
View File

@@ -1,7 +1,6 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="80px">
<<<<<<< HEAD
<el-form-item label="耳号" prop="allEarNumbers">
<el-select
@@ -23,103 +22,6 @@
:value="item"
/>
</el-select>
=======
<el-form-item label="耳号" prop="allEarNumbers">
<div style="display: flex; align-items: center; gap: 10px; flex-wrap: wrap;">
<!-- 主选择器：不显示已选标签 -->
<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>
<!-- 辅助粘贴输入框 -->
<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>
<!-- 耳号计数显示 -->
<el-tag
v-if="queryParams.allEarNumbers && queryParams.allEarNumbers.length > 0"
type="info"
effect="plain"
size="large"
>
已选: {{ queryParams.allEarNumbers.length }} 个
</el-tag>
<!-- 清空按钮 -->
<el-button
type="danger"
plain
@click="clearAllEarNumbers"
v-if="queryParams.allEarNumbers && queryParams.allEarNumbers.length > 0"
:icon="Delete"
>
清空全部
</el-button>
</div>
<!-- 已选耳号展示区域（默认显示2个，可展开） -->
<div
v-if="queryParams.allEarNumbers && queryParams.allEarNumbers.length > 0"
class="selected-ear-numbers-display"
style="margin-top: 10px;"
>
<!-- 显示前2个或全部耳号 -->
<el-tag
v-for="(tag, index) in displayedEarNumbers"
:key="tag"
closable
@close="handleRemoveEarNumber(tag)"
style="margin: 4px;"
type="success"
>
{{ tag }}
</el-tag>
<!-- 展开/收起按钮 -->
<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--right">
<component :is="isExpanded ? ArrowUp : ArrowDown" />
</el-icon>
</el-button>
</div>
>>>>>>> 685ce2654e63aa48459b87ee43e319a6e547a8a4
</el-form-item>
<el-form-item label="是否在群" prop="isInHerd">
@@ -259,7 +161,6 @@
:total="total"
v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize"
:page-sizes="[20,50,100,200, 500, 1000, 2000]"
@pagination="getList"
/>
@@ -329,42 +230,8 @@
</template>
<script setup name="Weaning_record">
<<<<<<< HEAD
import { listWeaning_record, getWeaning_record, delWeaning_record, addWeaning_record, updateWeaning_record, getSheepIdByEarNumber, searchEarNumbers } from "@/api/Weaning/weaning_record"
=======
import {
listWeaning_record,
getWeaning_record,
delWeaning_record,
addWeaning_record,
updateWeaning_record,
getSheepIdByEarNumber,
searchEarNumbers
} from "@/api/Weaning/weaning_record"
import { ref, computed, nextTick } from 'vue'
import { ArrowUp, ArrowDown, Plus, Delete } from '@element-plus/icons-vue'
>>>>>>> 685ce2654e63aa48459b87ee43e319a6e547a8a4
// 响应式数据
const pasteInput = 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 { proxy } = getCurrentInstance()
const weaning_recordList = ref([])
@@ -387,17 +254,9 @@ const data = reactive({
queryParams: {
pageNum: 1,
pageSize: 10,
<<<<<<< HEAD
allEarNumbers: [], // 核心：多选数组
isInHerd: null, // 新增：是否在群
sheepCategory: null, // 新增：羊只类别
=======
earNumber: null,
breed: null,
datetime: null,
allEarNumbers: [], // 🔥 必须添加
weight: null,
>>>>>>> 685ce2654e63aa48459b87ee43e319a6e547a8a4
status: null,
gender: null,
breed: null,
@@ -424,125 +283,6 @@ const data = reactive({
const { queryParams, form, rules } = toRefs(data)
/** 处理粘贴事件 */
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 getList() {
loading.value = true
@@ -607,14 +347,8 @@ function handleQuery() {
/** 重置按钮操作 */
function resetQuery() {
<<<<<<< HEAD
daterangeTime.value = []
earNumberOptions.value = []
=======
queryParams.value.allEarNumbers = []
earNumberOptions.value = [] // ✅ 添加这一行
isExpanded.value = false
>>>>>>> 685ce2654e63aa48459b87ee43e319a6e547a8a4
proxy.resetForm("queryRef")
// 必须手动清空多选数组
queryParams.value.allEarNumbers = []
@@ -704,45 +438,8 @@ getList()
</script>
<style scoped>
/* 已选耳号展示区样式 */
.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;
.app-container {
padding: 20px;
}
.mb8 {
margin-bottom: 8px;

631
src/views/drymilk/drymilk/index.vue
View File

@@ -1,37 +1,14 @@
<template>
<div class="app-container">
<<<<<<< HEAD
<el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="80px">
<el-form-item label="耳号" prop="manageTagsList">
<el-select
v-model="queryParams.manageTagsList"
=======
<el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
<!-- 羊只耳号（全部） - 多选模糊查询 -->
<el-form-item label="耳号" prop="allEarNumbers">
<el-select
v-model="queryParams.allEarNumbers"
>>>>>>> 685ce2654e63aa48459b87ee43e319a6e547a8a4
multiple
filterable
remote
reserve-keyword
<<<<<<< HEAD
placeholder="请输入耳号关键字搜索"
:remote-method="searchEarNumber"
:loading="earNumberLoading"
style="width: 240px"
<el-form-item label="耳号" prop="manageTags">
<el-input
v-model="queryParams.manageTags"
placeholder="请输入耳号(空格隔开多个)"
clearable
@change="handleQuery"
>
<el-option
v-for="item in earNumberOptions"
:key="item"
:label="item"
:value="item"
/>
</el-select>
style="width: 220px"
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item label="干奶日期" style="width: 308px">
@@ -43,82 +20,6 @@
start-placeholder="开始日期"
end-placeholder="结束日期"
></el-date-picker>
=======
placeholder="输入耳号搜索，支持多选"
:remote-method="searchEarNumber"
:loading="earNumberLoading"
allow-create
default-first-option
style="width: 300px"
@change="handleEarNumberChange"
collapse-tags
:max-collapse-tags="0"
>
<el-option
v-for="item in earNumberOptions"
:key="item"
:label="item"
:value="item"
/>
</el-select>
<el-input
v-model="pasteInput"
placeholder="或粘贴多个耳号(空格/换行/逗号分隔)"
style="width: 300px; margin-left: 10px"
@paste="handlePaste"
@keyup.enter="handlePasteSubmit"
clearable
>
<template #append>
<el-button @click="handlePasteSubmit" icon="Plus">添加</el-button>
</template>
</el-input>
<!-- 耳号计数显示 -->
<el-tag
v-if="queryParams.allEarNumbers && queryParams.allEarNumbers.length > 0"
type="info"
effect="plain"
size="large"
>
已选: {{ queryParams.allEarNumbers.length }} 个
</el-tag>
<!-- 清空按钮 -->
<el-button
type="danger"
plain
@click="clearAllEarNumbers"
v-if="queryParams.allEarNumbers && queryParams.allEarNumbers.length > 0"
icon="Delete"
>
清空全部
</el-button>
<el-button
type="text"
@click="clearEarNumbers"
v-if="queryParams.femaleEarNumbers && queryParams.femaleEarNumbers.length > 0"
style="margin-left: 10px"
>
清空
</el-button>
</el-form-item>
<el-form-item label="品种" prop="variety">
<el-input
v-model="queryParams.variety"
placeholder="请输入品种"
clearable
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item label="干奶日期" prop="datetime">
<el-date-picker clearable
v-model="queryParams.datetime"
type="date"
value-format="YYYY-MM-DD"
placeholder="请选择干奶日期">
</el-date-picker>
>>>>>>> 685ce2654e63aa48459b87ee43e319a6e547a8a4
</el-form-item>
<el-form-item label="技术员" prop="tecahnician">
@@ -143,42 +44,44 @@
</el-form-item>
</el-form>
<div v-if="queryParams.allEarNumbers && queryParams.allEarNumbers.length > 0" class="selected-ear-numbers">
<span style="margin-right: 10px; color: #606266;">已选择耳号：</span>
<el-tag
v-for="(tag, index) in displayedEarNumbers"
:key="tag"
closable
@close="handleRemoveEarNumber(index)"
style="margin: 4px;"
type="success"
>
{{ tag }}
</el-tag>
<el-button
v-if="queryParams.allEarNumbers.length > 1"
type="text"
@click="toggleExpand"
style="margin-left: 8px;"
>
<el-icon><component :is="isExpanded ? 'ArrowUp' : 'ArrowDown'" /></el-icon>
{{ isExpanded ? '收起' : `展开剩余 ${queryParams.allEarNumbers.length - 1} 个` }}
</el-button>
</div>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['drymilk:drymilk:add']">新增</el-button>
<el-button
type="primary"
plain
icon="Plus"
@click="handleAdd"
v-hasPermi="['drymilk:drymilk:add']"
>新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate" v-hasPermi="['drymilk:drymilk:edit']">修改</el-button>
<el-button
type="success"
plain
icon="Edit"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['drymilk:drymilk:edit']"
>修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete" v-hasPermi="['drymilk:drymilk:remove']">删除</el-button>
<el-button
type="danger"
plain
icon="Delete"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['drymilk:drymilk:remove']"
>删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['drymilk:drymilk:export']">导出</el-button>
<el-button
type="warning"
plain
icon="Download"
@click="handleExport"
v-hasPermi="['drymilk:drymilk:export']"
>导出</el-button>
</el-col>
<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
@@ -193,12 +96,21 @@
<el-table-column label="耳号" align="center" prop="manageTags" min-width="120" />
<el-table-column label="品种" align="center" prop="variety" />
<el-table-column label="事件类型" align="center" prop="eventType" />
<el-table-column label="乳头封闭剂" align="center" prop="status">
<template #default="scope">
<el-tag v-if="scope.row.status === 1" type="success">是</el-tag>
<el-tag v-else type="info">否</el-tag>
</template>
</el-table-column>
<el-table-column label="是否在群" align="center" prop="isInHerd">
<template #default="scope">
<el-tag v-if="scope.row.isInHerd == '1'">是</el-tag>
<el-tag v-else type="danger">否</el-tag>
</template>
</el-table-column>
<el-table-column label="转入羊舍" align="center" prop="sheepfoldName" />
<el-table-column label="技术员" align="center" prop="tecahnician" />
<el-table-column label="备注" align="center" prop="comment" show-overflow-tooltip />
@@ -215,25 +127,30 @@
:total="total"
v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize"
:page-sizes="[20,50,100,200, 500, 1000, 2000]"
@pagination="getList"
/>
<el-dialog :title="title" v-model="open" width="600px" append-to-body>
<el-form ref="drymilkRef" :model="form" :rules="rules" label-width="100px">
<el-form-item label="耳号" prop="manageTags">
<el-input
v-if="!form.id"
v-model="form.manageTags"
type="textarea"
:rows="4"
placeholder="请输入耳号"
placeholder="请输入耳号，多个耳号请用空格、逗号或回车换行分隔"
/>
<el-input v-else v-model="form.manageTags" placeholder="请输入耳号" disabled />
</el-form-item>
<el-form-item label="干奶日期" prop="datetime">
<el-date-picker clearable v-model="form.datetime" type="date" value-format="YYYY-MM-DD" placeholder="请选择干奶日期"></el-date-picker>
<el-date-picker clearable
v-model="form.datetime"
type="date"
value-format="YYYY-MM-DD"
placeholder="请选择干奶日期">
</el-date-picker>
</el-form-item>
<el-form-item label="乳头封闭剂" prop="status">
@@ -244,14 +161,33 @@
</el-form-item>
<el-form-item label="转入羊舍" prop="sheepfold">
<el-select v-model="form.sheepfold" filterable placeholder="请输入关键字选择" style="width: 100%">
<el-option v-for="item in sheepfoldOptions" :key="item.id" :label="item.name" :value="item.id"></el-option>
<el-select
v-model="form.sheepfold"
filterable
placeholder="请输入关键字选择"
style="width: 100%">
<el-option
v-for="item in sheepfoldOptions"
:key="item.id"
:label="item.name"
:value="item.id">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="技术员" prop="tecahnician">
<el-select v-model="form.tecahnician" filterable allow-create default-first-option placeholder="请输入或选择技术员">
<el-option v-for="user in userOptions" :key="user.userName" :label="user.nickName" :value="user.nickName"></el-option>
<el-select
v-model="form.tecahnician"
filterable
allow-create
default-first-option
placeholder="请输入或选择技术员">
<el-option
v-for="user in userOptions"
:key="user.userName"
:label="user.nickName"
:value="user.nickName">
</el-option>
</el-select>
</el-form-item>
@@ -267,23 +203,15 @@
</template>
</el-dialog>
</div>
</template>
<script setup name="Drymilk">
<<<<<<< HEAD
import { listDrymilk, getDrymilk, delDrymilk, addDrymilk, updateDrymilk } from "@/api/drymilk/drymilk"
import { listUser } from "@/api/system/user";
import axios from 'axios';
import { getToken } from "@/utils/auth"; // 必须引入token
=======
import { listDrymilk, getDrymilk, delDrymilk, addDrymilk, updateDrymilk,searchEarNumbers} from "@/api/drymilk/drymilk"
>>>>>>> 685ce2654e63aa48459b87ee43e319a6e547a8a4
import { listUser } from "@/api/system/user"; // 引入用户查询API
import axios from 'axios'; // 如果没有封装好的羊舍API，这里示意，通常应有 api/base/sheepfold.js
const { proxy } = getCurrentInstance()
// 新增：耳号搜索相关状态
const earNumberOptions = ref([])
const earNumberLoading = ref(false)
const drymilkList = ref([])
const open = ref(false)
const loading = ref(true)
@@ -293,287 +221,98 @@ const single = ref(true)
const multiple = ref(true)
const total = ref(0)
const title = ref("")
<<<<<<< HEAD
const dateRange = ref([])
const sheepfoldOptions = ref([])
const userOptions = ref([])
// 新增：耳号搜索相关变量
const earNumberLoading = ref(false)
const earNumberOptions = ref([])
=======
const pasteInput = ref('')
const isExpanded = ref(false) // 控制耳号展开/折叠状态
>>>>>>> 685ce2654e63aa48459b87ee43e319a6e547a8a4
const data = reactive({
form: {},
queryParams: {
pageNum: 1,
pageSize: 10,
<<<<<<< HEAD
manageTags: null, // 字符串字段，用于兼容
manageTagsList: [], // 数组字段，用于el-select多选
=======
allEarNumbers: [],
>>>>>>> 685ce2654e63aa48459b87ee43e319a6e547a8a4
manageTags: null,
variety: null,
status: null,
tecahnician: null,
<<<<<<< HEAD
=======
createBy: null,
createTime: null
>>>>>>> 685ce2654e63aa48459b87ee43e319a6e547a8a4
},
rules: {
manageTags: [{ required: true, message: "耳号不能为空", trigger: "blur" }],
datetime: [{ required: true, message: "干奶日期不能为空", trigger: "blur" }],
status: [{ required: true, message: "请选择是否使用乳头封闭剂", trigger: "change" }]
manageTags: [
{ required: true, message: "耳号不能为空", trigger: "blur" }
],
datetime: [
{ required: true, message: "干奶日期不能为空", trigger: "blur" }
],
status: [
{ required: true, message: "请选择是否使用乳头封闭剂", trigger: "change" }
]
}
})
const { queryParams, form, rules } = toRefs(data)
<<<<<<< HEAD
/** 1. 远程搜索耳号方法 */
function searchEarNumber(query) {
if (query) {
earNumberLoading.value = true;
const url = '/drymilk/drymilk/searchEarNumbers?query=' + query;
// 使用统一的request工具或者axios
const req = proxy.$request ? proxy.$request : axios.create({ baseURL: import.meta.env.VITE_APP_BASE_API, headers: { 'Authorization': 'Bearer ' + getToken() } });
req.get(url).then(res => {
earNumberLoading.value = false;
// 兼容返回格式: 可能是 res.data, res.msg, 或直接 res (如果是拦截器处理过)
const list = res.data || res.msg || res;
if (Array.isArray(list)) {
earNumberOptions.value = list;
} else {
earNumberOptions.value = [];
}
}).catch(err => {
console.error(err);
earNumberLoading.value = false;
earNumberOptions.value = [];
});
} else {
earNumberOptions.value = [];
=======
/** 计算显示的耳号列表 */
const displayedEarNumbers = computed(() => {
if (!queryParams.value.allEarNumbers || queryParams.value.allEarNumbers.length === 0) {
return []
}
// 如果展开或总数<=2，显示全部；否则只显示前2个
if (isExpanded.value || queryParams.value.allEarNumbers.length <= 1) {
return queryParams.value.allEarNumbers
} else {
return queryParams.value.allEarNumbers.slice(0, 1)
}
})
/** 切换展开/收起状态 */
function toggleExpand() {
isExpanded.value = !isExpanded.value
}
/** 移除单个耳号（需要修改以处理展开状态下的索引） */
function handleRemoveEarNumber(displayIndex) {
// 如果是收起状态，直接使用显示索引
// 如果是展开状态，需要找到实际索引
let actualIndex = displayIndex
if (!isExpanded.value && queryParams.value.allEarNumbers.length > 1) {
// 收起状态下，显示的是前2个，索引直接对应
actualIndex = displayIndex
}
queryParams.value.allEarNumbers.splice(actualIndex, 1)
proxy.$modal.msgSuccess('已移除该耳号')
// 如果删除后剩余<=2个，自动收起
if (queryParams.value.allEarNumbers.length <= 1) {
isExpanded.value = false
}
}
/** 清空所有耳号 */
function clearAllEarNumbers() {
proxy.$modal.confirm('确定要清空所有已选择的耳号吗？').then(() => {
queryParams.value.allEarNumbers = []
pasteInput.value = ''
earNumberOptions.value = []
isExpanded.value = false // 重置展开状态
proxy.$modal.msgSuccess('已清空所有耳号')
}).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 = ''
}
/** 批量验证耳号(可选功能) */
async function validateBatchEarNumbers(earNumbers) {
try {
// 可以调用后端批量验证接口
// 这里简化处理,仅在搜索时验证
console.log('待验证耳号:', earNumbers)
} catch (error) {
console.error('验证耳号失败:', error)
>>>>>>> 685ce2654e63aa48459b87ee43e319a6e547a8a4
}
}
/** 查询干奶记录列表 */
function getList() {
loading.value = true
// 1. 处理日期范围
const params = proxy.addDateRange(queryParams.value, dateRange.value);
// 2. 处理多耳号逻辑
// 前端 el-select 绑定的是 manageTagsList (数组)
// 为了保证后端能稳定接收，如果 queryParams 中有 manageTagsList，则保留它
// 如果后端需要字符串兼容，可以这样处理：
/*
if (params.manageTagsList && params.manageTagsList.length > 0) {
params.manageTags = params.manageTagsList.join(',');
}
*/
listDrymilk(params).then(response => {
drymilkList.value = response.rows
total.value = response.total
loading.value = false
}).catch(() => {
loading.value = false;
// 添加时间范围参数
// 正确：直接获取返回结果
queryParams.value = proxy.addDateRange(queryParams.value, dateRange.value);
listDrymilk(queryParams.value).then(response => {
drymilkList.value = response.rows
total.value = response.total
loading.value = false
})
.catch(() => {
// 降级处理，如果 proxy.addDateRange 不可用
let params = {...queryParams.value};
if (dateRange.value && dateRange.value.length === 2) {
params.params = {
beginTime: dateRange.value[0],
endTime: dateRange.value[1]
};
}
listDrymilk(params).then(response => {
drymilkList.value = response.rows
total.value = response.total
loading.value = false
})
});
}
// 辅助函数：获取下拉数据
/** 获取羊舍列表 */
function getSheepfoldList() {
const url = '/drymilk/drymilk/sheepfoldList';
const req = proxy.$request ? proxy.$request : axios.create({ baseURL: import.meta.env.VITE_APP_BASE_API, headers: { 'Authorization': 'Bearer ' + getToken() } });
req.get(url).then(res => {
sheepfoldOptions.value = res.data || res.rows || [];
// 假设路径，请根据实际项目api调整
proxy.$http ? proxy.$http.get('/drymilk/drymilk/sheepfoldList').then(res => {
sheepfoldOptions.value = res.data || res;
}) : axios.get(import.meta.env.VITE_APP_BASE_API + '/drymilk/drymilk/sheepfoldList', {
headers: { 'Authorization': 'Bearer ' + getToken() }
}).then(res => {
sheepfoldOptions.value = res.data.data || res.data;
});
}
/** 获取用户列表(技术员) */
function getUserList() {
listUser({ pageNum: 1, pageSize: 1000 }).then(response => {
userOptions.value = response.rows;
userOptions.value = response.rows;
});
}
// 辅助函数获取token，如果没有引入，请自行处理
import { getToken } from "@/utils/auth";
// 取消按钮
function cancel() {
open.value = false
reset()
}
/** 新增：远程搜索耳号（模糊查询） */
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 removeEarNumber(earNumber) {
const index = queryParams.value.allEarNumbers.indexOf(earNumber)
if (index > -1) {
queryParams.value.allEarNumbers.splice(index, 1)
}
}
// 表单重置
function reset() {
form.value = {
id: null,
manageTags: null,
datetime: new Date().toISOString().split('T')[0],
status: 0,
datetime: new Date().toISOString().split('T')[0], // 默认今天
status: 0, // 默认否
sheepfold: null,
tecahnician: null,
comment: null
@@ -581,55 +320,36 @@ function reset() {
proxy.resetForm("drymilkRef")
}
<<<<<<< HEAD
// 搜索重置
function resetQuery() {
dateRange.value = []
queryParams.value.manageTagsList = []
earNumberOptions.value = []
proxy.resetForm("queryRef")
handleQuery()
}
/** 搜索按钮操作 */
=======
>>>>>>> 685ce2654e63aa48459b87ee43e319a6e547a8a4
function handleQuery() {
queryParams.value.pageNum = 1
getList()
}
<<<<<<< HEAD
=======
/** 重置按钮操作 - 修改 */
/** 重置按钮操作 */
function resetQuery() {
queryParams.value.allEarNumbers = []
earNumberOptions.value = []
dateRange.value = []
proxy.resetForm("queryRef")
handleQuery()
}
// 多选框选中数据
>>>>>>> 685ce2654e63aa48459b87ee43e319a6e547a8a4
function handleSelectionChange(selection) {
ids.value = selection.map(item => item.id)
single.value = selection.length != 1
multiple.value = !selection.length
}
/** 新增按钮操作 */
function handleAdd() {
reset()
getSheepfoldList();
getUserList();
getSheepfoldList(); // 加载下拉数据
getUserList(); // 加载下拉数据
open.value = true
title.value = "添加干奶记录"
}
<<<<<<< HEAD
=======
/** 修改按钮操作 */
>>>>>>> 685ce2654e63aa48459b87ee43e319a6e547a8a4
function handleUpdate(row) {
reset()
getSheepfoldList();
@@ -642,6 +362,7 @@ function handleUpdate(row) {
})
}
/** 提交按钮 */
function submitForm() {
proxy.$refs["drymilkRef"].validate(valid => {
if (valid) {
@@ -653,12 +374,12 @@ function submitForm() {
})
} else {
addDrymilk(form.value).then(response => {
if(response.code === 200 || response.code === undefined) {
// 兼容不同版本的AjaxResult结构
proxy.$modal.msgSuccess(response.msg || "新增成功")
} else {
proxy.$modal.msgWarning(response.msg)
}
// 如果返回warn说明部分成功部分失败
if(response.code === 200) {
proxy.$modal.msgSuccess(response.msg || "新增成功")
} else {
proxy.$modal.msgWarning(response.msg)
}
open.value = false
getList()
})
@@ -667,6 +388,7 @@ function submitForm() {
})
}
/** 删除按钮操作 */
function handleDelete(row) {
const _ids = row.id || ids.value
proxy.$modal.confirm('是否确认删除干奶记录编号为"' + _ids + '"的数据项？').then(function() {
@@ -677,71 +399,18 @@ function handleDelete(row) {
}).catch(() => {})
}
/** 导出按钮操作 */
function handleExport() {
let params = proxy.addDateRange(queryParams.value, dateRange.value);
// 导出时确保数组参数被传递
if (params.manageTagsList && params.manageTagsList.length > 0) {
// 某些后端框架导出只能接字符串，这里转一下以防万一
params.manageTags = params.manageTagsList.join(',');
}
// 处理导出时的日期范围
let params = {...queryParams.value};
if (dateRange.value && dateRange.value.length === 2) {
params.params = {
beginTime: dateRange.value[0],
endTime: dateRange.value[1]
};
}
proxy.download('drymilk/drymilk/export', params, `drymilk_${new Date().getTime()}.xlsx`)
}
// 初始化
getList()
<<<<<<< HEAD
getSheepfoldList()
getUserList()
</script>
=======
</script>
<style scoped>
/* 已选耳号展示区样式 */
.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;
}
/* 展开按钮样式 */
.selected-ear-numbers-display .el-button--text {
padding: 0 8px;
font-size: 14px;
color: #409eff;
}
.selected-ear-numbers-display .el-button--text:hover {
color: #66b1ff;
}
</style>
>>>>>>> 685ce2654e63aa48459b87ee43e319a6e547a8a4

118
src/views/sheep_death/death/index.vue
View File

@@ -1,7 +1,6 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="100px">
<<<<<<< HEAD
<el-form-item label="管理耳号" prop="manageTagsList">
<el-select
@@ -25,103 +24,6 @@
:value="item"
/>
</el-select>
=======
<el-form-item label="耳号" prop="allEarNumbers">
<div style="display: flex; align-items: center; gap: 10px; flex-wrap: wrap;">
<!-- 主选择器：不显示已选标签 -->
<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>
<!-- 辅助粘贴输入框 -->
<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>
<!-- 耳号计数显示 -->
<el-tag
v-if="queryParams.allEarNumbers && queryParams.allEarNumbers.length > 0"
type="info"
effect="plain"
size="large"
>
已选: {{ queryParams.allEarNumbers.length }} 个
</el-tag>
<!-- 清空按钮 -->
<el-button
type="danger"
plain
@click="clearAllEarNumbers"
v-if="queryParams.allEarNumbers && queryParams.allEarNumbers.length > 0"
:icon="Delete"
>
清空全部
</el-button>
</div>
<!-- 已选耳号展示区域（默认显示2个，可展开） -->
<div
v-if="queryParams.allEarNumbers && queryParams.allEarNumbers.length > 0"
class="selected-ear-numbers-display"
style="margin-top: 10px;"
>
<!-- 显示前2个或全部耳号 -->
<el-tag
v-for="(tag, index) in displayedEarNumbers"
:key="tag"
closable
@close="handleRemoveEarNumber(tag)"
style="margin: 4px;"
type="success"
>
{{ tag }}
</el-tag>
<!-- 展开/收起按钮 -->
<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--right">
<component :is="isExpanded ? ArrowUp : ArrowDown" />
</el-icon>
</el-button>
</div>
>>>>>>> 685ce2654e63aa48459b87ee43e319a6e547a8a4
</el-form-item>
<el-form-item label="死亡日期" prop="deathDateRange">
@@ -450,7 +352,6 @@
<script setup name="Death">
import {
<<<<<<< HEAD
listDeath,
getDeath,
delDeath,
@@ -462,19 +363,6 @@ import {
searchTechnician,
searchHandler
} from "@/api/sheep_death/death"
=======
listDeath,
getDeath,
delDeath,
addDeath,
updateDeath,
getSheepInfo,
getDiseaseTree,
searchEarNumbers
} from "@/api/sheep_death/death"
import { ref, computed, nextTick } from 'vue'
import { ArrowUp, ArrowDown, Plus, Delete } from '@element-plus/icons-vue'
>>>>>>> 685ce2654e63aa48459b87ee43e319a6e547a8a4
// 响应式数据
const pasteInput = ref('') // 批量粘贴输入框
@@ -798,7 +686,6 @@ function handleQuery() {
/** 重置按钮操作 */
function resetQuery() {
<<<<<<< HEAD
// 手动清空数组类型的查询条件
queryParams.value.manageTagsList = []
queryParams.value.sheepTypeList = []
@@ -807,11 +694,6 @@ function resetQuery() {
queryParams.value.workGroupList = []
queryParams.value.deathDateRange = []
=======
queryParams.value.allEarNumbers = [] // ✅ 添加这一行
earNumberOptions.value = [] // ✅ 添加这一行
isExpanded.value = false // ✅ 添加这一行
>>>>>>> 685ce2654e63aa48459b87ee43e319a6e547a8a4
proxy.resetForm("queryRef")
handleQuery()
}