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

Compare commits

base: admin:9a1eff0fc6b23a2a35c94b37af9539ae48df9ec7
Branches Tags
admin:main
..
compare: admin:5f289eaadb4ff5d9623192b6a9e9389c58e88e6c
Branches Tags
admin:main

No commits in common. "9a1eff0fc6b23a2a35c94b37af9539ae48df9ec7" and "5f289eaadb4ff5d9623192b6a9e9389c58e88e6c" have entirely different histories.
9a1eff0fc6 ... 5f289eaadb

11 changed files with 353 additions and 656 deletions
Show Stats Expand all files Collapse all files

44
src/views/produce/bodyManage/body_measure/index.vue
View File

@ -4,14 +4,6 @@
<!-- <el-form-item label="羊只id" prop="sheepId">
<el-input v-model="queryParams.sheepId" placeholder="请输入羊只id" clearable @keyup.enter="handleQuery" />
</el-form-item> -->
<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="daterangeMeasureDate" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
</el-form-item>
<el-form-item label="管理耳号" prop="manageTags">
<el-input v-model="queryParams.manageTags" placeholder="请输入管理耳号" clearable @keyup.enter="handleQuery"
style="max-width: 160px;" />
@ -21,16 +13,24 @@
<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>
</el-form-item>
<el-form-item label="测量日期" style="width: 308px">
<el-date-picker v-model="daterangeMeasureDate" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
</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="创建时间" 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>
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
<el-button icon="Refresh" @click="resetQuery">重置</el-button>
@ -59,20 +59,17 @@
<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="createTime" width="180" fixed>
<template #default="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<!-- <el-table-column label="${comment}" align="center" prop="id" /> -->
<!-- <el-table-column label="羊只id" align="center" prop="sheepId" /> -->
<el-table-column label="管理耳号" align="center" prop="manageTags" fixed min-width="100px" />
<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="eventType" width="120" />
<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="manageTags" min-width="100px" />
<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="eventType" width="120" />
<el-table-column label="羊只类别" align="center" prop="sheepTypeName" />
<el-table-column label="性别" align="center">
<template #default="scope">
@ -93,21 +90,25 @@
<el-table-column label="尻高" align="center" prop="rumpHeignt" />
<el-table-column label="腰角宽" align="center" prop="hipWidth" />
<el-table-column label="十字部高" align="center" prop="hipCrossHeight" />
<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 #default="scope">
<span>{{ scope.row.lactationDay || '-' }}</span>
</template>
</el-table-column>
<el-table-column label="怀孕天数" align="center" prop="gestationDay" width="100">
<template #default="scope">
<span>{{ scope.row.gestationDay || '-' }}</span>
</template>
</el-table-column>
<el-table-column label="配后天数" align="center" prop="postMatingDay" width="100">
<template #default="scope">
<span>{{ scope.row.postMatingDay || '-' }}</span>
@ -116,6 +117,11 @@
<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="createBy" />
<el-table-column label="创建时间" align="center" prop="createTime" width="180">
<template #default="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" min-width="130px">
<template #default="scope">
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
@ -405,7 +411,7 @@ function submitForm() {
/** 删除按钮操作 */
function handleDelete(row) {
const _ids = row.id || ids.value
proxy.$modal.confirm('是否确认删除这条记录数据').then(function () {
proxy.$modal.confirm('是否确认删除体尺测量编号为"' + _ids + '"的数据项？').then(function () {
return delBody_measure(_ids)
}).then(() => {
getList()

41
src/views/produce/bodyManage/body_score/index.vue
View File

@ -4,14 +4,6 @@
<!-- <el-form-item label="羊只id" prop="sheepId">
<el-input v-model="queryParams.sheepId" placeholder="请输入羊只id" clearable @keyup.enter="handleQuery" />
</el-form-item> -->
<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>
</el-form-item>
<el-form-item label="管理耳号" prop="manageTags">
<el-input v-model="queryParams.manageTags" placeholder="请输入管理耳号" clearable @keyup.enter="handleQuery"
style="max-width: 160px;" />
@ -21,15 +13,26 @@
<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-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>
</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>
<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" />
</el-select>
</el-form-item>
<!-- <el-form-item label="羊舍id" prop="sheepfold">
<el-input v-model="queryParams.sheepfold" placeholder="请输入羊舍id" clearable @keyup.enter="handleQuery" />
</el-form-item> -->
<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>
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
<el-button icon="Refresh" @click="resetQuery">重置</el-button>
@ -60,25 +63,25 @@
<el-table-column type="selection" width="55" align="center" />
<!-- <el-table-column label="${comment}" align="center" prop="id" /> -->
<!-- <el-table-column label="羊只id" align="center" prop="sheepId" /> -->
<el-table-column label="创建时间" align="center" prop="createTime" min-width="130px" fixed>
<template #default="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="管理耳号" align="center" prop="manageTags" min-width="100px" fixed />
<el-table-column label="品种" align="center" prop="varietyName" />
<el-table-column label="事件类型" align="center" prop="eventType" />
<el-table-column label="事件日期" align="center" prop="datetime" min-width="120px">
<template #default="scope">
<span>{{ parseTime(scope.row.datetime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="管理耳号" align="center" prop="manageTags" min-width="100px" />
<el-table-column label="品种" align="center" prop="varietyName" />
<el-table-column label="事件类型" align="center" prop="eventType" />
<el-table-column label="体况评分" align="center" prop="score" />
<!-- <el-table-column label="羊舍id" align="center" prop="sheepfold" /> -->
<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" />
<el-table-column label="创建人" align="center" prop="createBy" />
<el-table-column label="创建时间" align="center" prop="createTime" min-width="130px">
<template #default="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" min-width="150px" fixed="right">
<template #default="scope">
<!-- <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
@ -340,7 +343,7 @@ function submitForm() {
/** 删除按钮操作 */
function handleDelete(row) {
const _ids = row.id || ids.value
proxy.$modal.confirm('是否确认删除这条记录数据').then(function () {
proxy.$modal.confirm('是否确认删除体况评分编号为"' + _ids + '"的数据项？').then(function () {
return delBody_score(_ids)
}).then(() => {
getList()

37
src/views/produce/bodyManage/breast_rating/index.vue
View File

@ -4,14 +4,6 @@
<!-- <el-form-item label="羊只id" prop="sheepId">
<el-input v-model="queryParams.sheepId" placeholder="请输入羊只id" clearable @keyup.enter="handleQuery" />
</el-form-item> -->
<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="daterangeEventDate" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
</el-form-item>
<el-form-item label="管理耳号" prop="manageTags">
<el-input v-model="queryParams.manageTags" placeholder="请输入耳号搜索" clearable @keyup.enter="handleQuery"
style="max-width: 160px;" />
@ -21,16 +13,25 @@
<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="事件日期" style="width: 308px">
<el-date-picker v-model="daterangeEventDate" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
</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="创建时间" 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>
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
<el-button icon="Refresh" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" plain icon="Plus" @click="handleAdd"
@ -53,19 +54,16 @@
<el-table v-loading="loading" :data="breast_ratingList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="创建时间" align="center" prop="createTime" min-width="150" fixed>
<template #default="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<!-- <el-table-column label="${comment}" align="center" prop="id" /> -->
<!-- <el-table-column label="羊只id" align="center" prop="sheepId" /> -->
<el-table-column label="管理耳号" align="center" prop="manageTags" min-width="100px" fixed />
<el-table-column label="品种" align="center" prop="varietyName" />
<el-table-column label="事件类型" align="center" prop="eventType" />
<el-table-column label="事件日期" align="center" prop="eventDate" min-width="120px">
<template #default="scope">
<span>{{ parseTime(scope.row.eventDate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="管理耳号" align="center" prop="manageTags" min-width="100px" />
<el-table-column label="品种" align="center" prop="varietyName" />
<el-table-column label="事件类型" align="center" prop="eventType" />
<el-table-column label="羊舍" align="center" prop="sheepfoldName" min-width="120px" />
<el-table-column label="乳房深度" align="center" prop="depth" />
<el-table-column label="乳房长度" align="center" prop="length" />
@ -76,6 +74,11 @@
<el-table-column label="备注" align="center" prop="comment" />
<el-table-column label="技术员" align="center" prop="technician" />
<el-table-column label="创建人" align="center" prop="createBy" />
<el-table-column label="创建时间" align="center" prop="createTime" min-width="150">
<template #default="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" min-width="120px" fixed="right">
<template #default="scope">
<!-- <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
@ -332,7 +335,7 @@ function submitForm() {
/** 删除按钮操作 */
function handleDelete(row) {
const _ids = row.id || ids.value
proxy.$modal.confirm('是否确认删除这条记录数据').then(function () {
proxy.$modal.confirm('是否确认删除乳房评分编号为"' + _ids + '"的数据项？').then(function () {
return delBreast_rating(_ids)
}).then(() => {
getList()

70
src/views/produce/manage_sheep/add_sheep/index.vue
View File

@ -61,7 +61,7 @@
</el-col>
<el-col :span="10">
<el-form-item label="胎次" prop="parity">
<el-input-number v-model="form.parity" :min="0" label="胎次" />
<el-input v-model="form.parity" placeholder="请输入胎次" />
</el-form-item>
</el-col>
</el-row>
@ -75,20 +75,13 @@
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item label="羊只类别" prop="typeId">
<el-select v-model="form.typeId" placeholder="请选择羊只类别" clearable>
<el-option v-for="type in sheepTypeList" :key="type.id" :label="type.name" :value="Number(type.id)" />
</el-select>
<el-form-item label="入群日期" prop="joinDate">
<el-date-picker v-model="form.joinDate" type="date" placeholder="选择入群日期" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="10">
<el-form-item label="入群日期" prop="joinDate">
<el-date-picker v-model="form.joinDate" type="date" placeholder="选择入群日期" />
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item label="技术员" prop="technician">
<el-input v-model="form.technician" placeholder="请输入技术员" />
@ -109,27 +102,26 @@
<el-button @click="resetForm">重置</el-button>
</el-form-item>
</el-form>
<!-- 导入弹窗 -->
<el-dialog title="导入羊只信息" v-model="importOpen" width="400px" append-to-body>
<el-upload ref="uploadRef" :limit="1" accept=".xlsx,.xls" :action="importUrl" :headers="headers"
:auto-upload="false" :on-success="handleImportSuccess" :on-error="handleImportError" drag>
<i class="el-icon-upload" />
<div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
</el-upload>
<template #footer>
<el-button type="info" @click="downloadTemplate">下载模板</el-button>
<el-button type="primary" @click="submitUpload">确 定</el-button>
</template>
</el-dialog>
</div>
<!-- 导入弹窗 -->
<el-dialog title="导入羊只信息" v-model="importOpen" width="400px" append-to-body>
<el-upload ref="uploadRef" :limit="1" accept=".xlsx,.xls" :action="importUrl" :headers="headers"
:auto-upload="false" :on-success="handleImportSuccess" :on-error="handleImportError" drag>
<i class="el-icon-upload" />
<div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
</el-upload>
<template #footer>
<el-button type="info" @click="downloadTemplate">下载模板</el-button>
<el-button type="primary" @click="submitUpload">确 定</el-button>
</template>
</el-dialog>
</template>
<script setup>
import { ref, getCurrentInstance } from 'vue'
import { ref, onMounted, getCurrentInstance } from 'vue'
import request from '@/utils/request'
import { addSheep, exportSheepForm } from '@/api/produce/manage_sheep/add_sheep'
import { getSheepTypeList } from "@/api/produce/bodyManage/body_measure"
import { listSheepfold_management as listSheepfold } from '@/api/fileManagement/sheepfold_management'
import { getToken } from '@/utils/auth'
@ -145,7 +137,6 @@ const form = ref({
gender: '',
parity: '',
varietyId: '',
typeId: null,
joinDate: '',
comment: '',
technician: ''
@ -162,9 +153,8 @@ const rules = {
birthday: [{ required: true, message: '请选择出生日期', trigger: 'change' }],
gender: [{ required: true, message: '请选择性别', trigger: 'change' }],
varietyId: [{ required: true, message: '请选择品种', trigger: 'change' }],
typeId: [{ required: true, message: '请选择羊只类别', trigger: 'change' }],
joinDate: [{ required: true, message: '请选择入群日期', trigger: 'change' }],
technician: [{ required: true, message: '请输入技术员', trigger: 'change' }],
joinDate:[{ required: true, message: '请选择入群日期', trigger: 'change' }],
technician:[{ required: true, message: '请输入技术员', trigger: 'change' }],
}
// 校验耳号是否存在
@ -221,16 +211,6 @@ function getVarietyOptions() {
})
}
// 加载羊只类别数据
const sheepTypeList = ref([]);
function loadSheepTypeList() {
getSheepTypeList().then(response => {
sheepTypeList.value = response.rows || [];
}).catch(error => {
console.error('加载羊只类别失败', error);
});
}
//确保日期格式一致
function formatDate(date) {
if (!date) return null;
@ -274,9 +254,8 @@ function resetForm() {
bornWeight: '',
birthday: '',
gender: '',
parity: 0,
parity: '',
varietyId: '',
typeId: null,
joinDate: '',
comment: '',
technician: ''
@ -333,11 +312,10 @@ function handleImportError(err) {
proxy.$modal.msgError('导入失败：' + msg)
}
onMounted(() => {
getSheepfoldOptions()
loadSheepTypeList()
getVarietyOptions()
})
getSheepfoldOptions()
getVarietyOptions()
</script>
<style scoped>

44
src/views/produce/manage_sheep/changeComment/index.vue
View File

@ -9,10 +9,6 @@
@keyup.enter="handleQuery"
/>
</el-form-item> -->
<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="管理耳号" prop="manageTags">
<el-input v-model="queryParams.manageTags" placeholder="请输入管理耳号" clearable @keyup.enter="handleQuery"
style="max-width: 160px;" />
@ -25,10 +21,9 @@
<el-input v-model="queryParams.oldComment" placeholder="请输入原备注" clearable @keyup.enter="handleQuery"
style="max-width: 160px;" />
</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="fold in sheepfoldOptions" :key="fold.id" :label="fold.sheepfoldName" :value="fold.id" />
</el-select>
<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>
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@ -60,17 +55,15 @@
<el-table-column type="selection" width="55" align="center" />
<!-- <el-table-column label="${comment}" align="center" prop="id" /> -->
<!-- <el-table-column label="羊只id" align="center" prop="sheepId" /> -->
<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" prop="manageTags" />
<el-table-column label="羊舍" align="center" prop="sheepfoldName" />
<el-table-column label="事件类型" align="center" prop="eventType" width="120" />
<el-table-column label="新备注" align="center" prop="newComment" />
<el-table-column label="原备注" align="center" prop="oldComment" />
<el-table-column label="创建人" align="center" prop="createBy" />
<el-table-column label="创建时间" align="center" prop="createTime" width="180">
<template #default="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template #default="scope">
<!-- <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
@ -113,7 +106,6 @@
<script setup name="ChangeComment">
import { listChangeComment, getChangeComment, delChangeComment, addChangeComment, updateChangeComment } from "@/api/produce/manage_sheep/changeComment"
import { getSheepByManageTags } from "@/api/produce/manage_sheep/changeVariety"
import { listSheepfold_management as listSheepfold } from '@/api/fileManagement/sheepfold_management'
const { proxy } = getCurrentInstance()
@ -135,7 +127,6 @@ const data = reactive({
pageSize: 10,
sheepId: null,
manageTags: null,
sheepfoldId: null,
newComment: null,
oldComment: null,
createTime: null
@ -160,9 +151,6 @@ function getList() {
queryParams.value.params["beginCreateTime"] = daterangeCreateTime.value[0]
queryParams.value.params["endCreateTime"] = daterangeCreateTime.value[1]
}
if (queryParams.value.sheepfoldId) {
queryParams.value.params["sheepfoldId"] = queryParams.value.sheepfoldId;
}
listChangeComment(queryParams.value).then(response => {
changeCommentList.value = response.rows
total.value = response.total
@ -220,7 +208,6 @@ function handleQuery() {
/** 重置按钮操作 */
function resetQuery() {
daterangeCreateTime.value = []
queryParams.value.sheepfoldId = null
proxy.resetForm("queryRef")
handleQuery()
}
@ -283,7 +270,7 @@ function submitForm() {
/** 删除按钮操作 */
function handleDelete(row) {
const _ids = row.id || ids.value
proxy.$modal.confirm('是否确认删除这条记录数据').then(function () {
proxy.$modal.confirm('是否确认删除改备注编号为"' + _ids + '"的数据项？').then(function () {
return delChangeComment(_ids)
}).then(() => {
getList()
@ -298,16 +285,5 @@ function handleExport() {
}, `changeComment_${new Date().getTime()}.xlsx`)
}
//加载羊舍数据
const sheepfoldOptions = ref([])
function getSheepfoldOptions() {
listSheepfold({ pageNum: 1, pageSize: 9999 }).then(res => {
sheepfoldOptions.value = res.rows
})
}
onMounted(() => {
getSheepfoldOptions();
getList();
});
getList()
</script>

44
src/views/produce/manage_sheep/changeEar/index.vue
View File

@ -4,10 +4,6 @@
<!-- <el-form-item label="羊只id" prop="sheepId">
<el-input v-model="queryParams.sheepId" placeholder="请输入羊只id" clearable @keyup.enter="handleQuery" />
</el-form-item> -->
<el-form-item label="创建时间" style="width: 300px">
<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="耳号" prop="manageTag">
<el-input v-model="queryParams.manageTags" placeholder="请输入耳号" clearable @keyup.enter="handleQuery"
style="max-width: 160px;" />
@ -20,10 +16,9 @@
<el-input v-model="queryParams.oldTag" placeholder="请输入旧耳号" clearable @keyup.enter="handleQuery"
style="max-width: 160px;" />
</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="fold in sheepfoldOptions" :key="fold.id" :label="fold.sheepfoldName" :value="fold.id" />
</el-select>
<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>
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@ -55,14 +50,7 @@
<el-table-column type="selection" width="55" align="center" />
<!-- <el-table-column label="id" align="center" prop="id" />
<el-table-column label="羊只id" align="center" prop="sheepId" /> -->
<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" prop="manageTags" />
<el-table-column label="羊舍" align="center" prop="sheepfoldName" />
<el-table-column label="事件类型" align="center" prop="eventType" />
<el-table-column label="耳号类型" align="center" prop="earType">
<template #default="scope">
{{ scope.row.earType === 0 ? '电子耳号' : '管理耳号' }}
@ -72,6 +60,11 @@
<el-table-column label="旧耳号" align="center" prop="oldTag" />
<el-table-column label="备注" align="center" prop="comment" />
<el-table-column label="创建人" align="center" prop="createBy" />
<el-table-column label="创建时间" align="center" prop="createTime" width="180">
<template #default="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template #default="scope">
<!-- <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
@ -94,6 +87,7 @@
<el-form-item label="耳号" prop="earNumber">
<el-input v-model="form.earNumber" placeholder="请输入管理耳号或电子耳号" @change="fetchOldTag" :disabled="!isAddMode" />
</el-form-item>
<el-form-item label="耳号类型" prop="earType">
<el-select v-model="form.earType" placeholder="请选择耳号类型" @change="fetchOldTag" :disabled="!isAddMode">
<el-option label="电子耳号" :value="0"></el-option>
@ -104,7 +98,7 @@
<el-input v-model="form.newTag" placeholder="请输入新耳号/电子耳号" @blur="checkNewTagExists" :disabled="!isAddMode" />
</el-form-item>
<el-form-item label="旧耳号" prop="oldTag">
<el-input v-model="form.oldTag" placeholder="请输入旧耳号/电子耳号" disabled />
<el-input v-model="form.oldTag" placeholder="请输入旧耳号/电子耳号" disabled/>
</el-form-item>
<el-form-item label="备注" prop="comment" v-if="!isAddMode">
<el-input v-model="form.comment" type="textarea" placeholder="请输入内容" :disabled="!isAddMode" />
@ -122,7 +116,7 @@
<script setup name="ChangeEar">
import { listChangeEar, getChangeEar, delChangeEar, addChangeEar, updateChangeEar, getSheepByEarNumber, checkTagExists } from "@/api/produce/manage_sheep/changeEar"
import { listSheepfold_management as listSheepfold } from '@/api/fileManagement/sheepfold_management'
const { proxy } = getCurrentInstance()
const changeEarList = ref([])
@ -144,7 +138,6 @@ const data = reactive({
pageSize: 10,
manageTags: null,
// sheepId: null,
sheepfoldId: null,
earType: null,
newTag: null,
oldTag: null,
@ -175,9 +168,6 @@ async function getList() {
if (queryParams.value.manageTags) {
queryParams.value.params["manageTags"] = queryParams.value.manageTags;
}
if (queryParams.value.sheepfoldId) {
queryParams.value.params["sheepfoldId"] = queryParams.value.sheepfoldId;
}
if (daterangeCreateTime.value && daterangeCreateTime.value.length > 0) {
queryParams.value.params["beginCreateTime"] = daterangeCreateTime.value[0];
queryParams.value.params["endCreateTime"] = daterangeCreateTime.value[1];
@ -224,7 +214,7 @@ function handleQuery() {
/** 重置按钮操作 */
function resetQuery() {
daterangeCreateTime.value = []
queryParams.value.sheepfoldName = null
queryParams.value.manageTags = null
queryParams.value.newTag = null
queryParams.value.oldTag = null
@ -357,7 +347,7 @@ function fetchOldTag() {
/** 删除按钮操作 */
function handleDelete(row) {
const _ids = row.id || ids.value
proxy.$modal.confirm('是否确认删除这条记录数据').then(function () {
proxy.$modal.confirm('是否确认删除修改电子耳号记录编号为"' + _ids + '"的数据项？').then(function () {
return delChangeEar(_ids)
}).then(() => {
getList()
@ -372,16 +362,8 @@ function handleExport() {
}, `changeEar_${new Date().getTime()}.xlsx`)
}
//加载羊舍数据
const sheepfoldOptions = ref([])
function getSheepfoldOptions() {
listSheepfold({ pageNum: 1, pageSize: 9999 }).then(res => {
sheepfoldOptions.value = res.rows
})
}
onMounted(() => {
getSheepfoldOptions();
getList();
});
</script>

43
src/views/produce/manage_sheep/changeVariety/index.vue
View File

@ -9,10 +9,6 @@
@keyup.enter="handleQuery"
/>
</el-form-item> -->
<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="管理耳号" prop="manageTags">
<el-input v-model="queryParams.manageTags" placeholder="请输入管理耳号" clearable @keyup.enter="handleQuery"
style="width: 150px;" />
@ -27,10 +23,9 @@
<el-option v-for="item in varietyOptions" :key="item.value" :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="fold in sheepfoldOptions" :key="fold.id" :label="fold.sheepfoldName" :value="fold.id" />
</el-select>
<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>
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@ -62,18 +57,16 @@
<el-table-column type="selection" width="55" align="center" />
<!-- <el-table-column label="${comment}" align="center" prop="id" />
<el-table-column label="羊只id" align="center" prop="sheepId" /> -->
<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" prop="manageTags" />
<el-table-column label="羊舍" align="center" prop="sheepfoldName" />
<el-table-column label="事件类型" align="center" prop="eventType" width="120" />
<el-table-column label="原品种" align="center" prop="varietyOld" />
<el-table-column label="新品种" align="center" prop="varietyNew" />
<el-table-column label="备注" align="center" prop="comment" />
<el-table-column label="创建人" align="center" prop="createBy" />
<el-table-column label="创建日期" align="center" prop="createTime" width="180">
<template #default="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template #default="scope">
<!-- <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
@ -97,7 +90,7 @@
<el-input v-model="form.manageTags" placeholder="请输入管理耳号" @blur="onManageTagsBlur" :disabled="!isAdd" />
</el-form-item>
<el-form-item label="原品种" prop="varietyOld">
<el-input v-model="form.varietyOld" placeholder="请输入原品种" disabled />
<el-input v-model="form.varietyOld" placeholder="请输入原品种" disabled/>
</el-form-item>
<el-form-item label="新品种" prop="varietyNew">
<el-select v-model="form.varietyNew" placeholder="请选择新品种" clearable filterable :disabled="!isAdd">
@ -120,7 +113,6 @@
<script setup name="ChangeVariety">
import { listChangeVariety, getChangeVariety, delChangeVariety, addChangeVariety, updateChangeVariety, getSheepByManageTags } from "@/api/produce/manage_sheep/changeVariety"
import { listSheepfold_management as listSheepfold } from '@/api/fileManagement/sheepfold_management'
import { listVariety } from '@/api/variety/variety'
const { proxy } = getCurrentInstance()
@ -147,7 +139,6 @@ const data = reactive({
pageSize: 10,
// sheepId: null,
manageTags: null,
sheepfoldId: null,
varietyOld: null,
varietyNew: null,
createTime: null
@ -175,9 +166,6 @@ function getList() {
queryParams.value.params["beginCreateTime"] = daterangeCreateTime.value[0]
queryParams.value.params["endCreateTime"] = daterangeCreateTime.value[1]
}
if (queryParams.value.sheepfoldId) {
queryParams.value.params["sheepfoldId"] = queryParams.value.sheepfoldId;
}
listChangeVariety(queryParams.value).then(response => {
changeVarietyList.value = response.rows
total.value = response.total
@ -246,7 +234,6 @@ function handleQuery() {
/** 重置按钮操作 */
function resetQuery() {
daterangeCreateTime.value = []
queryParams.value.sheepfoldId = null;
proxy.resetForm("queryRef")
handleQuery()
}
@ -311,7 +298,7 @@ function submitForm() {
/** 删除按钮操作 */
function handleDelete(row) {
const _ids = row.id || ids.value
proxy.$modal.confirm('是否确认删除这条记录数据').then(function () {
proxy.$modal.confirm('是否确认删除改品种记录编号为"' + _ids + '"的数据项？').then(function () {
return delChangeVariety(_ids)
}).then(() => {
getList()
@ -326,18 +313,8 @@ function handleExport() {
}, `changeVariety_${new Date().getTime()}.xlsx`)
}
//加载羊舍数据
const sheepfoldOptions = ref([])
function getSheepfoldOptions() {
listSheepfold({ pageNum: 1, pageSize: 9999 }).then(res => {
sheepfoldOptions.value = res.rows
})
}
onMounted(() => {
loadVarietyOptions();
getSheepfoldOptions();
getList();
});
</script>

308
src/views/produce/manage_sheep/trans_group/index.vue
View File

@ -1,29 +1,16 @@
<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="daterangeTransDate" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
start-placeholder="开始日期" end-placeholder="结束日期" />
</el-form-item>
<el-form-item label="管理耳号" prop="manageTags">
<el-input v-model="queryParams.manageTags" placeholder="请输入耳号" clearable @keyup.enter="handleQuery"
style="width: 150px;" />
</el-form-item>
<el-form-item label="事件类型" prop="eventType">
<el-select v-model="queryParams.eventType" placeholder="请选择事件类型" style="min-width:150px" clearable required>
<el-option v-for="dict in eventTypeOptions" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
<el-form-item label="转出羊舍" prop="foldFrom" style="width: 308px">
<el-form-item label="转出羊舍" prop="foldFrom">
<el-select v-model="queryParams.foldFrom" 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="foldTo" style="width: 308px">
<el-form-item label="转入羊舍" prop="foldTo">
<el-select v-model="queryParams.foldTo" placeholder="请选择转入羊舍" style="min-width:150px" clearable>
<el-option v-for="item in sheepfoldOptions" :key="item.id" :label="item.sheepfoldName" :value="item.id" />
</el-select>
@ -33,16 +20,15 @@
<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-option v-for="type in sheepTypeOptions" :key="type.id" :label="type.name" :value="type.id" />
</el-select>
</el-form-item>
<el-form-item label="状态" prop="status">
<el-select v-model="queryParams.status" style="width: 150px;" placeholder="请选择状态" clearable>
<el-option v-for="dict in status" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
<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>
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
<el-button icon="Refresh" @click="resetQuery">重置</el-button>
@ -54,10 +40,10 @@
<el-button type="primary" plain icon="Plus" @click="handleAdd"
v-hasPermi="['trans_group:trans_group: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="['trans_group:trans_group: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="['trans_group:trans_group:remove']">删除</el-button>
@ -71,29 +57,25 @@
<el-table v-loading="loading" :data="trans_groupList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="创建时间" align="center" prop="createTime" min-width="120" fixed>
<template #default="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}') }}</span>
</template>
</el-table-column>
<el-table-column label="转群日期" align="center" prop="transDate" min-width="120" />
<el-table-column label="管理耳号" align="center" prop="manageTags" min-width="100" />
<el-table-column label="事件类型" align="center" prop="eventTypeText" />
<el-table-column label="转出羊舍" align="center" prop="foldFromName" min-width="130" />
<el-table-column label="转入羊舍" align="center" prop="foldToName" min-width="130" />
<el-table-column label="管理耳号" align="center" prop="manageTags" />
<el-table-column label="转出羊舍" align="center" prop="foldFromName" />
<el-table-column label="转入羊舍" align="center" prop="foldToName" />
<el-table-column label="品种" align="center" prop="varietyName" />
<el-table-column label="羊只类别" align="center" prop="sheepTypeName" />
<el-table-column label="转群原因" align="center" prop="reasonText" min-width="120" />
<el-table-column label="转群原因" align="center" prop="reasonText" />
<el-table-column label="技术员" align="center" prop="technician" />
<el-table-column label="状态" align="center" prop="status">
<template #default="scope">
<dict-tag :options="status" :value="scope.row.status" />
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="comment" min-width="120" />
<el-table-column label="备注" align="center" prop="comment" />
<el-table-column label="创建人" align="center" prop="createBy" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" min-width="160" fixed="right">
<el-table-column label="创建时间" align="center" prop="createTime">
<template #default="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" min-width="160">
<template #default="scope">
<el-button link type="primary" icon="Edit" @click="handleApprove(scope.row)"
v-hasPermi="['trans_group:trans_group:approve']">
@ -114,20 +96,10 @@
<el-dialog :title="title" v-model="open" width="500px" append-to-body>
<el-form ref="trans_groupRef" :model="form" :rules="rules" label-width="80px">
<el-form-item label="管理耳号" prop="manageTags">
<div style="display: flex; align-items: center; gap: 8px;">
<el-select v-model="form.manageTags" placeholder="请输入或选择耳号" multiple filterable allow-create
style="width: 100%; flex:1;" @change="loadSheepInfo" :disabled="!isAdd">
<el-option v-for="sheep in sheepOptions" :key="sheep.id" :label="sheep.manageTags"
:value="sheep.manageTags" />
</el-select>
<span v-if="form.manageTags?.length > 0" class="tag-count">
已选 {{ form.manageTags.length }} 个
</span>
</div>
</el-form-item>
<el-form-item label="事件类型" prop="eventType">
<el-select v-model="form.eventType" placeholder="请选择事件类型" clearable required>
<el-option v-for="dict in eventTypeOptions" :key="dict.value" :label="dict.label" :value="dict.value" />
<el-select v-model="form.manageTags" placeholder="请输入或选择耳号" multiple filterable allow-create
style="width: 100%" @change="loadSheepInfo" :disabled="!isAdd">
<el-option v-for="sheep in sheepOptions" :key="sheep.id" :label="sheep.manageTags"
:value="sheep.manageTags" />
</el-select>
</el-form-item>
<el-form-item label="牧场" prop="ranchId">
@ -161,10 +133,6 @@
:value="Number(dict.value)" />
</el-select>
</el-form-item>
<el-form-item label="转群日期" prop="transDate">
<el-date-picker v-model="form.transDate" type="date" value-format="YYYY-MM-DD" placeholder="请选择转群日期"
style="width: 100%" required />
</el-form-item>
<el-form-item label="技术员" prop="technician">
<el-input v-model="form.technician" placeholder="请输入技术员" />
</el-form-item>
@ -176,57 +144,53 @@
</div>
</template>
</el-dialog>
<!-- 审批对话框 -->
<el-dialog :title="'审批转群记录'" v-model="approveDialog" width="500px" append-to-body>
<el-form ref="approveFormRef" :model="approveForm" label-width="120px">
<el-form-item label="耳号">
<el-input v-model="displayManageTags" disabled />
</el-form-item>
<el-form-item label="事件类型">
<el-input :value="approveForm.eventTypeText || '未知'" disabled />
</el-form-item>
<el-form-item label="转出羊舍">
<el-input :value="sheepfoldNameMap[approveForm.foldFrom] || approveForm.foldFrom" disabled />
</el-form-item>
<el-form-item label="转入羊舍">
<el-input :value="sheepfoldNameMap[approveForm.foldTo] || approveForm.foldTo" disabled />
</el-form-item>
<el-form-item label="品种">
<el-input :value="approveForm.varietyName" disabled />
</el-form-item>
<el-form-item label="转群原因">
<el-input :value="approveForm.reasonText" disabled />
</el-form-item>
<el-form-item label="状态">
<el-input :value="approveForm.statusText" disabled />
</el-form-item>
<el-form-item label="技术员">
<el-input v-model="approveForm.technician" disabled />
</el-form-item>
<el-form-item label="备注">
<el-input v-model="approveForm.comment" disabled />
</el-form-item>
</el-form>
<template #footer>
<div class="dialog-footer">
<el-button type="primary" @click="handleApproveAgree">同意</el-button>
<el-button type="danger" @click="handleApproveReject">驳回</el-button>
</div>
</template>
</el-dialog>
</div>
<!-- 审批对话框 -->
<el-dialog :title="'审批转群记录'" v-model="approveDialog" width="500px" append-to-body>
<el-form ref="approveFormRef" :model="approveForm" label-width="120px">
<el-form-item label="耳号">
<el-input v-model="displayManageTags" disabled />
</el-form-item>
<el-form-item label="转出羊舍">
<el-input :value="sheepfoldNameMap[approveForm.foldFrom] || approveForm.foldFrom" disabled />
</el-form-item>
<el-form-item label="转入羊舍">
<el-input :value="sheepfoldNameMap[approveForm.foldTo] || approveForm.foldTo" disabled />
</el-form-item>
<el-form-item label="品种">
<el-input :value="approveForm.varietyName" disabled />
</el-form-item>
<el-form-item label="转群原因">
<el-input :value="approveForm.reasonText" disabled />
</el-form-item>
<el-form-item label="状态">
<el-input :value="approveForm.statusText" disabled />
</el-form-item>
<el-form-item label="技术员">
<el-input v-model="approveForm.technician" disabled />
</el-form-item>
<el-form-item label="备注">
<el-input v-model="approveForm.comment" disabled />
</el-form-item>
</el-form>
<template #footer>
<div class="dialog-footer">
<el-button type="primary" @click="handleApproveAgree">同意</el-button>
<el-button type="danger" @click="handleApproveReject">驳回</el-button>
</div>
</template>
</el-dialog>
</template>
<script setup name="Trans_group">
import { listTrans_group, getTrans_group, delTrans_group, addTrans_group, updateTrans_group, approveScTransGroup, listRanch } from '@/api/produce/manage_sheep/trans_group'
import { listSheepfold_management as listSheepfold } from '@/api/fileManagement/sheepfold_management'
import { checkSheepByManageTags, getSheepBySheepfoldId } from '@/api/produce/other/fixHoof'
import { getSheepTypeList } from "@/api/produce/bodyManage/body_measure"
import request from '@/utils/request'
const { proxy } = getCurrentInstance();
const { trans_group_reason, status, trans_group_event_type } = proxy.useDict('trans_group_reason', 'status', 'trans_group_event_type');
const { trans_group_reason, status } = proxy.useDict('trans_group_reason', 'status');
const trans_groupList = ref([]);
const open = ref(false);
@ -237,9 +201,8 @@ const single = ref(true);
const multiple = ref(false);
const total = ref(0);
const title = ref('');
const daterangeTransDate = ref([]);
const daterangeCreateTime = ref([]);
const eventTypeOptions = trans_group_event_type || [];
const approveDialog = ref(false);
const approveForm = ref({});
const displayManageTags = ref('');
@ -256,31 +219,25 @@ const data = reactive({
form: {
manageTags: [],
tagDetails: {},
eventType: null,
transDate: null,
},
queryParams: {
pageNum: 1,
pageSize: 10,
sheepId: null,
manageTags: null,
eventType: null,
ranchId: null,
foldTo: null,
foldFrom: null,
varietyId: null,
sheepTypeId: null,
status: null,
createTime: null,
},
rules: {
manageTags: [{ required: true, message: '请输入耳号', trigger: 'blur' }],
eventType: [{ required: true, message: '请选择事件类型', trigger: 'change' }],
ranchId: [{ required: true, message: '请选择牧场', trigger: 'change' }],
foldTo: [{ required: true, message: '请选择转入羊舍', trigger: 'change' }],
varietyId: [{ required: true, message: '请选择品种', trigger: 'change' }],
reason: [{ required: true, message: '请选择转群原因', trigger: 'change' }],
transDate: [{ required: true, message: '请选择转群日期', trigger: 'change' }],
technician: [{ required: true, message: '请输入技术员', trigger: 'blur' }],
},
});
@ -294,13 +251,6 @@ function getList() {
queryParams.value.params.beginCreateTime = daterangeCreateTime.value[0];
queryParams.value.params.endCreateTime = daterangeCreateTime.value[1];
}
if (daterangeTransDate.value?.length) {
queryParams.value.params.beginTransDate = daterangeTransDate.value[0];
queryParams.value.params.endTransDate = daterangeTransDate.value[1];
}
if (queryParams.value.sheepTypeId !== null && queryParams.value.sheepTypeId !== undefined) {
queryParams.value.params.sheepTypeId = queryParams.value.sheepTypeId;
}
listTrans_group(queryParams.value).then((res) => {
trans_groupList.value = res.rows;
total.value = res.total;
@ -376,6 +326,26 @@ async function handleSheepFilter() {
}
}
//转群类型列表
function getSheepTypeList() {
return new Promise((resolve, reject) => {
request({
url: '/base/base/list',
method: 'get',
params: { pageNum: 1, pageSize: 9999 },
}).then((res) => {
sheepTypeOptions.value = res.rows.map(item => ({
id: Number(item.id),
name: item.name || item.typeName
})) || [];
resolve();
}).catch((error) => {
console.error('获取羊只类型失败', error);
proxy.$modal.msgError('加载羊只类型失败，请重试');
reject(error);
});
});
}
//加载所有牧场列表
function loadRanchList() {
@ -502,54 +472,54 @@ async function loadSheepByTypeOnly(typeId) {
//加载羊只信息
async function loadSheepInfo() {
const tags = form.value.manageTags;
if (!tags || tags.length === 0) return;
const tags = form.value.manageTags;
if (!tags || tags.length === 0) return;
const tagDetails = {};
const validResults = [];
let firstSheepfoldId = null;
let firstRanchId = null;
const tagDetails = {};
const validResults = [];
let firstSheepfoldId = null;
let firstRanchId = null;
for (const tag of tags) {
try {
const { data: sheepData } = await checkSheepByManageTags(tag.trim());
if (!sheepData) {
validResults.push(false);
proxy.$modal.msgError(`耳号 ${tag} 不存在或信息异常`);
} else {
validResults.push(true);
tagDetails[tag] = {
comment: sheepData.comment || '',
varietyId: sheepData.varietyId,
sheepId: sheepData.id,
sheepfoldId: sheepData.sheepfoldId,
};
if (!firstSheepfoldId) {
firstSheepfoldId = sheepData.sheepfoldId;
firstRanchId = sheepData.ranchId;
for (const tag of tags) {
try {
const { data: sheepData } = await checkSheepByManageTags(tag.trim());
if (!sheepData) {
validResults.push(false);
proxy.$modal.msgError(`耳号 ${tag} 不存在或信息异常`);
} else {
validResults.push(true);
tagDetails[tag] = {
comment: sheepData.comment || '',
varietyId: sheepData.varietyId,
sheepId: sheepData.id,
sheepfoldId: sheepData.sheepfoldId,
};
if (!firstSheepfoldId) {
firstSheepfoldId = sheepData.sheepfoldId;
firstRanchId = sheepData.ranchId;
}
}
} catch (error) {
console.error('获取耳号信息失败:', error);
proxy.$modal.msgError(`耳号 ${tag} 验证失败，请重试`);
validResults.push(false);
}
}
} catch (error) {
console.error('获取耳号信息失败:', error);
proxy.$modal.msgError(`耳号 ${tag} 验证失败，请重试`);
validResults.push(false);
}
}
if (validResults.includes(false)) {
form.value.manageTags = tags.filter((_, index) => validResults[index]);
proxy.$message.warning('部分耳号不合法，已自动过滤');
}
form.value.tagDetails = tagDetails;
if (validResults.includes(false)) {
form.value.manageTags = tags.filter((_, index) => validResults[index]);
proxy.$message.warning('部分耳号不合法，已自动过滤');
}
form.value.tagDetails = tagDetails;
if (firstRanchId && isAdd.value) {
form.value.ranchId = firstRanchId;
handleRanchChange(firstRanchId);
}
if (firstRanchId && isAdd.value) {
form.value.ranchId = firstRanchId;
handleRanchChange(firstRanchId);
}
if (firstSheepfoldId && isAdd.value) {
form.value.foldFrom = Number(firstSheepfoldId);
}
if (firstSheepfoldId && isAdd.value) {
form.value.foldFrom = Number(firstSheepfoldId);
}
}
//取消按钮
@ -567,8 +537,6 @@ function handleQuery() {
//重置搜索框
function resetQuery() {
daterangeCreateTime.value = [];
daterangeTransDate.value = [];
queryParams.value.eventType = null;
proxy.resetForm('queryRef');
handleQuery();
}
@ -612,8 +580,6 @@ async function handleUpdate(row) {
const formData = {
...d,
manageTags: manageTags,
eventType: d.eventType || null,
transDate: d.transDate || null,
foldFrom: Number(d.foldFrom || 0),
foldTo: Number(d.foldTo || 0),
sheepTypeId: Number(d.sheepTypeId || 0),
@ -682,7 +648,7 @@ function submitForm() {
//删除
function handleDelete(row) {
const _ids = row.id || ids.value;
proxy.$modal.confirm(`是否确认删除这条记录数据`)
proxy.$modal.confirm(`是否确认删除转群记录编号为“${_ids}”的数据项？`)
.then(() => delTrans_group(_ids))
.then(() => {
getList();
@ -754,37 +720,11 @@ function getVarietyOptions() {
});
}
// 加载羊只类别数据
const sheepTypeList = ref([]);
function loadSheepTypeList() {
getSheepTypeList().then(response => {
sheepTypeList.value = response.rows || [];
sheepTypeOptions.value = (response.rows || []).map(item => ({
id: Number(item.id),
name: item.name || item.typeName
}));
}).catch(error => {
console.error('加载羊只类别失败', error);
sheepTypeList.value = [];
sheepTypeOptions.value = [];
});
}
onMounted(() => {
loadSheepfold();
loadRanchList();
getVarietyOptions();
loadSheepTypeList();
getSheepTypeList();
getList();
});
</script>
<style scoped>
.tag-count {
color: #606266;
background-color: #f5f7fa;
padding: 2px 8px;
border-radius: 12px;
font-size: 12px;
}
</style>

215
src/views/produce/manage_sheep/transition_info/index.vue
View File

@ -2,36 +2,14 @@
<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-form-item>
<el-form-item label="转场日期" style="width: 308px">
<el-date-picker v-model="transitionDateRange" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
</el-form-item>
<el-form-item label="管理耳号" prop="manageTags">
<el-input v-model="queryParams.manageTags" placeholder="请输入管理耳号" clearable @keyup.enter="handleQuery"
style="width: 150px;" />
<el-input v-model="queryParams.manageTags" placeholder="请输入管理耳号" clearable @keyup.enter="handleQuery" style="width: 150px;"/>
</el-form-item>
<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>
</el-form-item>
<el-form-item label="事件类型" prop="eventType" style="width: 308px">
<el-select v-model="queryParams.eventType" placeholder="请选择事件类型" clearable style="min-width:150px">
<el-option label="转场转入" value="转场转入" />
<el-option label="转场转出" value="转场转出" />
</el-select>
</el-form-item>
<el-form-item label="转场类型" prop="transType" style="width: 308px">
<el-select v-model="queryParams.transType" placeholder="请选择转场类型" clearable style="min-width:150px">
<el-option label="内部调拨" :value="0" />
<el-option label="内部销售" :value="1" />
<el-option label="育肥调拨" :value="2" />
</el-select>
</el-form-item>
<el-form-item label="转入牧场" prop="transTo">
<el-select v-model="queryParams.transTo" placeholder="请选择转入牧场" clearable style="min-width:150px">
<el-option v-for="ranch in ranchOptions" :key="ranch.id" :label="ranch.ranchName" :value="ranch.ranchName" />
@ -47,6 +25,10 @@
<el-option v-for="dict in status" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
<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-form-item>
<el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
<el-button icon="Refresh" @click="resetQuery">重置</el-button>
@ -59,10 +41,10 @@
<el-button type="primary" plain icon="Plus" @click="handleAdd"
v-hasPermi="['transition_info:transition_info: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="['transition_info:transition_info: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="['transition_info:transition_info:remove']">删除</el-button>
@ -77,21 +59,9 @@
<!-- 列表 -->
<el-table v-loading="loading" :data="transition_infoList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="创建时间" align="center" prop="createTime" min-width="130" fixed>
<template #default="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}') }}</span>
</template>
</el-table-column>
<el-table-column label="转场日期" align="center" prop="transitionDate" min-width="150">
<template #default="scope">
<span>{{ parseTime(scope.row.transitionDate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="管理耳号" align="center" prop="manageTags" min-width="100" />
<el-table-column label="事件类型" align="center" prop="eventType" min-width="120" />
<el-table-column label="转场类型" align="center" prop="transTypeText" />
<el-table-column label="耳号" align="center" prop="manageTags" />
<el-table-column label="品种" align="center" prop="varietyName" />
<el-table-column label="转入牧场" align="center" prop="transTo" min-width="120" />
<el-table-column label="转入牧场" align="center" prop="transTo" />
<el-table-column label="当前牧场" align="center" prop="transFrom" />
<el-table-column label="状态" align="center" prop="status">
<template #default="scope">
@ -99,19 +69,18 @@
</template>
</el-table-column>
<el-table-column label="技术员" align="center" prop="technician" />
<el-table-column label="当前状态" align="center" prop="status" min-width="120">
<template #default="scope">
<span v-if="scope.row.status === 0">待审批</span>
<span v-else-if="scope.row.status === 1 || scope.row.status === 2">审批完成</span>
<span v-else>未知状态</span>
</template>
</el-table-column>
<el-table-column label="状态" align="center" prop="statusText" />
<el-table-column label="备注" align="center" prop="comment" />
<el-table-column label="创建人" align="center" prop="createBy" />
<el-table-column label="操作" align="center" min-width="180" fixed="right">
<el-table-column label="创建时间" align="center" prop="createTime" width="180">
<template #default="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" min-width="180">
<template #default="scope">
<el-button link type="primary" icon="Edit" @click="handleApprove(scope.row)"
v-hasPermi="['transition_info:transition_info:approve']" :disabled="scope.row.status !== 0">审批</el-button>
v-hasPermi="['transition_info:transition_info:approve']">审批</el-button>
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
v-hasPermi="['transition_info:transition_info:remove']">删除</el-button>
</template>
@ -125,51 +94,33 @@
<el-dialog :title="title" v-model="open" width="500px" append-to-body>
<el-form ref="transition_infoRef" :model="form" :rules="rules" label-width="80px">
<el-form-item label="管理耳号" prop="manageTags">
<div style="display: flex; align-items: center; gap: 8px;">
<el-select v-model="form.manageTags" placeholder="请输入或选择耳号" filterable multiple allow-create
@change="loadSheepInfo" :disabled="!isAdd" style="flex:1;">
<el-option v-for="sheep in sheepOptions" :key="sheep.id" :label="sheep.manageTags"
:value="sheep.manageTags" />
</el-select>
<span v-if="form.manageTags?.length > 0" class="tag-count">
已选 {{ form.manageTags.length }} 个
</span>
</div>
<el-select v-model="form.manageTags" placeholder="请输入或选择耳号" filterable multiple allow-create
@change="loadSheepInfo" :disabled="!isAdd" >
<el-option v-for="sheep in sheepOptions" :key="sheep.id" :label="sheep.manageTags"
:value="sheep.manageTags" />
</el-select>
</el-form-item>
<el-form-item label="转入牧场" prop="transTo">
<el-select v-model="form.transTo" placeholder="请选择转入牧场" clearable :disabled="!isAdd">
<el-select v-model="form.transTo" placeholder="请选择转入牧场" clearable :disabled="!isAdd" >
<el-option v-for="ranch in ranchOptions" :key="ranch.id" :label="ranch.ranchName"
:value="ranch.ranchName" />
</el-select>
</el-form-item>
<el-form-item label="当前牧场" prop="transFrom">
<el-select v-model="form.transFrom" placeholder="请选择当前牧场" clearable @change="handleRanchChange"
:disabled="!isAdd">
<el-select v-model="form.transFrom" placeholder="请选择当前牧场" clearable @change="handleRanchChange" :disabled="!isAdd" >
<el-option v-for="ranch in ranchOptions" :key="ranch.id" :label="ranch.ranchName"
:value="ranch.ranchName" />
</el-select>
</el-form-item>
<el-form-item label="事件类型" prop="eventType">
<el-select v-model="form.eventType" placeholder="请选择事件类型">
<el-option label="转场转入" value="转场转入" />
<el-option label="转场转出" value="转场转出" />
</el-select>
</el-form-item>
<el-form-item label="转场类型" prop="transType">
<el-select v-model="form.transType" placeholder="请选择转场类型">
<el-option v-for="dict in trans_type" :key="dict.value" :label="dict.label" :value="parseInt(dict.value)" />
</el-select>
</el-form-item>
<el-form-item label="转场日期" prop="transitionDate">
<el-date-picker v-model="form.transitionDate" value-format="YYYY-MM-DD" type="date" placeholder="请选择转场日期"
:disabled="!isAdd"></el-date-picker>
</el-form-item>
<el-form-item label="技术员" prop="technician">
<el-input v-model="form.technician" placeholder="请输入技术员" />
</el-form-item>
@ -192,9 +143,6 @@
<el-form-item label="品种">
<el-input :value="approveForm.varietyName" disabled />
</el-form-item>
<el-form-item label="事件类型">
<el-input :value="approveForm.eventType" disabled />
</el-form-item>
<el-form-item label="转入牧场">
<el-input :value="approveForm.transTo" disabled />
</el-form-item>
@ -213,12 +161,6 @@
<el-form-item label="状态">
<el-input :value="getStatusLabel(approveForm.status)" disabled />
</el-form-item>
<el-form-item label="接收羊舍" v-if="approveForm.eventType === '转场转入'">
<el-select v-model="approveForm.sheepfoldId" placeholder="请选择接收羊舍" clearable>
<el-option v-for="sheepfold in acceptSheepfold" :key="sheepfold.id" :label="sheepfold.sheepfoldName"
:value="sheepfold.id" />
</el-select>
</el-form-item>
</el-form>
<template #footer>
@ -232,7 +174,7 @@
</template>
<script setup name="Transition_info">
import { listTransition_info, getTransition_info, delTransition_info, addTransition_info, getSheepByRanchId, updateTransition_info, listRanch, approveTransitionInfo } from "@/api/produce/manage_sheep/transition_info"
import { listTransition_info, getTransition_info, delTransition_info, addTransition_info, getSheepByRanchId, updateTransition_info, listRanch,approveTransitionInfo } from "@/api/produce/manage_sheep/transition_info"
import { checkSheepByManageTags, getSheepBySheepfoldId } from '@/api/produce/other/fixHoof'
import request from '@/utils/request'
@ -249,17 +191,15 @@ const single = ref(true)
const multiple = ref(true)
const total = ref(0)
const title = ref('')
const transitionDateRange = ref([])
const daterangeCreateTime = ref([])
const approveDialog = ref(false)
const approveForm = ref({})
const displayManageTags = ref('')
const varietyOptions = ref([])
const ranchOptions = ref([])
const sheepOptions = ref([])
const isAdd = ref(true)
const isEdit = ref(false)
const acceptSheepfold = ref([])
const ranchOptions = ref([]);
const sheepOptions = ref([]);
const isAdd = ref(true);
const isEdit = ref(false);
const data = reactive({
form: {
@ -267,9 +207,7 @@ const data = reactive({
manageTags: [],
transTo: null,
transFrom: null,
eventType: null,
transType: null,
transitionDate: null,
technician: null,
tagDetails: {}
},
@ -278,16 +216,13 @@ const data = reactive({
pageSize: 10,
manageTags: [],
varietyId: null,
eventType: null,
transType: null,
transTo: null,
transFrom: null,
status: null,
createTime: null,
transitionDate: null
createTime: null
},
rules: {
manageTags: [
manageTags:[
{ required: true, message: "请输入管理耳号", trigger: "blur" }
],
transTo: [
@ -296,15 +231,9 @@ const data = reactive({
transFrom: [
{ required: false, message: "请选择当前牧场", trigger: "blur" }
],
eventType: [
{ required: true, message: '请选择事件类型', trigger: 'change' }
],
transType: [
{ required: true, message: "请选择转场类型", trigger: "change" }
],
transitionDate: [
{ required: true, message: "请选择转场日期", trigger: "change" }
],
technician: [
{ required: true, message: "请输入技术员", trigger: "blur" }
]
@ -320,13 +249,6 @@ function getList() {
queryParams.value.params.beginCreateTime = daterangeCreateTime.value[0]
queryParams.value.params.endCreateTime = daterangeCreateTime.value[1]
}
if (queryParams.value.transType !== null) {
queryParams.value.params.transType = queryParams.value.transType;
}
if (transitionDateRange.value && transitionDateRange.value.length > 0) {
queryParams.value.params["beginTransitionDate"] = transitionDateRange.value[0];
queryParams.value.params["endTransitionDate"] = transitionDateRange.value[1];
}
listTransition_info(queryParams.value).then(res => {
transition_infoList.value = res.rows
total.value = res.total
@ -342,7 +264,7 @@ function reset() {
transFrom: null,
transType: null,
technician: null,
createBy: null,
createBy:null,
tagDetails: {}
};
sheepOptions.value = [];
@ -380,40 +302,6 @@ function loadSheepOptions() {
});
}
// 加载牧场下的羊舍
// 修改：加载转入牧场下的接收羊舍（使用牧场ID而非名称）
function loadSheepfoldsByRanch(ranchName) {
// 1. 根据转入牧场名称匹配牧场ID
const matchedRanch = ranchOptions.value.find(
ranch => ranch.ranchName === ranchName
);
if (!matchedRanch) {
proxy.$modal.msgWarning(`未找到牧场“${ranchName}”的信息`);
acceptSheepfold.value = [];
return;
}
const ranchId = matchedRanch.id; // 获取匹配的牧场ID
// 2. 使用牧场ID调用接口加载羊舍（修正参数）
request({
url: '/sheepfold_management/sheepfold_management/list',
method: 'get',
params: {
ranchId: ranchId, // 关键：使用牧场ID而非名称
pageNum: 1,
pageSize: 999
}
}).then(res => {
acceptSheepfold.value = res.rows || [];
if (acceptSheepfold.value.length === 0) {
proxy.$modal.msgWarning(`转入牧场“${ranchName}”没有可用的接收羊舍`);
}
}).catch(error => {
console.error('加载接收羊舍失败:', error);
proxy.$modal.msgError('获取接收羊舍数据失败');
});
}
// 通过牧场 ID 查询牧场名称
async function getRanchNameByRanchId(ranchId) {
if (!ranchId) return '';
@ -530,22 +418,11 @@ function handleExport() {
// 审批
function handleApprove(row) {
if (row.status !== 0) {
proxy.$modal.msgWarning("该记录已完成审批，无法重复操作");
return;
}
approveForm.value = { ...row };
approveDialog.value = true;
displayManageTags.value = Array.isArray(row.manageTags)
? row.manageTags.join(',')
: row.manageTags || '';
if (row.eventType === '转场转入') {
loadSheepfoldsByRanch(row.transTo);
} else {
acceptSheepfold.value = [];
}
approveDialog.value = true;
}
// 审批同意
@ -556,13 +433,10 @@ function handleApproveAgree() {
}
approveForm.value.status = 1;
if (approveForm.value.eventType === '转场转入' && !approveForm.value.sheepfoldId) {
proxy.$modal.msgError('请选择接收羊舍');
return;
}
approveTransitionInfo(approveForm.value).then(() => {
approveDialog.value = false;
proxy.$modal.msgSuccess('通过请求，已更新羊只信息');
proxy.$modal.msgSuccess('审批通过，已更新羊只所在牧场');
getList();
}).catch(error => {
proxy.$modal.msgError(`审批失败：${error.message}`);
@ -574,10 +448,8 @@ function handleApproveReject() {
approveForm.value.status = 2;
updateTransition_info(approveForm.value).then(() => {
approveDialog.value = false;
proxy.$modal.msgSuccess('驳回请求');
proxy.$modal.msgSuccess('审批成功，状态已更新为驳回');
getList();
}).catch(error => {
proxy.$modal.msgError(`审批失败：${error.message}`);
});
}
@ -616,8 +488,6 @@ function handleQuery() {
//重置
function resetQuery() {
daterangeCreateTime.value = []
queryParams.value.transType = null;
transitionDateRange.value = [];
proxy.resetForm("queryRef")
handleQuery()
}
@ -693,8 +563,6 @@ async function submitForm() {
transTo: form.value.transTo,
transFrom: form.value.tagDetails[tag].ranchName,
transType: form.value.transType,
eventType: form.value.eventType,
transitionDate: form.value.transitionDate,
technician: form.value.technician,
comment: form.value.tagDetails[tag].comment,
status: 0,
@ -703,7 +571,6 @@ async function submitForm() {
submitData = {
...form.value,
manageTags: validTags.join(','),
eventType: form.value.eventType,
};
}
@ -735,7 +602,7 @@ function getVarietyOptions() {
//删除
function handleDelete(row) {
const _ids = row.id || ids.value
proxy.$modal.confirm('是否确认删除这条记录数据')
proxy.$modal.confirm('是否确认删除转场编号为"' + _ids + '"的数据项？')
.then(() => delTransition_info(_ids))
.then(() => {
getList()
@ -751,13 +618,3 @@ onMounted(() => {
getList();
});
</script>
<style scoped>
.tag-count {
color: #606266;
background-color: #f5f7fa;
padding: 2px 8px;
border-radius: 12px;
font-size: 12px;
}
</style>

52
src/views/produce/other/castrate/index.vue
View File

@ -2,24 +2,28 @@
<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-form-item>
<el-form-item label="管理耳号" prop="manageTags">
<el-input v-model="queryParams.manageTags" placeholder="请输入管理耳号" clearable @keyup.enter="handleQuery"
style="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" />
</el-select>
</el-form-item>
<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>
</el-form-item>
<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-form-item>
<el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
<el-button icon="Refresh" @click="resetQuery">重置</el-button>
@ -52,18 +56,17 @@
<el-table v-loading="loading" :data="castrateList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<!-- <el-table-column label="羊只id" align="center" prop="sheepId" /> -->
<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" prop="manageTags" />
<el-table-column label="事件类型" align="center" prop="eventType" width="120" />
<el-table-column label="羊舍" align="center" prop="sheepfoldName" />
<el-table-column label="羊舍名称" align="center" prop="sheepfoldName" />
<el-table-column label="品种" align="center" prop="varietyName" />
<el-table-column label="备注" align="center" prop="comment" />
<el-table-column label="技术员" align="center" prop="technician" />
<el-table-column label="创建人" align="center" prop="createBy" />
<el-table-column label="创建时间" align="center" prop="createTime" width="180">
<template #default="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template #default="scope">
<!-- 按需添加 是否需要修改功能 -->
@ -82,16 +85,11 @@
<el-dialog :title="title" v-model="open" width="500px" append-to-body>
<el-form ref="castrateRef" :model="form" :rules="rules" label-width="80px">
<el-form-item label="管理耳号" prop="manageTags">
<div style="display: flex; align-items: center; gap: 8px;">
<el-select v-model="form.manageTags" placeholder="请输入或选择耳号" multiple filterable allow-create
style="width: 100%; flex:1;" @change="loadSheepInfo" @blur="loadSheepInfo">
<el-option v-for="sheep in sheepOptions" :key="sheep.id" :label="sheep.manageTags"
:value="sheep.manageTags" />
</el-select>
<span v-if="form.manageTags?.length > 0" class="tag-count">
已选 {{ form.manageTags.length }} 个
</span>
</div>
<el-select v-model="form.manageTags" placeholder="请输入或选择耳号" multiple filterable allow-create
style="width: 100%" @change="loadSheepInfo" @blur="loadSheepInfo">
<el-option v-for="sheep in sheepOptions" :key="sheep.id" :label="sheep.manageTags"
:value="sheep.manageTags" />
</el-select>
</el-form-item>
<el-form-item label="羊舍" prop="sheepfold">
<el-select v-model="form.sheepfold" placeholder="请选择羊舍" clearable @change="loadSheepBySheepfold">
@ -407,7 +405,7 @@ function submitForm() {
//删除
function handleDelete(row) {
const _ids = row.id || ids.value
proxy.$modal.confirm(`是否确认删除这条记录数据`).then(() => {
proxy.$modal.confirm(`是否确认删除去势编号为"${_ids}"的数据项？`).then(() => {
return delCastrate(_ids)
}).then(() => {
getList()
@ -434,13 +432,3 @@ onMounted(() => {
getList()
})
</script>
<style scoped>
.tag-count {
color: #606266;
background-color: #f5f7fa;
padding: 2px 8px;
border-radius: 12px;
font-size: 12px;
}
</style>

51
src/views/produce/other/fixHoof/index.vue
View File

@ -1,14 +1,11 @@
<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-form-item>
<el-form-item label="管理耳号" prop="manageTags">
<el-input v-model="queryParams.manageTags" placeholder="请输入管理耳号" clearable @keyup.enter="handleQuery"
style="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" />
@ -19,6 +16,12 @@
<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="创建时间" style="width: 308px">
<el-date-picker v-model="daterangeCreateTime" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
start-placeholder="开始日期" end-placeholder="结束日期" />
</el-form-item>
<el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
<el-button icon="Refresh" @click="resetQuery">重置</el-button>
@ -50,18 +53,17 @@
<!-- 列表 -->
<el-table v-loading="loading" :data="fixHoofList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<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" prop="manageTags" />
<el-table-column label="事件类型" align="center" prop="eventType" width="120" />
<el-table-column label="羊舍" align="center" prop="sheepfoldName" />
<el-table-column label="羊舍名称" align="center" prop="sheepfoldName" />
<el-table-column label="品种" align="center" prop="varietyName" />
<el-table-column label="备注" align="center" prop="comment" />
<el-table-column label="技术员" align="center" prop="technician" />
<el-table-column label="创建人" align="center" prop="createBy" />
<el-table-column label="创建时间" align="center" prop="createTime" width="180">
<template #default="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template #default="scope">
<!-- 按需添加 是否需要修改功能 -->
@ -80,16 +82,11 @@
<el-dialog :title="title" v-model="open" width="500px" append-to-body>
<el-form ref="fixHoofRef" :model="form" :rules="rules" label-width="80px">
<el-form-item label="耳号" prop="manageTags">
<div style="display: flex; align-items: center; gap: 8px;">
<el-select v-model="form.manageTags" placeholder="请输入或选择耳号" multiple filterable allow-create
style="width: 100%; flex:1;" @change="loadSheepInfo">
<el-option v-for="sheep in sheepOptions" :key="sheep.id" :label="sheep.manageTags"
:value="sheep.manageTags" />
</el-select>
<span v-if="form.manageTags?.length > 0" class="tag-count">
已选 {{ form.manageTags.length }} 个
</span>
</div>
<el-select v-model="form.manageTags" placeholder="请输入或选择耳号" multiple filterable allow-create
style="width: 100%" @change="loadSheepInfo">
<el-option v-for="sheep in sheepOptions" :key="sheep.id" :label="sheep.manageTags"
:value="sheep.manageTags" />
</el-select>
</el-form-item>
<el-form-item label="羊舍" prop="sheepfolds">
<el-select v-model="form.sheepfold" filterable style="width: 100%" @change="loadSheepBySheepfold">
@ -348,7 +345,7 @@ function submitForm() {
//删除
function handleDelete(row) {
const _ids = row.id || ids.value
proxy.$modal.confirm(`是否确认删除这条记录数据`).then(() => {
proxy.$modal.confirm(`是否确认删除修蹄编号为"${_ids}"的数据项？`).then(() => {
return delFixHoof(_ids)
}).then(() => {
getList()
@ -375,13 +372,3 @@ onMounted(() => {
getList()
})
</script>
<style scoped>
.tag-count {
color: #606266;
background-color: #f5f7fa;
padding: 2px 8px;
border-radius: 12px;
font-size: 12px;
}
</style>