update

admin/src/views/animal_info/index.vue

@@ -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
 })
 
 // 选中数据

admin/src/views/fence_house/index.vue

@@ -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>>()
 // 是否显示编辑框

app/adminapi/lists/animal_info/AnimalInfoLists.php

@@ -38,7 +38,8 @@ class AnimalInfoLists extends BaseAdminDataLists implements ListsSearchInterface
     public function setSearch(): array
     {
         return [
-            '=' => ['sn'],
+            '=' => ['sn', 'fence_house_id'],
+
         ];
     }
 
@@ -56,6 +57,7 @@ class AnimalInfoLists extends BaseAdminDataLists implements ListsSearchInterface
     {
         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()