冻胚冻精完善

This commit is contained in:
zyh 2025-12-04 16:36:38 +08:00
parent f34c2e45f1
commit 93b1f9283a
6 changed files with 683 additions and 767 deletions

View File

@ -42,3 +42,29 @@ export function delEmbryo(id) {
method: 'delete'
})
}
// 根据供体母羊耳号回显冲胚信息(冻胚新增页面用)
export function getFlushInfoByEwe(eweNo) {
return request({
url: '/frozen/embryo/getFlushInfoByEwe/' + eweNo,
method: 'get'
})
}
// 根据母羊+等级获取数量
export function getQtyByGrade(eweNo, grade) {
return request({
url: '/frozen/embryo/getQtyByGrade',
method: 'get',
params: { eweNo, grade }
})
}
// 废弃冻胚
export function discardEmbryo(data) {
return request({
url: '/frozen/embryo/discard',
method: 'put',
data
})
}

View File

@ -2,20 +2,20 @@
<div class="app-container">
<el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="胚胎编号" prop="code">
<el-input v-model="queryParams.code" placeholder="请输入胚胎编号" clearable @keyup.enter="handleQuery" />
<el-input v-model="queryParams.code" placeholder="请输入胚胎编号" clearable @keyup.enter="handleQuery"
style="width:150px;" />
</el-form-item>
<el-form-item label="冻胚日期" prop="freezeDate">
<el-date-picker clearable v-model="queryParams.freezeDate" type="date" value-format="YYYY-MM-DD"
placeholder="请选择冻胚日期">
</el-date-picker>
<el-form-item label="冻胚日期" style="width: 308px">
<el-date-picker v-model="daterangeFreezeDate" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
start-placeholder="开始日期" end-placeholder="结束日期" style="width: 100%" />
</el-form-item>
<el-form-item label="技术员" prop="tech">
<el-input v-model="queryParams.tech" placeholder="请输入技术员" clearable @keyup.enter="handleQuery" />
<el-input v-model="queryParams.tech" placeholder="请输入技术员" clearable @keyup.enter="handleQuery"
style="width:150px;" />
</el-form-item>
<el-form-item label="出库日期" prop="outDate">
<el-date-picker clearable v-model="queryParams.outDate" type="date" value-format="YYYY-MM-DD"
placeholder="请选择出库日期">
</el-date-picker>
<el-form-item label="出库日期" style="width: 308px">
<el-date-picker v-model="daterangeOutDate" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
start-placeholder="开始日期" end-placeholder="结束日期" style="width: 100%" />
</el-form-item>
<el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@ -27,10 +27,10 @@
<el-col :span="1.5">
<el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['frozen:embryo:add']">新增</el-button>
</el-col>
<el-col :span="1.5">
<!-- <el-col :span="1.5">
<el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate"
v-hasPermi="['frozen:embryo:edit']">修改</el-button>
</el-col>
</el-col> -->
<el-col :span="1.5">
<el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete"
v-hasPermi="['frozen:embryo:remove']">删除</el-button>
@ -39,32 +39,42 @@
<el-button type="warning" plain icon="Download" @click="handleExport"
v-hasPermi="['frozen:embryo:export']">导出</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="warning" plain icon="Close" :disabled="multiple" @click="handleDiscard"
v-hasPermi="['frozen:embryo:discard']">
废弃
</el-button>
</el-col>
<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="embryoList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<!-- <el-table-column label="主键" align="center" prop="id" /> -->
<el-table-column label="胚胎编号" align="center" prop="code" />
<el-table-column label="冻胚日期" align="center" prop="freezeDate" width="180">
<el-table-column label="胚胎编号" align="center" prop="code" width="130px" fixed="fixed" />
<el-table-column label="冻胚日期" align="center" prop="freezeDate" width="130px">
<template #default="scope">
<span>{{ parseTime(scope.row.freezeDate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="供体公羊耳号" align="center" prop="drId" />
<el-table-column label="供体公羊品种" align="center" prop="drBreed" />
<el-table-column label="供体母羊耳号" align="center" prop="deId" />
<el-table-column label="供体母羊品种" align="center" prop="deBreed" />
<el-table-column label="供体公羊耳号" align="center" prop="drId" width="130px" />
<el-table-column label="供体公羊品种" align="center" prop="drBreed" width="130px" />
<el-table-column label="供体母羊耳号" align="center" prop="deId" width="130px" />
<el-table-column label="供体母羊品种" align="center" prop="deBreed" width="130px" />
<el-table-column label="胚胎品种" align="center" prop="embBreed" />
<el-table-column label="胚胎阶段等级" align="center" prop="grade" />
<el-table-column label="胚胎数量" align="center" prop="qty" />
<el-table-column label="是否性控" align="center" prop="sexCtl" />
<el-table-column label="胚胎阶段等级" align="center" prop="grade" width="130px" />
<el-table-column label="胚胎数量" align="center" prop="qty" width="130px" sortable />
<el-table-column label="是否性控" align="center" width="80">
<template #default="scope">
{{ scope.row.sexCtl === 1 ? '是' : '否' }}
</template>
</el-table-column>
<el-table-column label="状态" align="center" prop="status" />
<el-table-column label="技术员" align="center" prop="tech" />
<el-table-column label="液氮罐ID" align="center" prop="tankId" />
<el-table-column label="提桶ID" align="center" prop="bucketId" />
<el-table-column label="冷冻架ID" align="center" prop="rackId" />
<el-table-column label="出库日期" align="center" prop="outDate" width="180">
<el-table-column label="出库日期" align="center" prop="outDate" width="130px">
<template #default="scope">
<span>{{ parseTime(scope.row.outDate, '{y}-{m}-{d}') }}</span>
</template>
@ -72,15 +82,15 @@
<el-table-column label="废弃原因" align="center" prop="discardTxt" />
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="创建人" align="center" prop="createBy" />
<el-table-column label="创建时间" align="center" prop="createTime" width="180">
<el-table-column label="创建时间" align="center" prop="createTime" width="160px">
<template #default="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}') }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
<template #default="scope">
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
v-hasPermi="['frozen:embryo:edit']">修改</el-button>
<!-- <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
v-hasPermi="['frozen:embryo:edit']">修改</el-button> -->
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
v-hasPermi="['frozen:embryo:remove']">删除</el-button>
</template>
@ -90,147 +100,146 @@
<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="700px" append-to-body>
<el-form ref="embryoRef" :model="form" :rules="rules" label-width="100px">
<el-row :gutter="20">
<!-- 第1行 -->
<el-col :span="12">
<el-form-item label="胚胎编号" prop="code">
<el-input v-model="form.code" placeholder="请输入胚胎编号" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="冻胚日期" prop="freezeDate">
<el-date-picker clearable v-model="form.freezeDate" type="date" value-format="YYYY-MM-DD"
placeholder="请选择冻胚日期" style="width: 100%" />
</el-form-item>
</el-col>
<!-- 添加或修改冻胚库存对话框 -->
<el-dialog :title="title" v-model="open" width="700px" append-to-body>
<el-form ref="embryoRef" :model="form" :rules="rules" label-width="100px">
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="胚胎编号" prop="code">
<el-input v-model="form.code" placeholder="请输入胚胎编号(YS+日期+序号)" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="冻胚日期" prop="freezeDate">
<el-date-picker clearable v-model="form.freezeDate" type="date" value-format="YYYY-MM-DD"
placeholder="请选择冻胚日期" style="width: 100%" />
</el-form-item>
</el-col>
<!-- 第2行 -->
<el-col :span="12">
<el-form-item label="供体公羊耳号" prop="drId">
<el-input v-model="form.drId" placeholder="请输入供体公羊耳号" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="供体公羊品种" prop="drBreed">
<el-input v-model="form.drBreed" placeholder="请输入供体公羊品种" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="供体母羊耳号">
<el-input v-model="form.deId" placeholder="请输入耳号" @blur="getFlushInfo" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="供体母羊品种">
<el-input v-model="form.deBreed" placeholder="输入供体母羊耳号自动回显" disabled />
</el-form-item>
</el-col>
<!-- 第3行 -->
<el-col :span="12">
<el-form-item label="供体母羊耳号" prop="deId">
<el-input v-model="form.deId" placeholder="请输入供体母羊耳号" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="供体母羊品种" prop="deBreed">
<el-input v-model="form.deBreed" placeholder="请输入供体母羊品种" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="供体公羊耳号">
<el-input v-model="form.drId" placeholder="输入供体母羊耳号自动回显" disabled />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="供体公羊品种">
<el-input v-model="form.drBreed" placeholder="输入供体母羊耳号自动回显" disabled />
</el-form-item>
</el-col>
<!-- 第4行 -->
<el-col :span="12">
<el-form-item label="胚胎品种" prop="embBreed">
<el-input v-model="form.embBreed" placeholder="请输入胚胎品种" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="胚胎阶段等级" prop="grade">
<el-select v-model="form.grade" placeholder="请选择阶段等级" clearable style="width: 100%">
<el-option v-for="opt in GRADE_OPTS" :key="opt.value" :label="opt.label" :value="opt.value" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="胚胎品种">
<el-input v-model="form.embBreed" placeholder="输入供体母羊耳号自动回显" disabled />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="胚胎阶段等级" prop="grade">
<el-select v-model="form.grade" placeholder="请选择阶段等级" clearable style="width: 100%"
@change="onGradeChange">
<el-option v-for="opt in GRADE_OPTS" :key="opt.value" :label="opt.label" :value="opt.value" />
</el-select>
</el-form-item>
</el-col>
<!-- 第5行 -->
<el-col :span="12">
<el-form-item label="胚胎数量" prop="qty">
<el-input v-model="form.qty" placeholder="请输入胚胎数量" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="是否性控" prop="sexCtl">
<el-select v-model="form.sexCtl" placeholder="请选择" clearable style="width: 100%">
<el-option
v-for="opt in SEX_CTL_OPTS"
:key="opt.value"
:label="opt.label"
:value="opt.value"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="胚胎数量" prop="qty">
<el-input v-model="form.qty" placeholder="请输入胚胎数量" disabled />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="是否性控" prop="sexCtl">
<el-select v-model="form.sexCtl" placeholder="请选择" clearable style="width: 100%">
<el-option v-for="opt in SEX_CTL_OPTS" :key="opt.value" :label="opt.label" :value="opt.value" />
</el-select>
</el-form-item>
</el-col>
<!-- 第6行 -->
<el-col :span="12">
<el-form-item label="技术员" prop="tech">
<el-input v-model="form.tech" placeholder="请输入技术员" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="液氮罐ID" prop="tankId">
<el-select v-model="form.tankId" placeholder="请选择液氮罐" clearable style="width: 100%">
<el-option v-for="opt in NUM_1_10" :key="opt.value" :label="opt.label" :value="opt.value" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="技术员" prop="tech">
<el-input v-model="form.tech" placeholder="请输入技术员" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="液氮罐ID" prop="tankId">
<el-select v-model="form.tankId" placeholder="请选择液氮罐" clearable style="width: 100%">
<el-option v-for="opt in NUM_1_10" :key="opt.value" :label="opt.label" :value="opt.value" />
</el-select>
</el-form-item>
</el-col>
<!-- 第7行 -->
<el-col :span="12">
<el-form-item label="提桶ID" prop="bucketId">
<el-select v-model="form.bucketId" placeholder="请选择提桶" clearable style="width: 100%">
<el-option v-for="opt in NUM_1_10" :key="opt.value" :label="opt.label" :value="opt.value" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="冷冻架ID" prop="rackId">
<el-select v-model="form.rackId" placeholder="请选择冷冻架" clearable style="width: 100%">
<el-option v-for="opt in NUM_1_10" :key="opt.value" :label="opt.label" :value="opt.value" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="提桶ID" prop="bucketId">
<el-select v-model="form.bucketId" placeholder="请选择提桶" clearable style="width: 100%">
<el-option v-for="opt in NUM_1_10" :key="opt.value" :label="opt.label" :value="opt.value" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="冷冻架ID" prop="rackId">
<el-select v-model="form.rackId" placeholder="请选择冷冻架" clearable style="width: 100%">
<el-option v-for="opt in NUM_1_10" :key="opt.value" :label="opt.label" :value="opt.value" />
</el-select>
</el-form-item>
</el-col>
<!-- 第8行 独占 -->
<el-col :span="24">
<el-form-item label="出库日期" prop="outDate">
<el-date-picker clearable v-model="form.outDate" type="date" value-format="YYYY-MM-DD"
placeholder="请选择出库日期" style="width: 100%" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="出库日期" prop="outDate">
<el-date-picker clearable v-model="form.outDate" type="date" value-format="YYYY-MM-DD"
placeholder="请选择出库日期" style="width: 100%" />
</el-form-item>
</el-col>
<!-- 第9行 独占 -->
<el-col :span="24">
<el-form-item label="废弃原因" prop="discardTxt">
<el-input v-model="form.discardTxt" type="textarea" :rows="2" placeholder="请输入内容" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" :rows="2" placeholder="请输入备注" />
</el-form-item>
</el-col>
</el-row>
</el-form>
<!-- 第10行 独占 -->
<el-col :span="24">
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" :rows="2" placeholder="请输入备注" />
</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>
<template #footer>
<div class="dialog-footer">
<el-button type="primary" @click="submitForm"> </el-button>
<el-button @click="cancel"> </el-button>
</div>
</template>
</el-dialog>
<!-- 批量废弃弹窗 -->
<el-dialog title="批量废弃" v-model="discardOpen" width="400px" append-to-body>
<el-form>
<el-form-item label="胚胎编号(灰色为已废弃)">
<el-tag v-for="e in discardDisabled" :key="'d-' + e.id"
style="margin-right:4px;background:#f5f5f5;color:#909399;border:none;">{{ e.code }}</el-tag>
<el-tag v-for="e in discardSelection" :key="e.id" style="margin-right:4px;">{{ e.code }}</el-tag>
<span class="tag-count">已选 {{ discardSelection.length }} </span>
</el-form-item>
<el-form-item label="废弃原因">
<el-input v-model="discardReason" type="textarea" :rows="3" />
</el-form-item>
</el-form>
<template #footer>
<el-button @click="discardOpen = false">取消</el-button>
<el-button type="primary" @click="submitDiscard">确定</el-button>
</template>
</el-dialog>
</div>
</template>
<script setup name="Embryo">
import { listEmbryo, getEmbryo, delEmbryo, addEmbryo, updateEmbryo } from "@/api/frozen/embryo"
import { listEmbryo, getEmbryo, delEmbryo, addEmbryo, updateEmbryo, getFlushInfoByEwe, getQtyByGrade, discardEmbryo } from "@/api/frozen/embryo"
import request from '@/utils/request'
const { proxy } = getCurrentInstance()
const embryoList = ref([])
@ -263,18 +272,22 @@ const NUM_1_10 = Array.from({ length: 10 }, (_, i) => ({
label: i + 1 + '',
value: i + 1
}))
const daterangeFreezeDate = ref([]) //
const daterangeOutDate = ref([]) //
const discardSelection = ref([]) //
const discardDisabled = ref([]) //
const discardReason = ref('')
const discardOpen = ref(false)
const data = reactive({
form: {},
queryParams: {
pageNum: 1,
pageSize: 10,
code: null,
freezeDate: null,
grade: null,
status: null,
tech: null,
outDate: null,
params: {}
},
rules: {
code: [
@ -288,6 +301,26 @@ const { queryParams, form, rules } = toRefs(data)
/** 查询冻胚库存列表 */
function getList() {
loading.value = true
// params
queryParams.value.params = queryParams.value.params || {}
//
if (daterangeFreezeDate.value && daterangeFreezeDate.value.length === 2) {
queryParams.value.params.beginFreezeDate = daterangeFreezeDate.value[0]
queryParams.value.params.endFreezeDate = daterangeFreezeDate.value[1]
} else {
delete queryParams.value.params.beginFreezeDate
delete queryParams.value.params.endFreezeDate
}
if (daterangeOutDate.value && daterangeOutDate.value.length === 2) {
queryParams.value.params.beginOutDate = daterangeOutDate.value[0]
queryParams.value.params.endOutDate = daterangeOutDate.value[1]
} else {
delete queryParams.value.params.beginOutDate
delete queryParams.value.params.endOutDate
}
listEmbryo(queryParams.value).then(response => {
embryoList.value = response.rows
total.value = response.total
@ -321,7 +354,6 @@ function reset() {
bucketId: null,
rackId: null,
outDate: null,
discardTxt: null,
remark: null,
createBy: null,
createTime: null
@ -337,6 +369,8 @@ function handleQuery() {
/** 重置按钮操作 */
function resetQuery() {
daterangeFreezeDate.value = []
daterangeOutDate.value = []
proxy.resetForm("queryRef")
handleQuery()
}
@ -405,5 +439,92 @@ function handleExport() {
}, `embryo_${new Date().getTime()}.xlsx`)
}
/** 失焦或点击“查询” */
function getFlushInfo() {
const eweNo = form.value.deId?.trim()
if (!eweNo) {
form.value.drId = ''
form.value.drBreed = ''
form.value.deBreed = ''
form.value.embBreed = ''
return
}
getFlushInfoByEwe(eweNo).then(res => {
if (res.code !== 200) {
proxy.$modal.msgError(res.msg)
form.value.drId = ''
form.value.drBreed = ''
form.value.deBreed = ''
form.value.embBreed = ''
return
}
//
form.value.drId = res.data.drId
form.value.drBreed = res.data.drBreed
form.value.deBreed = res.data.deBreed
form.value.embBreed = res.data.embBreed
}).catch(() => {
form.value.drId = ''
form.value.drBreed = ''
form.value.deBreed = ''
form.value.embBreed = ''
})
}
/**
* 供体母羊耳号已存在时根据所选胚胎阶段等级自动回显对应冲胚记录数量
*/
function onGradeChange() {
const grade = form.value.grade;
const eweNo = form.value.deId?.trim();
if (!grade || !eweNo) {
form.value.qty = null;
return;
}
getQtyByGrade(eweNo, grade).then(res => {
form.value.qty = res.data;
}).catch(() => {
form.value.qty = null;
});
}
//
function handleDiscard() {
if (!ids.value.length) return proxy.$modal.msgWarning('请选择记录')
const allSelected = embryoList.value.filter(e => ids.value.includes(e.id))
discardSelection.value = allSelected.filter(e => e.status !== '废弃')
discardDisabled.value = allSelected.filter(e => e.status === '废弃')
if (!discardSelection.value.length) {
proxy.$modal.msgWarning('所选记录已全部废弃')
return
}
discardReason.value = ''
discardOpen.value = true
}
function submitDiscard() {
const data = discardSelection.value.map(e => ({
id: e.id,
discardTxt: discardReason.value.trim()
}))
request.put('/frozen/embryo/batchDiscard', data).then(() => {
proxy.$modal.msgSuccess('废弃成功')
discardOpen.value = false
getList()
})
}
getList()
</script>
<style>
.tag-count {
color: #606266;
background-color: #f5f7fa;
padding: 2px 8px;
border-radius: 12px;
font-size: 12px;
margin-left: 8px;
}
</style>

View File

@ -1,37 +1,21 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="冻精号/公羊耳号" prop="code">
<el-input
v-model="queryParams.code"
placeholder="请输入冻精号/公羊耳号"
clearable
@keyup.enter="handleQuery"
/>
<el-form-item label="冻精号" prop="code">
<el-input v-model="queryParams.code" placeholder="请输入冻精号/公羊耳号" clearable @keyup.enter="handleQuery"
style="width:150px;" />
</el-form-item>
<el-form-item label="冻精日期" prop="freezeDt">
<el-date-picker clearable
v-model="queryParams.freezeDt"
type="date"
value-format="YYYY-MM-DD"
placeholder="请选择冻精日期">
</el-date-picker>
<el-form-item label="冻精日期" style="width: 308px">
<el-date-picker v-model="daterangeFreezeDt" type="daterange" range-separator="-" start-placeholder="开始日期"
end-placeholder="结束日期" value-format="YYYY-MM-DD" clearable style="width: 100%" />
</el-form-item>
<el-form-item label="技术员" prop="tech">
<el-input
v-model="queryParams.tech"
placeholder="请输入技术员"
clearable
@keyup.enter="handleQuery"
/>
<el-input v-model="queryParams.tech" placeholder="请输入技术员" clearable @keyup.enter="handleQuery"
style="width:150px;" />
</el-form-item>
<el-form-item label="出库日期" prop="outDt">
<el-date-picker clearable
v-model="queryParams.outDt"
type="date"
value-format="YYYY-MM-DD"
placeholder="请选择出库日期">
</el-date-picker>
<el-form-item label="出库日期" style="width: 308px">
<el-date-picker v-model="daterangeOutDt" type="daterange" range-separator="-" start-placeholder="开始日期"
end-placeholder="结束日期" value-format="YYYY-MM-DD" clearable style="width: 100%" />
</el-form-item>
<el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@ -41,66 +25,49 @@
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="Plus"
@click="handleAdd"
v-hasPermi="['sperm:sperm:add']"
>新增</el-button>
<el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['sperm:sperm:add']">新增</el-button>
</el-col>
<!-- <el-col :span="1.5">
<el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate"
v-hasPermi="['sperm:sperm:edit']">修改</el-button>
</el-col> -->
<el-col :span="1.5">
<el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete"
v-hasPermi="['sperm:sperm:remove']">删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
plain
icon="Edit"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['sperm:sperm:edit']"
>修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="Delete"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['sperm:sperm:remove']"
>删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="Download"
@click="handleExport"
v-hasPermi="['sperm:sperm:export']"
>导出</el-button>
<el-button type="warning" plain icon="Download" @click="handleExport"
v-hasPermi="['sperm:sperm:export']">导出</el-button>
</el-col>
<el-button type="warning" plain icon="Close" @click="handleDiscard"
v-hasPermi="['sperm:sperm:discard']">废弃</el-button>
<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="spermList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="主键" align="center" prop="id" />
<el-table-column label="冻精号/公羊耳号" align="center" prop="code" />
<el-table-column label="冻精日期" align="center" prop="freezeDt" width="180">
<!-- <el-table-column label="主键" align="center" prop="id" /> -->
<el-table-column label="冻精号" align="center" prop="code" width="130px" fixed="fixed" />
<el-table-column label="冻精日期" align="center" prop="freezeDt" width="130px">
<template #default="scope">
<span>{{ parseTime(scope.row.freezeDt, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="冻精品种" align="center" prop="breed" />
<el-table-column label="生产批次" align="center" prop="batch" />
<el-table-column label="规格(0.25mL,0.5mL)" align="center" prop="spec" />
<el-table-column label="数量" align="center" prop="qty" />
<el-table-column label="是否性控 1是 0否" align="center" prop="sexCtl" />
<el-table-column label="生产批次" align="center" prop="batch" width="130px" />
<el-table-column label="规格" align="center" prop="spec" />
<el-table-column label="数量" align="center" prop="qty" sortable />
<el-table-column label="是否性控" align="center">
<template #default="scope">
{{ scope.row.sexCtl === 1 ? '是' : '否' }}
</template>
</el-table-column>
<el-table-column label="状态" align="center" prop="stat" />
<el-table-column label="技术员" align="center" prop="tech" />
<el-table-column label="液氮罐ID" align="center" prop="tankId" />
<el-table-column label="提桶ID" align="center" prop="bucketId" />
<el-table-column label="冷冻架ID" align="center" prop="rackId" />
<el-table-column label="出库日期" align="center" prop="outDt" width="180">
<el-table-column label="出库日期" align="center" prop="outDt" width="130px">
<template #default="scope">
<span>{{ parseTime(scope.row.outDt, '{y}-{m}-{d}') }}</span>
</template>
@ -108,94 +75,151 @@
<el-table-column label="废弃原因" align="center" prop="discardTxt" />
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="创建人" align="center" prop="createBy" />
<el-table-column label="创建时间" align="center" prop="createTime" width="180">
<el-table-column label="创建时间" align="center" prop="createTime" width="160px">
<template #default="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}') }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
<template #default="scope">
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['sperm:sperm:edit']">修改</el-button>
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['sperm:sperm:remove']">删除</el-button>
<!-- <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['sperm:sperm:edit']">修改</el-button> -->
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
v-hasPermi="['sperm:sperm: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"
/>
<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="500px" append-to-body>
<el-form ref="spermRef" :model="form" :rules="rules" label-width="80px">
<el-form-item label="冻精号/公羊耳号" prop="code">
<el-input v-model="form.code" placeholder="请输入冻精号/公羊耳号" />
<el-dialog :title="title" v-model="open" width="700px" append-to-body>
<el-form ref="spermRef" :model="form" :rules="rules" label-width="100px">
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="冻精号" prop="code">
<el-input v-model="form.code" placeholder="请输入冻精号/公羊耳号" clearable @blur="loadRamInfo" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="冻精日期" prop="freezeDt">
<el-date-picker v-model="form.freezeDt" type="date" value-format="YYYY-MM-DD" placeholder="请选择冻精日期"
style="width: 100%" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="冻精品种" prop="breed">
<el-input v-model="form.breed" :disabled="!!form.code" placeholder="自动回显" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="生产批次" prop="batch">
<el-input v-model="form.batch" placeholder="请输入20251107" maxlength="8" show-word-limit />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="规格" prop="spec">
<el-select v-model="form.spec" placeholder="请选择规格" clearable style="width: 100%">
<el-option v-for="opt in SPEC_OPTS" :key="opt.value" :label="opt.label" :value="opt.value" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="数量" prop="qty">
<el-select v-model="form.qty" filterable default-first-option placeholder="请选择数量" style="width: 100%">
<el-option v-for="opt in QTY_OPTS" :key="opt.value" :label="opt.label" :value="opt.value" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="是否性控" prop="sexCtl">
<el-select v-model="form.sexCtl" placeholder="请选择" clearable style="width: 100%">
<el-option v-for="opt in SEX_CTL_OPTS" :key="opt.value" :label="opt.label" :value="opt.value" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="技术员" prop="tech">
<el-input v-model="form.tech" placeholder="请输入技术员" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="液氮罐ID" prop="tankId">
<el-select v-model="form.tankId" placeholder="请选择液氮罐" clearable style="width: 100%">
<el-option v-for="opt in NUM_1_10" :key="opt.value" :label="opt.label" :value="opt.value" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="提桶ID" prop="bucketId">
<el-select v-model="form.bucketId" placeholder="请选择提桶" clearable style="width: 100%">
<el-option v-for="opt in NUM_1_10" :key="opt.value" :label="opt.label" :value="opt.value" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="冷冻架ID" prop="rackId">
<el-select v-model="form.rackId" placeholder="请选择冷冻架" clearable style="width: 100%">
<el-option v-for="opt in NUM_1_10" :key="opt.value" :label="opt.label" :value="opt.value" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="出库日期" prop="outDt">
<el-date-picker v-model="form.outDt" type="date" value-format="YYYY-MM-DD" placeholder="请选择出库日期"
style="width: 100%" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" :rows="2" placeholder="请输入备注" />
</el-form-item>
</el-col>
</el-row>
</el-form>
<div class="dialog-footer" style="text-align: right; margin-top: 10px;">
<el-button type="primary" @click="submitForm"> </el-button>
<el-button @click="cancel"> </el-button>
</div>
</el-dialog>
<el-dialog title="批量废弃" v-model="discardOpen" width="400px" append-to-body>
<el-form>
<el-form-item label="冻精号(灰色为已废弃)">
<el-tag v-for="s in discardDisabled" :key="'d-' + s.id"
style="margin-right:4px;background:#f5f5f5;color:#909399;border:none;">{{ s.code }}</el-tag>
<el-tag v-for="s in discardSelection" :key="s.id" style="margin-right:4px;">{{ s.code }}</el-tag>
<span class="tag-count">已选 {{ discardSelection.length }} </span>
</el-form-item>
<el-form-item label="冻精日期" prop="freezeDt">
<el-date-picker clearable
v-model="form.freezeDt"
type="date"
value-format="YYYY-MM-DD"
placeholder="请选择冻精日期">
</el-date-picker>
</el-form-item>
<el-form-item label="冻精品种" prop="breed">
<el-input v-model="form.breed" placeholder="请输入冻精品种" />
</el-form-item>
<el-form-item label="生产批次" prop="batch">
<el-input v-model="form.batch" placeholder="请输入生产批次" />
</el-form-item>
<el-form-item label="数量" prop="qty">
<el-input v-model="form.qty" placeholder="请输入数量" />
</el-form-item>
<el-form-item label="是否性控 1是 0否" prop="sexCtl">
<el-input v-model="form.sexCtl" placeholder="请输入是否性控 1是 0否" />
</el-form-item>
<el-form-item label="技术员" prop="tech">
<el-input v-model="form.tech" placeholder="请输入技术员" />
</el-form-item>
<el-form-item label="液氮罐ID" prop="tankId">
<el-input v-model="form.tankId" placeholder="请输入液氮罐ID" />
</el-form-item>
<el-form-item label="提桶ID" prop="bucketId">
<el-input v-model="form.bucketId" placeholder="请输入提桶ID" />
</el-form-item>
<el-form-item label="冷冻架ID" prop="rackId">
<el-input v-model="form.rackId" placeholder="请输入冷冻架ID" />
</el-form-item>
<el-form-item label="出库日期" prop="outDt">
<el-date-picker clearable
v-model="form.outDt"
type="date"
value-format="YYYY-MM-DD"
placeholder="请选择出库日期">
</el-date-picker>
</el-form-item>
<el-form-item label="废弃原因" prop="discardTxt">
<el-input v-model="form.discardTxt" type="textarea" placeholder="请输入内容" />
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
<el-form-item label="废弃原因">
<el-input v-model="discardReason" type="textarea" :rows="3" />
</el-form-item>
</el-form>
<template #footer>
<div class="dialog-footer">
<el-button type="primary" @click="submitForm"> </el-button>
<el-button @click="cancel"> </el-button>
</div>
<el-button @click="discardOpen = false">取消</el-button>
<el-button type="primary" @click="submitDiscard">确定</el-button>
</template>
</el-dialog>
</div>
</template>
<script setup name="Sperm">
import { listSperm, getSperm, delSperm, addSperm, updateSperm } from "@/api/frozen/sperm"
const { proxy } = getCurrentInstance()
import request from '@/utils/request'
const { proxy } = getCurrentInstance();
const spermList = ref([])
const open = ref(false)
@ -206,18 +230,92 @@ const single = ref(true)
const multiple = ref(true)
const total = ref(0)
const title = ref("")
const daterangeFreezeDt = ref([]) //
const daterangeOutDt = ref([]) //
const discardSelection = ref([]) //
const discardDisabled = ref([]) //
const discardReason = ref('')
const discardOpen = ref(false)
//
const SPEC_OPTS = [
{ label: '0.25mL', value: '0.25mL' },
{ label: '0.5mL', value: '0.5mL' }
]
// 1~200
const QTY_OPTS = Array.from({ length: 200 }, (_, i) => ({
label: i + 1,
value: i + 1
}))
//
const SEX_CTL_OPTS = [
{ label: '是', value: 1 },
{ label: '否', value: 0 }
]
const NUM_1_10 = Array.from({ length: 10 }, (_, i) => ({
label: i + 1 + '',
value: i + 1
}))
const data = reactive({
form: {},
queryParams: {
pageNum: 1,
pageSize: 10,
code: null,
freezeDt: null,
tech: null,
outDt: null,
tech: null
},
rules: {
spec: [
{ required: true, message: "请选择规格", trigger: "change" }
],
qty: [
{ required: true, message: "请选择或输入数量", trigger: "blur" },
{
validator: (rule, value, callback) => {
const num = Number(value)
if (!Number.isInteger(num) || num < 1 || num > 200) {
callback(new Error("数量必须为 1~200 的整数"))
} else {
callback()
}
},
trigger: "blur"
}
],
sexCtl: [
{ required: true, message: "请选择是否性控", trigger: "change" }
],
batch: [
{ required: true, message: '生产批次不能为空', trigger: 'blur' },
{
pattern: /^\d{8}$/,
message: '请输入 8 位日期20251107',
trigger: 'blur'
}
],
code: [
{ required: true, message: '请输入公羊耳号', trigger: 'blur' },
{ validator: (_, v) => v && form.value.breed ? Promise.resolve() : Promise.reject('请先输入有效公羊耳号'), trigger: 'blur' }
],
freezeDt: [
{ required: true, message: '请选择冻精日期', trigger: 'change' }
],
tech: [
{ required: true, message: '请输入技术员', trigger: 'blur' }
],
tankId: [
{ required: true, message: '请选择液氮罐', trigger: 'change' }
],
bucketId: [
{ required: true, message: '请选择提桶', trigger: 'change' }
],
rackId: [
{ required: true, message: '请选择冷冻架', trigger: 'change' }
],
outDt: [
{ required: true, message: '请选择出库日期', trigger: 'change' }
],
}
})
@ -232,7 +330,36 @@ function getList() {
loading.value = false
})
}
async function loadRamInfo() {
if (!form.value.code) return
const url = `/sheep/sheep/byManageTags/${form.value.code.trim()}`
try {
const { data } = await request.get(url)
const sheep = data
//
if (sheep.statusId !== 1) {
proxy.$modal.msgError('羊只不在群');
form.value.code = '';
form.value.breed = '';
return;
}
// =
if (sheep.gender !== 2) {
proxy.$modal.msgError('该耳号对应不是公羊')
form.value.code = ''
form.value.breed = ''
return
}
//
form.value.breed = sheep.varietyName || ''
proxy.$refs.spermRef.clearValidate('code')
} catch (e) {
console.log('>>> 请求失败:', e)
proxy.$modal.msgError('未找到对应羊只')
form.value.code = ''
form.value.breed = ''
}
}
//
function cancel() {
open.value = false
@ -249,14 +376,13 @@ function reset() {
batch: null,
spec: null,
qty: null,
sexCtl: null,
sexCtl: 0,
stat: null,
tech: null,
tankId: null,
bucketId: null,
rackId: null,
outDt: null,
discardTxt: null,
remark: null,
createBy: null,
createTime: null
@ -267,12 +393,34 @@ function reset() {
/** 搜索按钮操作 */
function handleQuery() {
queryParams.value.pageNum = 1
queryParams.value.params = queryParams.value.params || {}
//
if (daterangeFreezeDt.value && daterangeFreezeDt.value.length === 2) {
queryParams.value.params.beginFreezeDt = daterangeFreezeDt.value[0]
queryParams.value.params.endFreezeDt = daterangeFreezeDt.value[1]
} else {
delete queryParams.value.params.beginFreezeDt
delete queryParams.value.params.endFreezeDt
}
//
if (daterangeOutDt.value && daterangeOutDt.value.length === 2) {
queryParams.value.params.beginOutDt = daterangeOutDt.value[0]
queryParams.value.params.endOutDt = daterangeOutDt.value[1]
} else {
delete queryParams.value.params.beginOutDt
delete queryParams.value.params.endOutDt
}
getList()
}
/** 重置按钮操作 */
function resetQuery() {
proxy.resetForm("queryRef")
daterangeFreezeDt.value = []
daterangeOutDt.value = []
proxy.resetForm('queryRef')
handleQuery()
}
@ -325,12 +473,12 @@ function submitForm() {
/** 删除按钮操作 */
function handleDelete(row) {
const _ids = row.id || ids.value
proxy.$modal.confirm('是否确认删除冻精库存编号为"' + _ids + '"的数据项?').then(function() {
proxy.$modal.confirm('是否确认删除冻精库存编号为"' + _ids + '"的数据项?').then(function () {
return delSperm(_ids)
}).then(() => {
getList()
proxy.$modal.msgSuccess("删除成功")
}).catch(() => {})
}).catch(() => { })
}
/** 导出按钮操作 */
@ -340,5 +488,47 @@ function handleExport() {
}, `sperm_${new Date().getTime()}.xlsx`)
}
//
function handleDiscard() {
if (!ids.value.length) return proxy.$modal.msgWarning('请选择记录')
const allSelected = spermList.value.filter(s => ids.value.includes(s.id))
discardSelection.value = allSelected.filter(s => s.stat !== '废弃')
discardDisabled.value = allSelected.filter(s => s.stat === '废弃')
if (!discardSelection.value.length) {
proxy.$modal.msgWarning('所选记录已全部废弃')
return
}
discardReason.value = ''
discardOpen.value = true
}
function submitDiscard() {
if (!discardReason.value.trim()) {
proxy.$modal.msgWarning('请输入废弃原因')
return
}
//
const data = discardSelection.value.map(s => ({
id: s.id,
discardTxt: discardReason.value
}))
request.put('/sperm/sperm/discard', data).then(() => {
proxy.$modal.msgSuccess('废弃成功')
discardOpen.value = false
getList()
})
}
getList()
</script>
<style scoped>
.tag-count {
color: #606266;
background-color: #f5f7fa;
padding: 2px 8px;
border-radius: 12px;
font-size: 12px;
}
</style>

View File

@ -18,7 +18,7 @@
<el-option v-for="item in sheepfoldOptions" :key="item.id" :label="item.sheepfoldName" :value="item.id" />
</el-select>
</el-form-item>
<el-form-item label="品种" prop="varietyId" style="width: 308px">
<el-form-item label="品种" prop="varietyId">
<el-select v-model="queryParams.varietyId" placeholder="请选择品种" style="min-width:150px" clearable>
<el-option v-for="item in varietyOptions" :key="item.id" :label="item.variety" :value="item.id" />
</el-select>
@ -39,10 +39,10 @@
<el-button type="primary" plain icon="Plus" @click="handleAdd"
v-hasPermi="['body_measure:body_measure:add']">新增</el-button>
</el-col>
<el-col :span="1.5">
<!-- <el-col :span="1.5">
<el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate"
v-hasPermi="['body_measure:body_measure:edit']">修改</el-button>
</el-col>
</el-col> -->
<el-col :span="1.5">
<el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete"
v-hasPermi="['body_measure:body_measure:remove']">删除</el-button>
@ -56,284 +56,55 @@
<el-table v-loading="loading" :data="body_measureList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="管理耳号" align="center" prop="manageTags" min-width="100px" fixed />
<el-table-column label="羊舍" align="center" prop="sheepfoldName" min-width="100px" />
<el-table-column label="品种" align="center" prop="varietyName" />
<el-table-column label="管理耳号" align="center" prop="manageTags" width="100" fixed />
<el-table-column label="羊舍" align="center" prop="sheepfoldName" width="100" />
<el-table-column label="品种" align="center" prop="varietyName" width="100" />
<el-table-column label="事件类型" align="center" prop="eventType" width="120" />
<el-table-column label="羊只类别" align="center" prop="sheepTypeName" />
<el-table-column label="性别" align="center">
<el-table-column label="羊只类别" align="center" prop="sheepTypeName" width="100" />
<el-table-column label="性别" align="center" prop="gender" width="100">
<template #default="scope">
<span>{{ genderMap[scope.row.gender] || '未知' }}</span>
</template>
</el-table-column>
<el-table-column label="胎次" align="center" prop="parity">
<template #header>
<div style="display: flex; align-items: center; gap: 4px; cursor: pointer;" @click="handleSort('parity')">
<span>胎次</span>
<el-icon size="16" style="color: skyblue;">
<ArrowUp v-if="!sortStates.parity.isSorting || sortStates.parity.isAsc" />
<ArrowDown v-else />
</el-icon>
</div>
</template>
<template #default="scope">
<span>{{ scope.row.parity }}</span>
</template>
</el-table-column>
<el-table-column label="出生体重(kg)" align="center" prop="birthWeight" min-width="100px">
<template #header>
<div style="display: flex; align-items: center; gap: 4px; cursor: pointer;"
@click="handleSort('birthWeight')">
<span>出生体重(kg)</span>
<el-icon size="16" style="color: skyblue;">
<ArrowUp v-if="!sortStates.birthWeight.isSorting || sortStates.birthWeight.isAsc" />
<ArrowDown v-else />
</el-icon>
</div>
</template>
<template #default="scope">
<span>{{ scope.row.birthWeight }}</span>
</template>
</el-table-column>
<el-table-column label="断奶体重(kg)" align="center" prop="weaningWeight" min-width="100px">
<template #header>
<div style="display: flex; align-items: center; gap: 4px; cursor: pointer;"
@click="handleSort('weaningWeight')">
<span>断奶体重(kg)</span>
<el-icon size="16" style="color: skyblue;">
<ArrowUp v-if="!sortStates.weaningWeight.isSorting || sortStates.weaningWeight.isAsc" />
<ArrowDown v-else />
</el-icon>
</div>
</template>
<template #default="scope">
<span>{{ scope.row.weaningWeight }}</span>
</template>
</el-table-column>
<el-table-column label="当前体重(kg)" align="center" prop="currentWeight" min-width="100px">
<template #header>
<div style="display: flex; align-items: center; gap: 4px; cursor: pointer;"
@click="handleSort('currentWeight')">
<span>当前体重(kg)</span>
<el-icon size="16" style="color: skyblue;">
<ArrowUp v-if="!sortStates.currentWeight.isSorting || sortStates.currentWeight.isAsc" />
<ArrowDown v-else />
</el-icon>
</div>
</template>
<template #default="scope">
<span>{{ scope.row.currentWeight }}</span>
</template>
</el-table-column>
<el-table-column label="体高" align="center" prop="height">
<template #header>
<div style="display: flex; align-items: center; gap: 4px; cursor: pointer;" @click="handleSort('height')">
<span>体高</span>
<el-icon size="16" style="color: skyblue;">
<ArrowUp v-if="!sortStates.height.isSorting || sortStates.height.isAsc" />
<ArrowDown v-else />
</el-icon>
</div>
</template>
<template #default="scope">
<span>{{ scope.row.height }}</span>
</template>
</el-table-column>
<el-table-column label="胸围" align="center" prop="bust">
<template #header>
<div style="display: flex; align-items: center; gap: 4px; cursor: pointer;" @click="handleSort('bust')">
<span>胸围</span>
<el-icon size="16" style="color: skyblue;">
<ArrowUp v-if="!sortStates.bust.isSorting || sortStates.bust.isAsc" />
<ArrowDown v-else />
</el-icon>
</div>
</template>
<template #default="scope">
<span>{{ scope.row.bust }}</span>
</template>
</el-table-column>
<el-table-column label="体斜长" align="center" prop="bodyLength">
<template #header>
<div style="display: flex; align-items: center; gap: 4px; cursor: pointer;" @click="handleSort('bodyLength')">
<span>体斜长</span>
<el-icon size="16" style="color: skyblue;">
<ArrowUp v-if="!sortStates.bodyLength.isSorting || sortStates.bodyLength.isAsc" />
<ArrowDown v-else />
</el-icon>
</div>
</template>
<template #default="scope">
<span>{{ scope.row.bodyLength }}</span>
</template>
</el-table-column>
<el-table-column label="管围" align="center" prop="pipeLength">
<template #header>
<div style="display: flex; align-items: center; gap: 4px; cursor: pointer;" @click="handleSort('pipeLength')">
<span>管围</span>
<el-icon size="16" style="color: skyblue;">
<ArrowUp v-if="!sortStates.pipeLength.isSorting || sortStates.pipeLength.isAsc" />
<ArrowDown v-else />
</el-icon>
</div>
</template>
<template #default="scope">
<span>{{ scope.row.pipeLength }}</span>
</template>
</el-table-column>
<el-table-column label="胸深" align="center" prop="chestDepth">
<template #header>
<div style="display: flex; align-items: center; gap: 4px; cursor: pointer;" @click="handleSort('chestDepth')">
<span>胸深</span>
<el-icon size="16" style="color: skyblue;">
<ArrowUp v-if="!sortStates.chestDepth.isSorting || sortStates.chestDepth.isAsc" />
<ArrowDown v-else />
</el-icon>
</div>
</template>
<template #default="scope">
<span>{{ scope.row.chestDepth }}</span>
</template>
</el-table-column>
<el-table-column label="臀高" align="center" prop="hipHeight">
<template #header>
<div style="display: flex; align-items: center; gap: 4px; cursor: pointer;" @click="handleSort('hipHeight')">
<span>臀高</span>
<el-icon size="16" style="color: skyblue;">
<ArrowUp v-if="!sortStates.hipHeight.isSorting || sortStates.hipHeight.isAsc" />
<ArrowDown v-else />
</el-icon>
</div>
</template>
<template #default="scope">
<span>{{ scope.row.hipHeight }}</span>
</template>
</el-table-column>
<el-table-column label="尻宽" align="center" prop="rumpWidth">
<template #header>
<div style="display: flex; align-items: center; gap: 4px; cursor: pointer;" @click="handleSort('rumpWidth')">
<span>尻宽</span>
<el-icon size="16" style="color: skyblue;">
<ArrowUp v-if="!sortStates.rumpWidth.isSorting || sortStates.rumpWidth.isAsc" />
<ArrowDown v-else />
</el-icon>
</div>
</template>
<template #default="scope">
<span>{{ scope.row.rumpWidth }}</span>
</template>
</el-table-column>
<el-table-column label="尻高" align="center" prop="rumpHeignt">
<template #header>
<div style="display: flex; align-items: center; gap: 4px; cursor: pointer;" @click="handleSort('rumpHeignt')">
<span>尻高</span>
<el-icon size="16" style="color: skyblue;">
<ArrowUp v-if="!sortStates.rumpHeignt.isSorting || sortStates.rumpHeignt.isAsc" />
<ArrowDown v-else />
</el-icon>
</div>
</template>
<template #default="scope">
<span>{{ scope.row.rumpHeignt }}</span>
</template>
</el-table-column>
<el-table-column label="腰角宽" align="center" prop="hipWidth">
<template #header>
<div style="display: flex; align-items: center; gap: 4px; cursor: pointer;" @click="handleSort('hipWidth')">
<span>腰角宽</span>
<el-icon size="16" style="color: skyblue;">
<ArrowUp v-if="!sortStates.hipWidth.isSorting || sortStates.hipWidth.isAsc" />
<ArrowDown v-else />
</el-icon>
</div>
</template>
<template #default="scope">
<span>{{ scope.row.hipWidth }}</span>
</template>
</el-table-column>
<el-table-column label="十字部高" align="center" prop="hipCrossHeight">
<template #header>
<div style="display: flex; align-items: center; gap: 4px; cursor: pointer;"
@click="handleSort('hipCrossHeight')">
<span>十字部高</span>
<el-icon size="16" style="color: skyblue;">
<ArrowUp v-if="!sortStates.hipCrossHeight.isSorting || sortStates.hipCrossHeight.isAsc" />
<ArrowDown v-else />
</el-icon>
</div>
</template>
<template #default="scope">
<span>{{ scope.row.hipCrossHeight }}</span>
</template>
</el-table-column>
<el-table-column label="胎次" align="center" prop="parity" width="100" />
<el-table-column label="出生体重(kg)" align="center" prop="birthWeight" width="150" sortable />
<el-table-column label="断奶体重(kg)" align="center" prop="weaningWeight" width="150" sortable />
<el-table-column label="当前体重(kg)" align="center" prop="currentWeight" width="150" sortable />
<el-table-column label="体高" align="center" prop="height" width="100" sortable />
<el-table-column label="胸围" align="center" prop="bust" width="100" sortable />
<el-table-column label="体斜长" align="center" prop="bodyLength" width="150" sortable />
<el-table-column label="管围" align="center" prop="pipeLength" width="100" sortable />
<el-table-column label="胸深" align="center" prop="chestDepth" width="100" sortable />
<el-table-column label="臀高" align="center" prop="hipHeight" width="100" sortable />
<el-table-column label="尻宽" align="center" prop="rumpWidth" width="100" sortable />
<el-table-column label="尻高" align="center" prop="rumpHeignt" width="100" sortable />
<el-table-column label="腰角宽" align="center" prop="hipWidth" width="150" sortable />
<el-table-column label="十字部高" align="center" prop="hipCrossHeight" width="150" sortable />
<el-table-column label="繁育状态" align="center" prop="breedStatusName" width="100">
<template #default="scope">
<span>{{ scope.row.breedStatusName || '未设置' }}</span>
</template>
</el-table-column>
<el-table-column label="泌乳天数" align="center" prop="lactationDay" width="100">
<template #header>
<div style="display: flex; align-items: center; gap: 4px; cursor: pointer;"
@click="handleSort('lactationDay')">
<span>泌乳天数</span>
<el-icon size="16" style="color: skyblue;">
<ArrowUp v-if="!sortStates.lactationDay.isSorting || sortStates.lactationDay.isAsc" />
<ArrowDown v-else />
</el-icon>
</div>
</template>
<template #default="scope">
<span>{{ scope.row.lactationDay || '-' }}</span>
</template>
</el-table-column>
<el-table-column label="怀孕天数" align="center" prop="gestationDay" width="100">
<template #header>
<div style="display: flex; align-items: center; gap: 4px; cursor: pointer;"
@click="handleSort('gestationDay')">
<span>怀孕天数</span>
<el-icon size="16" style="color: skyblue;">
<ArrowUp v-if="!sortStates.gestationDay.isSorting || sortStates.gestationDay.isAsc" />
<ArrowDown v-else />
</el-icon>
</div>
</template>
<template #default="scope">
<span>{{ scope.row.gestationDay || '-' }}</span>
</template>
</el-table-column>
<el-table-column label="配后天数" align="center" prop="postMatingDay" width="100">
<template #header>
<div style="display: flex; align-items: center; gap: 4px; cursor: pointer;"
@click="handleSort('postMatingDay')">
<span>配后天数</span>
<el-icon size="16" style="color: skyblue;">
<ArrowUp v-if="!sortStates.postMatingDay.isSorting || sortStates.postMatingDay.isAsc" />
<ArrowDown v-else />
</el-icon>
</div>
</template>
<template #default="scope">
<span>{{ scope.row.postMatingDay || '-' }}</span>
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="comment" min-width="100px" />
<el-table-column label="技术员" align="center" prop="technician" />
<el-table-column label="测量日期" align="center" prop="measureDate" width="120">
<el-table-column label="泌乳天数" align="center" prop="lactationDay" width="150" sortable />
<el-table-column label="怀孕天数" align="center" prop="gestationDay" width="150" sortable />
<el-table-column label="配后天数" align="center" prop="postMatingDay" width="150" sortable />
<el-table-column label="备注" align="center" prop="comment" width="100" />
<el-table-column label="技术员" align="center" prop="technician" width="100" />
<el-table-column label="测量日期" align="center" prop="measureDate" width="120">
<template #default="scope">
<span>{{ parseTime(scope.row.measureDate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="创建人" align="center" prop="createBy" />
<el-table-column label="创建人" align="center" prop="createBy" width="100" />
<el-table-column label="创建时间" align="center" prop="createTime" width="180">
<template #default="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}') }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" min-width="130px">
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" min-width="130">
<template #default="scope">
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
v-hasPermi="['body_measure:body_measure:edit']">修改</el-button>
<!-- <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
v-hasPermi="['body_measure:body_measure:edit']">修改</el-button> -->
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
v-hasPermi="['body_measure:body_measure:remove']">删除</el-button>
</template>
@ -372,10 +143,10 @@
<el-form-item label="管围" prop="pipeLength">
<el-input v-model="form.pipeLength" placeholder="请输入管围" :disabled="!isAdd" clearable />
</el-form-item>
<el-form-item label="胸深" prop="chestDepth">
<el-input v-model="form.chestDepth" placeholder="请输入胸深" :disabled="!isAdd" clearable />
<el-form-item label="技术员" prop="technician">
<el-input v-model="form.technician" placeholder="请输入技术员" :disabled="!isAdd" clearable />
</el-form-item>
</el-col>
<el-col :span="12">
@ -399,8 +170,8 @@
<el-input v-model="form.hipCrossHeight" placeholder="请输入十字部高" :disabled="!isAdd" clearable />
</el-form-item>
<el-form-item label="技术员" prop="technician">
<el-input v-model="form.technician" placeholder="请输入技术员" :disabled="!isAdd" clearable />
<el-form-item label="胸深" prop="chestDepth">
<el-input v-model="form.chestDepth" placeholder="请输入胸深" :disabled="!isAdd" clearable />
</el-form-item>
</el-col>
</el-row>
@ -426,7 +197,6 @@ import { getSheepByManageTags } from "@/api/produce/manage_sheep/changeVariety"
import { listSheepfold_management as listSheepfold } from '@/api/fileManagement/sheepfold_management'
import { getVarietyOptions } from '@/api/produce/other/fixHoof'
import { getCurrentInstance } from 'vue'
import { ArrowUp, ArrowDown } from '@element-plus/icons-vue'
const { proxy } = getCurrentInstance()
@ -478,19 +248,6 @@ const data = reactive({
const { queryParams, form, rules } = toRefs(data)
const [smFields, bsFields] = [
// sc_body_measure
['height', 'bust', 'bodyLength', 'pipeLength', 'chestDepth', 'hipHeight', 'rumpWidth', 'rumpHeignt', 'hipWidth', 'hipCrossHeight'],
// bas_sheep
['parity', 'birthWeight', 'weaningWeight', 'currentWeight', 'lactationDay', 'gestationDay', 'postMatingDay']
];
//
const sortStates = reactive({
...smFields.reduce((obj, field) => ({ ...obj, [field]: { isSorting: false, isAsc: true } }), {}),
...bsFields.reduce((obj, field) => ({ ...obj, [field]: { isSorting: false, isAsc: true } }), {})
});
//
function getList() {
loading.value = true
@ -510,23 +267,6 @@ function getList() {
})
}
/**
* 通用排序方法所有需要排序的列共用
* @param {String} prop - 排序字段
*/
function handleSort(prop) {
Object.keys(sortStates).forEach(key => {
sortStates[key].isSorting = false;
});
const current = sortStates[prop];
current.isSorting = true;
current.isAsc = !current.isAsc;
queryParams.value.orderBy = prop;
queryParams.value.sortDirection = current.isAsc ? 'ASC' : 'DESC';
queryParams.value.pageNum = 1;
getList();
}
//
function onManageTagsBlur() {
const tag = form.value.manageTags?.trim();
@ -597,12 +337,6 @@ function resetQuery() {
data.varietyName = '';
daterangeMeasureDate.value = [];
proxy.resetForm("queryRef");
Object.keys(sortStates).forEach(key => {
sortStates[key].isSorting = false
sortStates[key].isAsc = true
})
queryParams.value.orderBy = null;
queryParams.value.sortDirection = null;
handleQuery();
}

View File

@ -1,10 +1,6 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
<!-- <el-form-item label="创建时间" style="width: 308px">
<el-date-picker v-model="daterangeCreateTime" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
</el-form-item> -->
<el-form-item label="事件日期" style="width: 308px">
<el-date-picker v-model="daterangeDatetime" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
@ -18,10 +14,6 @@
<el-option v-for="item in varietyOptions" :key="item.id" :label="item.variety" :value="item.id" />
</el-select>
</el-form-item>
<!-- <el-form-item label="体况评分" prop="score">
<el-input v-model="queryParams.score" placeholder="请输入体况评分" clearable @keyup.enter="handleQuery"
style="max-width: 150px;" />
</el-form-item> -->
<el-form-item label="羊舍" prop="sheepfold">
<el-select v-model="queryParams.sheepfold" placeholder="请选择羊舍" style="min-width:150px" clearable>
<el-option v-for="item in sheepfoldOptions" :key="item.id" :label="item.sheepfoldName" :value="item.id" />
@ -63,20 +55,7 @@
<span>{{ parseTime(scope.row.datetime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="体况评分" align="center" prop="score" min-width="100px">
<template #header>
<div style="display: flex; align-items: center; gap: 8px; cursor: pointer;" @click="handleScoreSort">
<span>体况评分</span>
<el-icon size="16" style="color: skyblue;">
<ArrowUp v-if="!sortByScore || sortScoreAsc" />
<ArrowDown v-else />
</el-icon>
</div>
</template>
<template #default="scope">
<span>{{ scope.row.score }}</span>
</template>
</el-table-column>
<el-table-column label="体况评分" align="center" prop="score" min-width="100px" sortable/>
<el-table-column label="羊舍" align="center" prop="sheepfoldName" min-width="100px" />
<el-table-column label="备注" align="center" prop="comment" min-width="130px" />
<el-table-column label="技术员" align="center" prop="technician" />
@ -141,7 +120,6 @@ import { listBody_score, getBody_score, delBody_score, addBody_score, updateBody
import { listSheepfold_management as listSheepfold } from '@/api/fileManagement/sheepfold_management'
import { checkSheepByManageTags, getVarietyOptions } from "@/api/produce/other/fixHoof"
import { getCurrentInstance, ref, reactive, toRefs } from 'vue'
import { ArrowUp, ArrowDown } from '@element-plus/icons-vue'
const { proxy } = getCurrentInstance()
@ -158,8 +136,6 @@ const daterangeDatetime = ref([])
const daterangeCreateTime = ref([])
const sheepfoldList = ref([])
const isAdd = ref(false)
const sortByScore = ref(false)
const sortScoreAsc = ref(true)
const data = reactive({
form: {
@ -210,13 +186,6 @@ function getList() {
queryParams.value.params["beginCreateTime"] = daterangeCreateTime.value[0]
queryParams.value.params["endCreateTime"] = daterangeCreateTime.value[1]
}
if (sortByScore.value) {
queryParams.value.orderBy = "score";
queryParams.value.sortDirection = sortScoreAsc.value ? "ASC" : "DESC";
} else {
queryParams.value.orderBy = null;
queryParams.value.sortDirection = null;
}
listBody_score(queryParams.value).then(response => {
body_scoreList.value = response.rows
total.value = response.total
@ -254,18 +223,6 @@ function onManageTagsBlur() {
});
}
//
function handleScoreSort() {
if (sortByScore.value) {
sortScoreAsc.value = !sortScoreAsc.value;
} else {
sortByScore.value = true;
sortScoreAsc.value = true;
}
queryParams.value.pageNum = 1;
getList();
}
//
const sheepfoldOptions = ref([])
function getSheepfoldOptions() {
@ -308,8 +265,6 @@ function resetQuery() {
daterangeCreateTime.value = []
queryParams.value.varietyId = null;
proxy.resetForm("queryRef")
sortByScore.value = false;
sortScoreAsc.value = true;
handleQuery()
}

View File

@ -59,51 +59,12 @@
</template>
</el-table-column>
<el-table-column label="羊舍" align="center" prop="sheepfoldName" min-width="120px" />
<el-table-column label="乳房深度" align="center" prop="depth">
<template #header>
<div style="display: flex; align-items: center; gap: 4px; cursor: pointer;" @click="handleDepthSort">
<span>乳房深度</span>
<el-icon size="16" style="color: #409EFF;">
<ArrowUp v-if="!sortByDepth || sortDepthAsc" />
<ArrowDown v-else />
</el-icon>
</div>
</template>
<template #default="scope">
<span>{{ scope.row.depth }}</span>
</template>
</el-table-column>
<el-table-column label="乳房长度" align="center" prop="length">
<template #header>
<div style="display: flex; align-items: center; gap: 4px; cursor: pointer;" @click="handleLengthSort">
<span>乳房长度</span>
<el-icon size="16" style="color: #409EFF;">
<ArrowUp v-if="!sortByLength || sortLengthAsc" />
<ArrowDown v-else />
</el-icon>
</div>
</template>
<template #default="scope">
<span>{{ scope.row.length }}</span>
</template>
</el-table-column>
<el-table-column label="乳房深度" align="center" prop="depth" min-width="150px" sortable />
<el-table-column label="乳房长度" align="center" prop="length" min-width="150px" sortable />
<el-table-column label="乳房位置" align="center" prop="position" />
<el-table-column label="乳房附着" align="center" prop="adbere" />
<el-table-column label="乳房间隔度" align="center" prop="spacing" min-width="120px" />
<el-table-column label="乳房评分" align="center" prop="score">
<template #header>
<div style="display: flex; align-items: center; gap: 4px; cursor: pointer;" @click="handleScoreSort">
<span>乳房评分</span>
<el-icon size="16" style="color: #409EFF;">
<ArrowUp v-if="!sortByScore || sortScoreAsc" />
<ArrowDown v-else />
</el-icon>
</div>
</template>
<template #default="scope">
<span>{{ scope.row.score }}</span>
</template>
</el-table-column>
<el-table-column label="乳房评分" align="center" prop="score" min-width="150px" sortable />
<el-table-column label="备注" align="center" prop="comment" />
<el-table-column label="技术员" align="center" prop="technician" />
<el-table-column label="创建人" align="center" prop="createBy" />
@ -177,7 +138,6 @@ import { listBreast_rating, getBreast_rating, delBreast_rating, addBreast_rating
import { checkSheepByManageTags, getVarietyOptions } from "@/api/produce/other/fixHoof"
import { listSheepfold_management as listSheepfold } from '@/api/fileManagement/sheepfold_management'
import { getCurrentInstance, reactive, ref } from "vue"
import { ArrowUp, ArrowDown } from '@element-plus/icons-vue'
const { proxy } = getCurrentInstance()
@ -193,15 +153,7 @@ const title = ref("")
const daterangeCreateTime = ref([])
const daterangeEventDate = ref([]);
const isAdd = ref(false)
//
const sortByDepth = ref(false)
const sortDepthAsc = ref(true)
//
const sortByLength = ref(false)
const sortLengthAsc = ref(true)
//
const sortByScore = ref(false)
const sortScoreAsc = ref(true)
const data = reactive({
form: {
id: null,
@ -251,19 +203,6 @@ function getList() {
queryParams.value.params["beginCreateTime"] = daterangeCreateTime.value[0]
queryParams.value.params["endCreateTime"] = daterangeCreateTime.value[1]
}
if (sortByDepth.value) {
queryParams.value.orderBy = "depth";
queryParams.value.sortDirection = sortDepthAsc.value ? "ASC" : "DESC";
} else if (sortByLength.value) {
queryParams.value.orderBy = "length";
queryParams.value.sortDirection = sortLengthAsc.value ? "ASC" : "DESC";
} else if (sortByScore.value) {
queryParams.value.orderBy = "score";
queryParams.value.sortDirection = sortScoreAsc.value ? "ASC" : "DESC";
} else {
queryParams.value.orderBy = null;
queryParams.value.sortDirection = null;
}
listBreast_rating(queryParams.value).then(response => {
breast_ratingList.value = response.rows
@ -296,49 +235,6 @@ function onManageTagsBlur() {
form.value.comment = null;
});
}
//
function handleDepthSort() {
console.log("sortByDepth before:", sortByDepth.value);
sortByLength.value = false;
sortByScore.value = false;
if (sortByDepth.value) {
sortDepthAsc.value = !sortDepthAsc.value;
} else {
sortByDepth.value = true;
sortDepthAsc.value = true;
}
queryParams.value.pageNum = 1;
console.log("sortByDepth after:", sortByDepth.value);
getList();
}
//
function handleLengthSort() {
sortByDepth.value = false;
sortByScore.value = false;
if (sortByLength.value) {
sortLengthAsc.value = !sortLengthAsc.value;
} else {
sortByLength.value = true;
sortLengthAsc.value = true;
}
queryParams.value.pageNum = 1;
getList();
}
//
function handleScoreSort() {
sortByDepth.value = false;
sortByLength.value = false;
if (sortByScore.value) {
sortScoreAsc.value = !sortScoreAsc.value;
} else {
sortByScore.value = true;
sortScoreAsc.value = true;
}
queryParams.value.pageNum = 1;
getList();
}
//
function cancel() {
@ -377,12 +273,6 @@ function resetQuery() {
daterangeCreateTime.value = []
daterangeEventDate.value = [];
proxy.resetForm("queryRef")
sortByDepth.value = false
sortByLength.value = false
sortByScore.value = false
sortDepthAsc.value = true
sortLengthAsc.value = true
sortScoreAsc.value = true
handleQuery()
}