转场,转群,改耳号,改备注,改品种部分bug修复,字段顺序调整
This commit is contained in:
@@ -10,19 +10,45 @@
|
||||
start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
|
||||
</el-form-item>
|
||||
<el-form-item label="管理耳号" prop="manageTagsList">
|
||||
<el-select v-model="queryParams.manageTagsList" multiple filterable remote reserve-keyword
|
||||
placeholder="请输入耳号,支持多选" :remote-method="searchEarNumber" :loading="earLoading" allow-create
|
||||
default-first-option style="width: 260px">
|
||||
<el-option v-for="item in earOptions" :key="item" :label="item" :value="item" />
|
||||
</el-select>
|
||||
<el-button type="text" @click="clearEarNumbers"
|
||||
v-if="queryParams.manageTagsList && queryParams.manageTagsList.length > 0" style="margin-left: 8px">
|
||||
清空
|
||||
</el-button>
|
||||
<div style="display:flex;align-items:center;gap:8px;flex-wrap:wrap;">
|
||||
<el-select v-model="queryParams.manageTagsList" multiple filterable remote reserve-keyword
|
||||
placeholder="输入耳号搜索" :remote-method="searchEarNumber" :loading="earLoading" allow-create
|
||||
default-first-option collapse-tags :max-collapse-tags="0" style="width:260px" @change="handleEarChange">
|
||||
<el-option v-for="item in earOptions" :key="item" :label="item" :value="item" />
|
||||
</el-select>
|
||||
<el-input v-model="pasteText" placeholder="或粘贴多个耳号(空格/换行/逗号分隔)" style="width:260px" @paste="handlePaste"
|
||||
@keyup.enter="handlePasteSubmit" clearable>
|
||||
<template #append>
|
||||
<el-button @click="handlePasteSubmit" :icon="Plus">添加</el-button>
|
||||
</template>
|
||||
</el-input>
|
||||
<el-tag v-if="queryParams.manageTagsList.length" type="info" effect="plain" size="large">
|
||||
已选: {{ queryParams.manageTagsList.length }} 个
|
||||
</el-tag>
|
||||
<el-button type="danger" plain :icon="Delete" @click="clearEarNumbers"
|
||||
v-if="queryParams.manageTagsList.length">
|
||||
清空全部
|
||||
</el-button>
|
||||
</div>
|
||||
<div v-if="queryParams.manageTagsList.length" class="selected-ear-numbers">
|
||||
<el-tag v-for="tag in displayedEarTags" :key="tag" closable @close="removeEarNumber(tag)" style="margin:4px"
|
||||
type="success">
|
||||
{{ tag }}
|
||||
</el-tag>
|
||||
<el-button v-if="queryParams.manageTagsList.length > defaultShowCount" type="primary" link
|
||||
@click="toggleExpand">
|
||||
{{ isExpanded ? '收起' : `展开剩余 ${queryParams.manageTagsList.length - defaultShowCount} 个` }}
|
||||
<el-icon class="el-icon--right">
|
||||
<component :is="isExpanded ? ArrowUp : ArrowDown" />
|
||||
</el-icon>
|
||||
</el-button>
|
||||
</div>
|
||||
</el-form-item>
|
||||
<el-form-item label="羊舍" prop="sheepfoldId">
|
||||
<el-select v-model="queryParams.sheepfoldId" placeholder="请选择羊舍" style="min-width:150px" clearable>
|
||||
<el-option v-for="item in sheepfoldOptions" :key="item.id" :label="item.sheepfoldName" :value="item.id" />
|
||||
<el-form-item label="性别" prop="gender">
|
||||
<el-select v-model="queryParams.gender" placeholder="请选择性别" clearable style="min-width:120px">
|
||||
<el-option label="母" value="1" />
|
||||
<el-option label="公" value="2" />
|
||||
<el-option label="阉羊" value="3" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="品种" prop="varietyId">
|
||||
@@ -30,23 +56,49 @@
|
||||
<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="sheepTypeId">
|
||||
<el-select v-model="queryParams.sheepTypeId" placeholder="请选择羊只类别" clearable style="min-width:150px">
|
||||
<el-form-item label="月龄" style="width: 308px">
|
||||
<div style="display: flex; align-items: center; gap: 8px;">
|
||||
<el-input-number v-model="queryParams.monthAgeStart" :min="0" :max="300" placeholder="最小月龄"
|
||||
style="width: 120px; flex-shrink: 0;" controls-position="right" />
|
||||
<span>-</span>
|
||||
<el-input-number v-model="queryParams.monthAgeEnd" :min="0" :max="300" placeholder="最大月龄"
|
||||
style="width: 120px; flex-shrink: 0;" controls-position="right" />
|
||||
</div>
|
||||
</el-form-item>
|
||||
<el-form-item label="羊只类型" prop="sheepTypeId">
|
||||
<el-select v-model="queryParams.sheepTypeId" placeholder="请选择羊只类型" clearable style="min-width:150px">
|
||||
<el-option v-for="type in sheepTypeList" :key="type.id" :label="type.name" :value="type.id" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="繁殖状态" prop="breedStatusName">
|
||||
<el-select v-model="queryParams.breedStatusName" placeholder="请选择繁殖状态" clearable style="min-width:150px">
|
||||
<el-option v-for="item in breedStatusOptions" :key="item.id" :label="item.label" :value="item.value" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="羊舍" prop="sheepfoldId">
|
||||
<el-select v-model="queryParams.sheepfoldId" placeholder="请选择羊舍" style="min-width:150px" clearable>
|
||||
<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="technician">
|
||||
<el-select v-model="queryParams.technician" placeholder="请选择技术员" clearable filterable style="width: 150px">
|
||||
<el-option v-for="item in technicalOptions" :key="item.value" :label="item.label" :value="item.value" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="是否在群" prop="isDelete">
|
||||
<el-select v-model="queryParams.isDelete" placeholder="全部" clearable style="min-width:120px">
|
||||
<el-option label="全部" value="" />
|
||||
<el-option label="在群" :value="0" />
|
||||
<el-option label="离群" :value="1" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
|
||||
<el-button icon="Refresh" @click="resetQuery">重置</el-button>
|
||||
<!-- <el-button icon="Refresh" @click="resetQuery">重置</el-button> -->
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<div v-if="queryParams.manageTagsList && queryParams.manageTagsList.length > 0" class="selected-ear-numbers">
|
||||
<span style="margin-right: 10px; color: #606266;">已选耳号:</span>
|
||||
<el-tag v-for="tag in queryParams.manageTagsList" :key="tag" closable @close="removeEarNumber(tag)"
|
||||
style="margin-right: 8px;">
|
||||
{{ tag }}
|
||||
</el-tag>
|
||||
</div>
|
||||
<el-row :gutter="10" class="mb8">
|
||||
<el-col :span="1.5">
|
||||
<el-button type="primary" plain icon="Plus" @click="handleAdd"
|
||||
@@ -64,6 +116,10 @@
|
||||
<el-button type="warning" plain icon="Download" @click="handleExport"
|
||||
v-hasPermi="['body_measure:body_measure:export']">导出</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button type="success" plain icon="Upload" @click="handleImport"
|
||||
v-hasPermi="['body_measure:body_measure:import']">导入</el-button>
|
||||
</el-col>
|
||||
<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
|
||||
</el-row>
|
||||
|
||||
@@ -73,7 +129,12 @@
|
||||
<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" 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="sheepTypeName" width="100" />
|
||||
<el-table-column label="性别" align="center" prop="gender" width="100">
|
||||
<template #default="scope">
|
||||
<span>{{ genderMap[scope.row.gender] || '未知' }}</span>
|
||||
@@ -103,11 +164,7 @@
|
||||
<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" width="100" />
|
||||
<el-table-column label="创建时间" align="center" prop="createTime" width="180">
|
||||
<template #default="scope">
|
||||
@@ -161,7 +218,10 @@
|
||||
<el-input v-model="form.pipeLength" placeholder="请输入管围" :disabled="!isAdd" clearable />
|
||||
</el-form-item>
|
||||
<el-form-item label="技术员" prop="technician">
|
||||
<el-input v-model="form.technician" placeholder="请输入技术员" :disabled="!isAdd" clearable />
|
||||
<el-select v-model="form.technician" placeholder="请选择技术员" :disabled="!isAdd" clearable filterable
|
||||
style="width: 100%">
|
||||
<el-option v-for="item in technicalOptions" :key="item.value" :label="item.label" :value="item.value" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
|
||||
</el-col>
|
||||
@@ -205,16 +265,61 @@
|
||||
</div>
|
||||
</template>
|
||||
</el-dialog>
|
||||
<!-- 导入对话框 -->
|
||||
<el-dialog :title="upload.title" v-model="upload.open" width="400px" append-to-body>
|
||||
<el-upload ref="uploadRef" :limit="1" accept=".xlsx, .xls" :headers="upload.headers" :action="upload.url"
|
||||
:disabled="upload.isUploading" :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess"
|
||||
:auto-upload="false" drag>
|
||||
<el-icon class="el-icon--upload"><upload-filled /></el-icon>
|
||||
<div class="el-upload__text">将文件拖到此处,或<em>点击上传</em></div>
|
||||
<template #tip>
|
||||
<div class="el-upload__tip text-center">
|
||||
<span>仅允许导入xls、xlsx格式文件。</span>
|
||||
</div>
|
||||
</template>
|
||||
</el-upload>
|
||||
<template #footer>
|
||||
<div class="dialog-footer">
|
||||
<el-button type="primary" @click="submitFileForm">确 定</el-button>
|
||||
</div>
|
||||
</template>
|
||||
</el-dialog>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup name="Body_measure">
|
||||
import { listBody_measure, getBody_measure, delBody_measure, addBody_measure, updateBody_measure, getSheepTypeList, searchEarNumbers } from "@/api/produce/bodyManage/body_measure"
|
||||
import { listBody_measure, getBody_measure, delBody_measure, addBody_measure, updateBody_measure, getSheepTypeList, searchEarNumbers, listBreedStatus } from "@/api/produce/bodyManage/body_measure"
|
||||
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 { getUserByPost } from '@/api/common/user'
|
||||
import { Plus, Delete, ArrowUp, ArrowDown } from '@element-plus/icons-vue'
|
||||
import { nextTick } from 'vue'
|
||||
import dayjs from 'dayjs'
|
||||
import { UploadFilled } from '@element-plus/icons-vue'
|
||||
import { getToken } from "@/utils/auth"
|
||||
|
||||
// 技术员下拉选项
|
||||
const technicalOptions = ref([])
|
||||
|
||||
// 获取技术员列表(岗位编码:techs)
|
||||
const fetchTechnicalList = () => {
|
||||
getUserByPost({ postCode: "techs" })
|
||||
.then(res => {
|
||||
if (res.code === 200 && Array.isArray(res.data)) {
|
||||
technicalOptions.value = res.data.map(item => ({
|
||||
value: item.nickName,
|
||||
label: item.nickName
|
||||
}))
|
||||
} else {
|
||||
technicalOptions.value = []
|
||||
}
|
||||
})
|
||||
.catch(() => {
|
||||
technicalOptions.value = []
|
||||
})
|
||||
}
|
||||
const { proxy } = getCurrentInstance()
|
||||
|
||||
const body_measureList = ref([])
|
||||
@@ -229,12 +334,29 @@ const title = ref("")
|
||||
const daterangeCreateTime = ref([])
|
||||
const isAdd = ref(false)
|
||||
const daterangeMeasureDate = ref([]);
|
||||
const breedStatusOptions = ref([])
|
||||
|
||||
const genderMap = {
|
||||
1: '母',
|
||||
2: '公',
|
||||
3: '阉羊'
|
||||
};
|
||||
const pasteText = ref('')
|
||||
const isExpanded = ref(false)
|
||||
const defaultShowCount = 2
|
||||
const displayedEarTags = computed(() => {
|
||||
const list = queryParams.value.manageTagsList
|
||||
if (isExpanded.value || list.length <= defaultShowCount) return list
|
||||
return list.slice(0, defaultShowCount)
|
||||
})
|
||||
|
||||
const upload = reactive({
|
||||
open: false,
|
||||
title: '',
|
||||
isUploading: false,
|
||||
headers: { Authorization: "Bearer " + getToken() },
|
||||
url: import.meta.env.VITE_APP_BASE_API + '/body_measure/body_measure/import'
|
||||
})
|
||||
|
||||
const data = reactive({
|
||||
form: { manageTags: null, technician: null },
|
||||
@@ -246,7 +368,12 @@ const data = reactive({
|
||||
varietyId: null,
|
||||
manageTags: null,
|
||||
measureDate: null,
|
||||
createTime: null
|
||||
createTime: null,
|
||||
manageTagsList: [],
|
||||
gender: null,
|
||||
technician: null,
|
||||
isDelete: null,
|
||||
breedStatusName: null,
|
||||
},
|
||||
rules: {
|
||||
manageTags: [
|
||||
@@ -342,6 +469,18 @@ function reset() {
|
||||
|
||||
/** 搜索按钮操作 */
|
||||
function handleQuery() {
|
||||
if (queryParams.value.monthAgeStart !== null) {
|
||||
queryParams.value.params["monthAgeStart"] = queryParams.value.monthAgeStart
|
||||
}
|
||||
if (queryParams.value.monthAgeEnd !== null) {
|
||||
queryParams.value.params["monthAgeEnd"] = queryParams.value.monthAgeEnd
|
||||
}
|
||||
if (queryParams.value.breedStatusName) {
|
||||
queryParams.value.params = {
|
||||
...queryParams.value.params,
|
||||
breedStatusName: queryParams.value.breedStatusName
|
||||
}
|
||||
}
|
||||
queryParams.value.pageNum = 1
|
||||
getList()
|
||||
}
|
||||
@@ -354,7 +493,12 @@ function resetQuery() {
|
||||
queryParams.value.varietyId = null;
|
||||
data.varietyName = '';
|
||||
daterangeMeasureDate.value = [];
|
||||
queryParams.value.manageTagsList = []
|
||||
queryParams.value.manageTagsList = [];
|
||||
queryParams.value.gender = null;
|
||||
queryParams.value.technician = null;
|
||||
queryParams.value.isDelete = null;
|
||||
queryParams.value.monthAgeStart = null
|
||||
queryParams.value.monthAgeEnd = null
|
||||
proxy.resetForm("queryRef");
|
||||
handleQuery();
|
||||
}
|
||||
@@ -372,6 +516,7 @@ function handleAdd() {
|
||||
isAdd.value = true
|
||||
open.value = true
|
||||
title.value = "添加体尺测量"
|
||||
form.value.measureDate = dayjs().format('YYYY-MM-DD')
|
||||
}
|
||||
|
||||
/** 修改按钮操作 */
|
||||
@@ -457,25 +602,110 @@ function searchEarNumber(query) {
|
||||
earOptions.value = res.data || []
|
||||
}).finally(() => earLoading.value = false)
|
||||
}
|
||||
function handlePaste() {
|
||||
nextTick(() => handlePasteSubmit())
|
||||
}
|
||||
|
||||
function handlePasteSubmit() {
|
||||
if (!pasteText.value.trim()) return
|
||||
const separators = /[\s,,\n\r\t]+/
|
||||
const raw = pasteText.value.trim().split(separators).filter(v => v)
|
||||
const exist = new Set(queryParams.value.manageTagsList)
|
||||
const adds = []
|
||||
const dups = []
|
||||
raw.forEach(v => {
|
||||
if (!exist.has(v)) { adds.push(v); exist.add(v) }
|
||||
else dups.push(v)
|
||||
})
|
||||
if (adds.length) {
|
||||
queryParams.value.manageTagsList = [...queryParams.value.manageTagsList, ...adds]
|
||||
proxy.$modal.msgSuccess(`成功添加 ${adds.length} 个耳号${dups.length ? `,已忽略 ${dups.length} 个重复` : ''}`)
|
||||
} else if (dups.length) {
|
||||
proxy.$modal.msgWarning('所有耳号均已存在')
|
||||
}
|
||||
pasteText.value = ''
|
||||
}
|
||||
|
||||
function toggleExpand() {
|
||||
isExpanded.value = !isExpanded.value
|
||||
}
|
||||
|
||||
function handleEarChange(val) {
|
||||
queryParams.value.manageTagsList = [...new Set(val)]
|
||||
}
|
||||
function clearEarNumbers() {
|
||||
queryParams.value.manageTagsList = []
|
||||
}
|
||||
|
||||
function removeEarNumber(tag) {
|
||||
const idx = queryParams.value.manageTagsList.indexOf(tag)
|
||||
if (idx > -1) queryParams.value.manageTagsList.splice(idx, 1)
|
||||
}
|
||||
|
||||
/** 导入按钮操作 */
|
||||
function handleImport() {
|
||||
upload.title = "体尺测量数据导入"
|
||||
upload.open = true
|
||||
}
|
||||
|
||||
/** 下载模板 */
|
||||
function importTemplate() {
|
||||
proxy.download('body_measure/body_measure/importTemplate', {}, `体尺测量导入模板_${new Date().getTime()}.xlsx`)
|
||||
}
|
||||
|
||||
/** 文件上传中处理 */
|
||||
function handleFileUploadProgress(event, file, fileList) {
|
||||
upload.isUploading = true
|
||||
}
|
||||
|
||||
/** 文件上传成功处理 */
|
||||
function handleFileSuccess(response, file, fileList) {
|
||||
upload.open = false
|
||||
upload.isUploading = false
|
||||
proxy.$refs["uploadRef"].clearFiles()
|
||||
proxy.$alert(response.msg, "导入结果", { dangerouslyUseHTMLString: true })
|
||||
getList()
|
||||
}
|
||||
|
||||
/** 提交上传文件 */
|
||||
function submitFileForm() {
|
||||
proxy.$refs["uploadRef"].submit()
|
||||
}
|
||||
|
||||
// 加载繁殖状态
|
||||
function loadBreedStatusOptions() {
|
||||
listBreedStatus().then(res => {
|
||||
breedStatusOptions.value = res.data || []
|
||||
})
|
||||
}
|
||||
onMounted(() => {
|
||||
getSheepfoldOptions()
|
||||
loadSheepTypeList()
|
||||
loadVarietyOptions()
|
||||
fetchTechnicalList()
|
||||
loadBreedStatusOptions()
|
||||
getList()
|
||||
})
|
||||
</script>
|
||||
<style scoped>
|
||||
.selected-ear-numbers{
|
||||
margin-bottom: 16px;
|
||||
padding: 10px;
|
||||
.selected-ear-numbers {
|
||||
max-height: 150px;
|
||||
overflow-y: auto;
|
||||
padding: 8px;
|
||||
background: #f5f7fa;
|
||||
border-radius: 4px;
|
||||
border: 1px dashed #dcdfe6;
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.selected-ear-numbers::-webkit-scrollbar {
|
||||
width: 6px;
|
||||
}
|
||||
|
||||
.selected-ear-numbers::-webkit-scrollbar-thumb {
|
||||
background-color: #dcdfe6;
|
||||
border-radius: 3px;
|
||||
}
|
||||
</style>
|
||||
Reference in New Issue
Block a user