Compare commits
No commits in common. "08b625b0aebb62febcae6b7c9858b79a6a2804ca" and "aeeff174989d1a418439745da067c480fc4d7345" have entirely different histories.
08b625b0ae
...
aeeff17498
@ -48,23 +48,3 @@ export function exportFixHoof(query) {
|
||||
responseType: 'blob' // 导出功能需要设置响应类型为blob
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
// 按管理耳号查羊只
|
||||
export function checkSheepByManageTags(manageTags) {
|
||||
return request({
|
||||
url: '/sheep/sheep/byManageTags/' + encodeURIComponent(manageTags),
|
||||
method: 'get'
|
||||
})
|
||||
}
|
||||
|
||||
//获取品种
|
||||
export function getVarietyOptions(query){
|
||||
return request({
|
||||
url:'/base/variety/list',
|
||||
method:'get',
|
||||
params:query
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
|
@ -70,7 +70,12 @@
|
||||
<el-col :span="10">
|
||||
<el-form-item label="品种" prop="varietyId">
|
||||
<el-select v-model="form.varietyId" placeholder="请选择品种" clearable>
|
||||
<el-option v-for="item in varietyOptions" :key="item.id" :label="item.variety" :value="Number(item.id)" />
|
||||
<el-option
|
||||
v-for="item in varietyOptions"
|
||||
:key="item.id"
|
||||
:label="item.variety"
|
||||
:value="Number(item.id)"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
@ -106,8 +111,17 @@
|
||||
|
||||
<!-- 导入弹窗 -->
|
||||
<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>
|
||||
<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>
|
||||
@ -119,12 +133,12 @@
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
import { ref, onMounted, getCurrentInstance } from 'vue'
|
||||
import { ref, onMounted } from 'vue'
|
||||
import request from '@/utils/request'
|
||||
import { addSheep, exportSheepForm } from '@/api/produce/manage_sheep/add_sheep/add_sheep'
|
||||
import { listSheepfold_management as listSheepfold } from '@/api/fileManagement/sheepfold_management'
|
||||
import { getToken } from '@/utils/auth'
|
||||
|
||||
import { getCurrentInstance } from 'vue'
|
||||
|
||||
const { proxy } = getCurrentInstance()
|
||||
/* -------------------- 表单 -------------------- */
|
||||
@ -155,7 +169,7 @@ const rules = {
|
||||
|
||||
/* -------------------- 下拉数据 -------------------- */
|
||||
const sheepfoldOptions = ref([])
|
||||
const varietyOptions = ref([])
|
||||
const varietyOptions = ref([])
|
||||
|
||||
function getSheepfoldOptions() {
|
||||
listSheepfold({ pageNum: 1, pageSize: 9999 }).then(res => {
|
||||
|
@ -169,7 +169,13 @@
|
||||
</template>
|
||||
|
||||
<script setup name="Trans_group">
|
||||
import { listTrans_group, getTrans_group, delTrans_group, addTrans_group, updateTrans_group } from '@/api/produce/manage_sheep/trans_group/trans_group'
|
||||
import {
|
||||
listTrans_group,
|
||||
getTrans_group,
|
||||
delTrans_group,
|
||||
addTrans_group,
|
||||
updateTrans_group
|
||||
} from '@/api/produce/manage_sheep/trans_group/trans_group'
|
||||
import { listSheepfold_management as listSheepfold } from '@/api/fileManagement/sheepfold_management'
|
||||
import request from '@/utils/request'
|
||||
|
||||
|
@ -1,79 +1,113 @@
|
||||
<template>
|
||||
<div class="app-container">
|
||||
<!-- 查询表单 -->
|
||||
<el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="80px">
|
||||
<el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
|
||||
<el-form-item label="羊只id" prop="sheepId">
|
||||
<el-input v-model="queryParams.sheepId" placeholder="请输入羊只id" clearable @keyup.enter="handleQuery" />
|
||||
<el-input
|
||||
v-model="queryParams.sheepId"
|
||||
placeholder="请输入羊只id"
|
||||
clearable
|
||||
@keyup.enter="handleQuery"
|
||||
/>
|
||||
</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="transTo">
|
||||
<el-input v-model="queryParams.transTo" placeholder="请输入转入牧场" clearable @keyup.enter="handleQuery" />
|
||||
<el-input
|
||||
v-model="queryParams.transTo"
|
||||
placeholder="请输入转入牧场"
|
||||
clearable
|
||||
@keyup.enter="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="当前牧场" prop="transFrom">
|
||||
<el-input v-model="queryParams.transFrom" placeholder="请输入当前牧场" clearable @keyup.enter="handleQuery" />
|
||||
<el-input
|
||||
v-model="queryParams.transFrom"
|
||||
placeholder="请输入当前牧场"
|
||||
clearable
|
||||
@keyup.enter="handleQuery"
|
||||
/>
|
||||
</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 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
|
||||
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"
|
||||
v-hasPermi="['transition_info:transition_info:add']">新增</el-button>
|
||||
<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-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate"
|
||||
v-hasPermi="['transition_info:transition_info:edit']">修改</el-button>
|
||||
<el-button
|
||||
type="success"
|
||||
plain
|
||||
icon="Edit"
|
||||
:disabled="single"
|
||||
@click="handleUpdate"
|
||||
v-hasPermi="['transition_info:transition_info:edit']"
|
||||
>修改</el-button>
|
||||
</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>
|
||||
<el-button
|
||||
type="danger"
|
||||
plain
|
||||
icon="Delete"
|
||||
:disabled="multiple"
|
||||
@click="handleDelete"
|
||||
v-hasPermi="['transition_info:transition_info:remove']"
|
||||
>删除</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button type="warning" plain icon="Download" @click="handleExport"
|
||||
v-hasPermi="['transition_info:transition_info:export']">导出</el-button>
|
||||
<el-button
|
||||
type="warning"
|
||||
plain
|
||||
icon="Download"
|
||||
@click="handleExport"
|
||||
v-hasPermi="['transition_info:transition_info:export']"
|
||||
>导出</el-button>
|
||||
</el-col>
|
||||
<right-toolbar v-model:showSearch="showSearch" @queryTable="getList" />
|
||||
<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
|
||||
</el-row>
|
||||
|
||||
<!-- 列表 -->
|
||||
<el-table v-loading="loading" :data="transition_infoList" @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="varietyName" />
|
||||
<!-- <el-table-column label="" align="center" prop="id" /> -->
|
||||
<el-table-column label="羊只id" align="center" prop="sheepId" />
|
||||
<el-table-column label="转入牧场" align="center" prop="transTo" />
|
||||
<el-table-column label="当前牧场" align="center" prop="transFrom" />
|
||||
<el-table-column label="转场类型" align="center" prop="transType">
|
||||
<template #default="scope">
|
||||
<dict-tag :options="trans_type" :value="scope.row.transType" />
|
||||
<dict-tag :options="trans_type" :value="scope.row.transType"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<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" />
|
||||
<dict-tag :options="status" :value="scope.row.status"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="备注" align="center" prop="comment" />
|
||||
@ -83,57 +117,51 @@
|
||||
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" align="center" min-width="180">
|
||||
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" min-width="180">
|
||||
<template #default="scope">
|
||||
<el-button link type="primary" icon="Edit" @click="handleApprove(scope.row)"
|
||||
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>
|
||||
<el-button link type="primary" icon="Edit" @click="handleApprove(scope.row)" 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>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
|
||||
<pagination
|
||||
v-show="total>0"
|
||||
:total="total"
|
||||
v-model:page="queryParams.pageNum"
|
||||
v-model:limit="queryParams.pageSize"
|
||||
@pagination="getList"
|
||||
/>
|
||||
|
||||
<pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
|
||||
v-model:limit="queryParams.pageSize" @pagination="getList" />
|
||||
|
||||
<!-- 新增/修改 -->
|
||||
<!-- 添加或修改转场对话框 -->
|
||||
<el-dialog :title="title" v-model="open" width="500px" append-to-body>
|
||||
<el-form ref="transition_infoRef" :model="form" :rules="rules" label-width="80px">
|
||||
<el-form-item label="羊只id" prop="sheepId">
|
||||
<el-input v-model="form.sheepId" placeholder="请输入羊只id" />
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="品种" prop="varietyId">
|
||||
<el-select v-model="form.varietyId" placeholder="请选择品种" clearable>
|
||||
<el-option v-for="item in varietyOptions" :key="item.id"
|
||||
:label="item.variety" :value="Number(item.id)" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="转入牧场" prop="transTo">
|
||||
<el-input v-model="form.transTo" placeholder="请输入转入牧场" />
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="当前牧场" prop="transFrom">
|
||||
<el-input v-model="form.transFrom" placeholder="请输入当前牧场" />
|
||||
</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-option
|
||||
v-for="dict in trans_type"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="parseInt(dict.value)"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="技术员" prop="technician">
|
||||
<el-input v-model="form.technician" placeholder="请输入技术员" />
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="备注" prop="comment">
|
||||
<el-input v-model="form.comment" placeholder="请输入备注" />
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
|
||||
<template #footer>
|
||||
<div class="dialog-footer">
|
||||
<el-button type="primary" @click="submitForm">确 定</el-button>
|
||||
@ -141,75 +169,81 @@
|
||||
</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="羊只id"><el-input v-model="approveForm.sheepId" disabled /></el-form-item>
|
||||
<el-form-item label="品种"><el-input :value="approveForm.varietyName" disabled /></el-form-item>
|
||||
<el-form-item label="转入牧场"><el-input v-model="approveForm.transTo" disabled /></el-form-item>
|
||||
<el-form-item label="当前牧场"><el-input v-model="approveForm.transFrom" disabled /></el-form-item>
|
||||
<el-form-item label="转场类型">
|
||||
<el-input :value="getTransTypeLabel(approveForm.transType)" 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="羊只id">
|
||||
<el-input v-model="approveForm.sheepId" disabled />
|
||||
</el-form-item>
|
||||
<el-form-item label="转入牧场">
|
||||
<el-input v-model="approveForm.transTo" disabled />
|
||||
</el-form-item>
|
||||
<el-form-item label="当前牧场">
|
||||
<el-input v-model="approveForm.transFrom" disabled />
|
||||
</el-form-item>
|
||||
<el-form-item label="转场类型">
|
||||
<el-select v-model="approveForm.transType" disabled>
|
||||
<el-option
|
||||
v-for="dict in trans_type"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"
|
||||
/>
|
||||
</el-select>
|
||||
</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="Transition_info">
|
||||
import { listTransition_info, getTransition_info, delTransition_info, addTransition_info, updateTransition_info } from "@/api/produce/manage_sheep/transition_info/transition_info"
|
||||
import request from '@/utils/request'
|
||||
|
||||
const { proxy } = getCurrentInstance()
|
||||
const { status, trans_type } = proxy.useDict('status', 'trans_type')
|
||||
|
||||
/* -------------------- 响应式数据 -------------------- */
|
||||
const transition_infoList = ref([])
|
||||
const open = ref(false)
|
||||
const loading = ref(true)
|
||||
const showSearch = ref(true)
|
||||
const ids = ref([])
|
||||
const single = ref(true)
|
||||
const multiple = ref(true)
|
||||
const total = ref(0)
|
||||
const title = ref('')
|
||||
const open = ref(false)
|
||||
const loading = ref(true)
|
||||
const showSearch = ref(true)
|
||||
const ids = ref([])
|
||||
const single = ref(true)
|
||||
const multiple = ref(true)
|
||||
const total = ref(0)
|
||||
const title = ref("")
|
||||
const daterangeCreateTime = ref([])
|
||||
|
||||
const approveDialog = ref(false)
|
||||
const approveForm = ref({})
|
||||
|
||||
const varietyOptions = ref([])
|
||||
|
||||
/* -------------------- 查询 / 表单 -------------------- */
|
||||
const data = reactive({
|
||||
form: {},
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
sheepId: null,
|
||||
varietyId: null,
|
||||
transTo: null,
|
||||
transFrom: null,
|
||||
status: null,
|
||||
createTime: null
|
||||
},
|
||||
rules: {
|
||||
id: [
|
||||
{ required: true, message: "不能为空", trigger: "blur" }
|
||||
],
|
||||
sheepId: [
|
||||
{ required: true, message: "羊只id不能为空", trigger: "blur" }
|
||||
],
|
||||
varietyId: [
|
||||
{ required: true, message: "品种不能为空", trigger: "change" }
|
||||
],
|
||||
transTo: [
|
||||
{ required: true, message: "转入牧场不能为空", trigger: "blur" }
|
||||
],
|
||||
@ -221,31 +255,38 @@ const data = reactive({
|
||||
],
|
||||
technician: [
|
||||
{ required: true, message: "技术员不能为空", trigger: "blur" }
|
||||
]
|
||||
],
|
||||
}
|
||||
})
|
||||
|
||||
const { queryParams, form, rules } = toRefs(data)
|
||||
|
||||
/* -------------------- 基础方法 -------------------- */
|
||||
/** 查询转场列表 */
|
||||
function getList() {
|
||||
loading.value = true
|
||||
queryParams.value.params = {}
|
||||
if (daterangeCreateTime.value?.length) {
|
||||
queryParams.value.params.beginCreateTime = daterangeCreateTime.value[0]
|
||||
queryParams.value.params.endCreateTime = daterangeCreateTime.value[1]
|
||||
if (null != daterangeCreateTime && '' != daterangeCreateTime) {
|
||||
queryParams.value.params["beginCreateTime"] = daterangeCreateTime.value[0]
|
||||
queryParams.value.params["endCreateTime"] = daterangeCreateTime.value[1]
|
||||
}
|
||||
listTransition_info(queryParams.value).then(res => {
|
||||
transition_infoList.value = res.rows
|
||||
total.value = res.total
|
||||
loading.value = false
|
||||
listTransition_info(queryParams.value).then(response => {
|
||||
transition_infoList.value = response.rows
|
||||
total.value = response.total
|
||||
loading.value = false
|
||||
})
|
||||
}
|
||||
|
||||
// 取消按钮
|
||||
function cancel() {
|
||||
open.value = false
|
||||
reset()
|
||||
}
|
||||
|
||||
// 表单重置
|
||||
function reset() {
|
||||
form.value = {
|
||||
id: null,
|
||||
sheepId: null,
|
||||
varietyId: null,
|
||||
transTo: null,
|
||||
transFrom: null,
|
||||
transType: null,
|
||||
@ -258,29 +299,34 @@ function reset() {
|
||||
proxy.resetForm("transition_infoRef")
|
||||
}
|
||||
|
||||
function cancel() {
|
||||
open.value = false
|
||||
reset()
|
||||
}
|
||||
/** 搜索按钮操作 */
|
||||
function handleQuery() {
|
||||
queryParams.value.pageNum = 1
|
||||
getList()
|
||||
}
|
||||
|
||||
/** 重置按钮操作 */
|
||||
function resetQuery() {
|
||||
daterangeCreateTime.value = []
|
||||
proxy.resetForm("queryRef")
|
||||
handleQuery()
|
||||
}
|
||||
|
||||
// 多选框选中数据
|
||||
function handleSelectionChange(selection) {
|
||||
ids.value = selection.map(item => item.id)
|
||||
single.value = selection.length !== 1
|
||||
single.value = selection.length != 1
|
||||
multiple.value = !selection.length
|
||||
}
|
||||
|
||||
/** 新增按钮操作 */
|
||||
function handleAdd() {
|
||||
reset()
|
||||
open.value = true
|
||||
title.value = "添加转场"
|
||||
}
|
||||
|
||||
/** 修改按钮操作 */
|
||||
function handleUpdate(row) {
|
||||
reset()
|
||||
const _id = row.id || ids.value
|
||||
@ -290,70 +336,78 @@ function handleUpdate(row) {
|
||||
title.value = "修改转场"
|
||||
})
|
||||
}
|
||||
|
||||
/** 提交按钮 */
|
||||
function submitForm() {
|
||||
proxy.$refs["transition_infoRef"].validate(valid => {
|
||||
if (!valid) return
|
||||
const api = form.value.id ? updateTransition_info : addTransition_info
|
||||
api(form.value).then(() => {
|
||||
proxy.$modal.msgSuccess(form.value.id ? "修改成功" : "新增成功")
|
||||
open.value = false
|
||||
getList()
|
||||
})
|
||||
if (valid) {
|
||||
if (form.value.id != null) {
|
||||
updateTransition_info(form.value).then(response => {
|
||||
proxy.$modal.msgSuccess("修改成功")
|
||||
open.value = false
|
||||
getList()
|
||||
})
|
||||
} else {
|
||||
addTransition_info(form.value).then(response => {
|
||||
proxy.$modal.msgSuccess("新增成功")
|
||||
open.value = false
|
||||
getList()
|
||||
})
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
/** 删除按钮操作 */
|
||||
function handleDelete(row) {
|
||||
const _ids = row.id || ids.value
|
||||
proxy.$modal.confirm('是否确认删除转场编号为"' + _ids + '"的数据项?')
|
||||
.then(() => delTransition_info(_ids))
|
||||
.then(() => {
|
||||
getList()
|
||||
proxy.$modal.msgSuccess("删除成功")
|
||||
})
|
||||
proxy.$modal.confirm('是否确认删除转场编号为"' + _ids + '"的数据项?').then(function() {
|
||||
return delTransition_info(_ids)
|
||||
}).then(() => {
|
||||
getList()
|
||||
proxy.$modal.msgSuccess("删除成功")
|
||||
}).catch(() => {})
|
||||
}
|
||||
|
||||
/** 导出按钮操作 */
|
||||
function handleExport() {
|
||||
proxy.download('/produce/manage_sheep/transition_info/export',
|
||||
{ ...queryParams.value },
|
||||
`transition_info_${new Date().getTime()}.xlsx`)
|
||||
proxy.download('/produce/manage_sheep/transition_info/export', {
|
||||
...queryParams.value
|
||||
}, `transition_info_${new Date().getTime()}.xlsx`)
|
||||
}
|
||||
// 审批记录的对话框
|
||||
const approveDialog = ref(false);
|
||||
const approveForm = ref({});
|
||||
|
||||
/* -------------------- 审批 -------------------- */
|
||||
// 审批按钮操作
|
||||
function handleApprove(row) {
|
||||
approveForm.value = { ...row }
|
||||
approveDialog.value = true
|
||||
}
|
||||
function getTransTypeLabel(val) {
|
||||
const hit = trans_type.value.find(item => Number(item.value) === val)
|
||||
return hit ? hit.label : val
|
||||
// 打开审批对话框
|
||||
approveForm.value = { ...row };
|
||||
approveDialog.value = true;
|
||||
}
|
||||
|
||||
// 同意审批
|
||||
function handleApproveAgree() {
|
||||
approveForm.value.status = 1
|
||||
approveForm.value.status = 1; // 状态设置为同意
|
||||
updateTransition_info(approveForm.value).then(() => {
|
||||
approveDialog.value = false
|
||||
proxy.$modal.msgSuccess("审批成功,状态已更新为同意")
|
||||
getList()
|
||||
})
|
||||
approveDialog.value = false;
|
||||
proxy.$modal.msgSuccess("审批成功,状态已更新为同意");
|
||||
getList();
|
||||
}).catch((error) => {
|
||||
proxy.$modal.msgError(`审批失败:${error}`);
|
||||
});
|
||||
}
|
||||
|
||||
// 驳回审批
|
||||
function handleApproveReject() {
|
||||
approveForm.value.status = 2
|
||||
approveForm.value.status = 2; // 状态设置为驳回
|
||||
updateTransition_info(approveForm.value).then(() => {
|
||||
approveDialog.value = false
|
||||
proxy.$modal.msgSuccess("审批成功,状态已更新为驳回")
|
||||
getList()
|
||||
})
|
||||
approveDialog.value = false;
|
||||
proxy.$modal.msgSuccess("审批成功,状态已更新为驳回");
|
||||
getList();
|
||||
}).catch((error) => {
|
||||
proxy.$modal.msgError(`审批失败:${error}`);
|
||||
});
|
||||
}
|
||||
|
||||
/* -------------------- 下拉 -------------------- */
|
||||
function getVarietyOptions() {
|
||||
request({
|
||||
url: '/base/variety/list',
|
||||
method: 'get',
|
||||
params: { pageNum: 1, pageSize: 9999 }
|
||||
}).then(res => { varietyOptions.value = res.rows || [] })
|
||||
}
|
||||
|
||||
/* -------------------- 入口 -------------------- */
|
||||
onMounted(() => {
|
||||
getVarietyOptions()
|
||||
getList()
|
||||
})
|
||||
</script>
|
||||
getList()
|
||||
</script>
|
||||
|
@ -2,8 +2,8 @@
|
||||
<div class="app-container">
|
||||
<!-- 搜索 -->
|
||||
<el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
|
||||
<el-form-item label="管理耳号" prop="manageTags">
|
||||
<el-input v-model="queryParams.manageTags" placeholder="请输入管理耳号" clearable @keyup.enter="handleQuery" />
|
||||
<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="羊舍" prop="sheepfold">
|
||||
@ -19,8 +19,12 @@
|
||||
</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 v-model="daterangeCreateTime"
|
||||
value-format="YYYY-MM-DD"
|
||||
type="daterange"
|
||||
range-separator="-"
|
||||
start-placeholder="开始日期"
|
||||
end-placeholder="结束日期" />
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item>
|
||||
@ -33,19 +37,19 @@
|
||||
<el-row :gutter="10" class="mb8">
|
||||
<el-col :span="1.5">
|
||||
<el-button type="primary" plain icon="Plus" @click="handleAdd"
|
||||
v-hasPermi="['fixHoof:fixHoof:add']">新增</el-button>
|
||||
v-hasPermi="['fixHoof:fixHoof:add']">新增</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate"
|
||||
v-hasPermi="['fixHoof:fixHoof:edit']">修改</el-button>
|
||||
v-hasPermi="['fixHoof:fixHoof:edit']">修改</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete"
|
||||
v-hasPermi="['fixHoof:fixHoof:remove']">删除</el-button>
|
||||
v-hasPermi="['fixHoof:fixHoof:remove']">删除</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button type="warning" plain icon="Download" @click="handleExport"
|
||||
v-hasPermi="['fixHoof:fixHoof:export']">导出</el-button>
|
||||
v-hasPermi="['fixHoof:fixHoof:export']">导出</el-button>
|
||||
</el-col>
|
||||
<right-toolbar v-model:showSearch="showSearch" @queryTable="getList" />
|
||||
</el-row>
|
||||
@ -53,7 +57,7 @@
|
||||
<!-- 列表 -->
|
||||
<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="manageTags" />
|
||||
<el-table-column label="羊只id" align="center" prop="sheepId" />
|
||||
<el-table-column label="羊舍名称" align="center" prop="sheepfoldName" />
|
||||
<el-table-column label="品种" align="center" prop="varietyName" />
|
||||
<el-table-column label="备注" align="center" prop="comment" />
|
||||
@ -67,21 +71,24 @@
|
||||
<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)"
|
||||
v-hasPermi="['fixHoof:fixHoof:edit']">修改</el-button>
|
||||
v-hasPermi="['fixHoof:fixHoof:edit']">修改</el-button>
|
||||
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
|
||||
v-hasPermi="['fixHoof:fixHoof:remove']">删除</el-button>
|
||||
v-hasPermi="['fixHoof:fixHoof:remove']">删除</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
|
||||
<pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
|
||||
v-model:limit="queryParams.pageSize" @pagination="getList" />
|
||||
<pagination v-show="total > 0"
|
||||
:total="total"
|
||||
v-model:page="queryParams.pageNum"
|
||||
v-model:limit="queryParams.pageSize"
|
||||
@pagination="getList" />
|
||||
|
||||
<!-- 弹窗 -->
|
||||
<el-dialog :title="title" v-model="open" width="500px" append-to-body>
|
||||
<el-form ref="fixHoofRef" :model="form" :rules="rules" label-width="80px">
|
||||
<el-form-item label="耳号" prop="manageTags">
|
||||
<el-input v-model="form.manageTags" placeholder="请输入耳号" @blur="validateSheep" />
|
||||
<el-form-item label="羊只id" prop="sheepId">
|
||||
<el-input v-model="form.sheepId" placeholder="请输入羊只id" />
|
||||
</el-form-item>
|
||||
<el-form-item label="羊舍" prop="sheepfold">
|
||||
<el-select v-model="form.sheepfold" placeholder="请选择羊舍" clearable>
|
||||
@ -111,9 +118,9 @@
|
||||
</template>
|
||||
|
||||
<script setup name="FixHoof">
|
||||
import { listFixHoof, getFixHoof, delFixHoof, addFixHoof, updateFixHoof, checkSheepByManageTags, getVarietyOptions } from '@/api/produce/other/fixHoof/fixHoof'
|
||||
import { listFixHoof, getFixHoof, delFixHoof, addFixHoof, updateFixHoof } from '@/api/produce/other/fixHoof/fixHoof'
|
||||
import { listSheepfold_management as listSheepfold } from '@/api/fileManagement/sheepfold_management'
|
||||
// import request from '@/utils/request'
|
||||
import request from '@/utils/request'
|
||||
|
||||
const { proxy } = getCurrentInstance()
|
||||
|
||||
@ -127,7 +134,6 @@ const multiple = ref(true)
|
||||
const total = ref(0)
|
||||
const title = ref('')
|
||||
const daterangeCreateTime = ref([])
|
||||
const varietyOptions = ref([])
|
||||
|
||||
const data = reactive({
|
||||
form: {},
|
||||
@ -141,11 +147,8 @@ const data = reactive({
|
||||
createTime: null
|
||||
},
|
||||
rules: {
|
||||
// sheepId: [
|
||||
// { required: true, message: '耳号不能为空', trigger: 'blur' }
|
||||
// ],
|
||||
manageTags: [
|
||||
{ required: true, message: '耳号不能为空', trigger: 'blur' }
|
||||
sheepId: [
|
||||
{ required: true, message: '羊只id不能为空', trigger: 'blur' }
|
||||
],
|
||||
sheepfold: [
|
||||
{ required: true, message: '羊舍id不能为空', trigger: 'change' }
|
||||
@ -162,7 +165,7 @@ const data = reactive({
|
||||
const { queryParams, form, rules } = toRefs(data)
|
||||
|
||||
/* 列表 */
|
||||
function getList() {
|
||||
function getList () {
|
||||
loading.value = true
|
||||
const q = { ...queryParams.value }
|
||||
if (q.sheepId === '') q.sheepId = null
|
||||
@ -177,17 +180,14 @@ function getList() {
|
||||
total.value = res.total
|
||||
loading.value = false
|
||||
})
|
||||
getVarietyOptions({ pageNum: 1, pageSize: 9999 }).then(res => {
|
||||
varietyOptions.value = res.rows || []
|
||||
})
|
||||
}
|
||||
|
||||
function cancel() {
|
||||
function cancel () {
|
||||
open.value = false
|
||||
reset()
|
||||
}
|
||||
|
||||
function reset() {
|
||||
function reset () {
|
||||
form.value = {
|
||||
id: null,
|
||||
sheepId: null,
|
||||
@ -201,30 +201,30 @@ function reset() {
|
||||
proxy.resetForm('fixHoofRef')
|
||||
}
|
||||
|
||||
function handleQuery() {
|
||||
function handleQuery () {
|
||||
queryParams.value.pageNum = 1
|
||||
getList()
|
||||
}
|
||||
|
||||
function resetQuery() {
|
||||
function resetQuery () {
|
||||
daterangeCreateTime.value = []
|
||||
proxy.resetForm('queryRef')
|
||||
handleQuery()
|
||||
}
|
||||
|
||||
function handleSelectionChange(selection) {
|
||||
function handleSelectionChange (selection) {
|
||||
ids.value = selection.map(item => item.id)
|
||||
single.value = selection.length !== 1
|
||||
multiple.value = !selection.length
|
||||
}
|
||||
|
||||
function handleAdd() {
|
||||
function handleAdd () {
|
||||
reset()
|
||||
open.value = true
|
||||
title.value = '添加修蹄'
|
||||
}
|
||||
|
||||
function handleUpdate(row) {
|
||||
function handleUpdate (row) {
|
||||
reset()
|
||||
const _id = row.id || ids.value
|
||||
getFixHoof(_id).then(res => {
|
||||
@ -234,7 +234,7 @@ function handleUpdate(row) {
|
||||
})
|
||||
}
|
||||
|
||||
function submitForm() {
|
||||
function submitForm () {
|
||||
proxy.$refs.fixHoofRef.validate(valid => {
|
||||
if (!valid) return
|
||||
if (form.value.id) {
|
||||
@ -253,7 +253,7 @@ function submitForm() {
|
||||
})
|
||||
}
|
||||
|
||||
function handleDelete(row) {
|
||||
function handleDelete (row) {
|
||||
const _ids = row.id || ids.value
|
||||
proxy.$modal.confirm(`是否确认删除修蹄编号为"${_ids}"的数据项?`).then(() => {
|
||||
return delFixHoof(_ids)
|
||||
@ -263,45 +263,33 @@ function handleDelete(row) {
|
||||
})
|
||||
}
|
||||
|
||||
function handleExport() {
|
||||
function handleExport () {
|
||||
proxy.download('/produce/other/fixHoof/export', { ...queryParams.value }, `fixHoof_${new Date().getTime()}.xlsx`)
|
||||
}
|
||||
|
||||
/* 羊舍 */
|
||||
/* 下拉数据 */
|
||||
const sheepfoldOptions = ref([])
|
||||
function getSheepfoldOptions() {
|
||||
function getSheepfoldOptions () {
|
||||
listSheepfold({ pageNum: 1, pageSize: 9999 }).then(res => {
|
||||
sheepfoldOptions.value = res.rows
|
||||
})
|
||||
}
|
||||
|
||||
//校验羊只是否存在 失焦时校验
|
||||
async function validateSheep() {
|
||||
if (!form.value.manageTags) return;
|
||||
try {
|
||||
const { data } = await checkSheepByManageTags(form.value.manageTags.trim())
|
||||
if (!data) {
|
||||
proxy.$modal.msgError('该管理耳号不存在');
|
||||
// 清空
|
||||
form.value.manageTags = null;
|
||||
form.value.sheepId = null;
|
||||
form.value.sheepfold = null;
|
||||
form.value.varietyId = null;
|
||||
} else {
|
||||
// 隐藏字段:真正保存用
|
||||
form.value.sheepId = data.id;
|
||||
// 自动带出下拉框
|
||||
form.value.sheepfold = data.sheepfoldId;
|
||||
form.value.varietyId = data.varietyId;
|
||||
}
|
||||
} catch {
|
||||
proxy.$modal.msgError('校验失败');
|
||||
}
|
||||
const varietyOptions = ref([])
|
||||
function getVarietyOptions () {
|
||||
request({
|
||||
url: '/base/variety/list',
|
||||
method: 'get',
|
||||
params: { pageNum: 1, pageSize: 9999 }
|
||||
}).then(res => {
|
||||
varietyOptions.value = res.rows || []
|
||||
})
|
||||
}
|
||||
|
||||
/* 只保留一个 onMounted */
|
||||
onMounted(() => {
|
||||
getList()
|
||||
getSheepfoldOptions()
|
||||
getVarietyOptions()
|
||||
getList()
|
||||
})
|
||||
</script>
|
Loading…
x
Reference in New Issue
Block a user