This commit is contained in:
chenbo 2024-01-30 17:15:05 +08:00
parent 41774b4e61
commit f0ee2795c3
3 changed files with 113 additions and 81 deletions

View File

@ -33,7 +33,16 @@
<div class="mt-4">
<el-table :data="pager.lists" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" />
<el-table-column label="栏舍id" prop="fence_house_id" show-overflow-tooltip />
<el-table-column label="所属栏舍" prop="fence_house_id">
<template #default="{ row }">
<el-tag class="mr-2" v-if="row.fence_house_id != null" type="info"
>ID: {{ row.fence_house_id }}</el-tag
>
<el-tag class="mr-2" v-if="row.fenceHouseAttr != null" type="info"
>名称: {{ row.fenceHouseAttr.fence_house_name }}</el-tag
>
</template>
</el-table-column>
<el-table-column label="耳号" prop="sn" show-overflow-tooltip />
<el-table-column label="品类" prop="animal_type">
<template #default="{ row }">
@ -89,15 +98,19 @@ import { apiAnimalInfoLists, apiAnimalInfoDelete } from '@/api/animal_info'
import { timeFormat } from '@/utils/util'
import feedback from '@/utils/feedback'
import EditPopup from './edit.vue'
const { query } = useRoute()
const editRef = shallowRef<InstanceType<typeof EditPopup>>()
//
const showEdit = ref(false)
let fence_house_id = query.fence_house_id
if (typeof fence_house_id == 'undefined') {
fence_house_id = ''
}
//
const queryParams = reactive({
sn: '',
fence_house_id: fence_house_id
})
//

View File

@ -33,7 +33,7 @@
<div class="mt-4">
<el-table :data="pager.lists" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" />
<el-table-column label="养殖基地" prop="farm_id" show-overflow-tooltip >
<el-table-column label="养殖基地" prop="farm_id">
<template #default="{ row }">
<el-tag class="mr-2" v-if="row.farm_id != null" type="info"
@ -64,7 +64,7 @@
</template>
</el-table-column>
<el-table-column label="操作" width="120" fixed="right">
<el-table-column label="操作" width="300" fixed="right">
<template #default="{ row }">
<el-button
v-perms="['fence_house.fence_house/edit']"
@ -82,6 +82,22 @@
>
删除
</el-button>
<el-button
v-perms="['animal_info.animal_info/lists']"
type="primary"
link
>
<router-link
:to="{
path: getRoutePath('animal_info.animal_info/lists'),
query: {
fence_house_id: row.id
}
}"
>
动物档案
</router-link>
</el-button>
</template>
</el-table-column>
</el-table>
@ -101,6 +117,7 @@ import { apiFenceHouseLists, apiFenceHouseDelete } from '@/api/fence_house'
import { timeFormat } from '@/utils/util'
import feedback from '@/utils/feedback'
import EditPopup from './edit.vue'
import {getRoutePath} from "@/router";
const editRef = shallowRef<InstanceType<typeof EditPopup>>()
//

View File

@ -1,77 +1,79 @@
<?php
// +----------------------------------------------------------------------
// | likeadmin快速开发前后端分离管理后台PHP版
// +----------------------------------------------------------------------
// | 欢迎阅读学习系统程序代码,建议反馈是我们前进的动力
// | 开源版本可自由商用可去除界面版权logo
// | gitee下载https://gitee.com/likeshop_gitee/likeadmin
// | github下载https://github.com/likeshop-github/likeadmin
// | 访问官网https://www.likeadmin.cn
// | likeadmin团队 版权所有 拥有最终解释权
// +----------------------------------------------------------------------
// | author: likeadminTeam
// +----------------------------------------------------------------------
namespace app\adminapi\lists\animal_info;
use app\adminapi\lists\BaseAdminDataLists;
use app\common\model\animal_info\AnimalInfo;
use app\common\lists\ListsSearchInterface;
/**
* AnimalInfo列表
* Class AnimalInfoLists
* @package app\adminapi\listsanimal_info
*/
class AnimalInfoLists extends BaseAdminDataLists implements ListsSearchInterface
{
/**
* @notes 设置搜索条件
* @return \string[][]
* @author likeadmin
* @date 2024/01/10 15:53
*/
public function setSearch(): array
{
return [
'=' => ['sn'],
];
}
/**
* @notes 获取列表
* @return array
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\DbException
* @throws \think\db\exception\ModelNotFoundException
* @author likeadmin
* @date 2024/01/10 15:53
*/
public function lists(): array
{
return AnimalInfo::where($this->searchWhere)
->field(['id', 'fence_house_id', 'sn', 'animal_type', 'brand', 'physi_stage', 'gender', 'blood_purity', 'animal_source', 'current_estimation', 'algebra', 'birth', 'entry_date', 'birth_estimation', 'health_condition'])
->limit($this->limitOffset, $this->limitLength)
->order(['id' => 'desc'])
->select()
->toArray();
}
/**
* @notes 获取数量
* @return int
* @author likeadmin
* @date 2024/01/10 15:53
*/
public function count(): int
{
return AnimalInfo::where($this->searchWhere)->count();
}
<?php
// +----------------------------------------------------------------------
// | likeadmin快速开发前后端分离管理后台PHP版
// +----------------------------------------------------------------------
// | 欢迎阅读学习系统程序代码,建议反馈是我们前进的动力
// | 开源版本可自由商用可去除界面版权logo
// | gitee下载https://gitee.com/likeshop_gitee/likeadmin
// | github下载https://github.com/likeshop-github/likeadmin
// | 访问官网https://www.likeadmin.cn
// | likeadmin团队 版权所有 拥有最终解释权
// +----------------------------------------------------------------------
// | author: likeadminTeam
// +----------------------------------------------------------------------
namespace app\adminapi\lists\animal_info;
use app\adminapi\lists\BaseAdminDataLists;
use app\common\model\animal_info\AnimalInfo;
use app\common\lists\ListsSearchInterface;
/**
* AnimalInfo列表
* Class AnimalInfoLists
* @package app\adminapi\listsanimal_info
*/
class AnimalInfoLists extends BaseAdminDataLists implements ListsSearchInterface
{
/**
* @notes 设置搜索条件
* @return \string[][]
* @author likeadmin
* @date 2024/01/10 15:53
*/
public function setSearch(): array
{
return [
'=' => ['sn', 'fence_house_id'],
];
}
/**
* @notes 获取列表
* @return array
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\DbException
* @throws \think\db\exception\ModelNotFoundException
* @author likeadmin
* @date 2024/01/10 15:53
*/
public function lists(): array
{
return AnimalInfo::where($this->searchWhere)
->field(['id', 'fence_house_id', 'sn', 'animal_type', 'brand', 'physi_stage', 'gender', 'blood_purity', 'animal_source', 'current_estimation', 'algebra', 'birth', 'entry_date', 'birth_estimation', 'health_condition'])
->with(['fenceHouseAttr'])
->limit($this->limitOffset, $this->limitLength)
->order(['id' => 'desc'])
->select()
->toArray();
}
/**
* @notes 获取数量
* @return int
* @author likeadmin
* @date 2024/01/10 15:53
*/
public function count(): int
{
return AnimalInfo::where($this->searchWhere)->count();
}
}