src/api/fileManagement/sheep_grouping.js

@@ -9,16 +9,6 @@ export function listSheep_grouping(query) {
   })
 }
 
-
-// 查询羊只分组关联列表（联表）
-export function listSheep_grouping_join(query) {
-  return request({
-    url: '/sheep_grouping/sheep_grouping/listJoin',
-    method: 'get',
-    params: query
-  })
-}
-
 // 查询羊只分组关联详细
 export function getSheep_grouping(id) {
   return request({

src/views/fileManagement/sheep_file/index.vue

@@ -318,9 +318,6 @@
         <template #header>
           <span style="font-weight: bold; color: #333;">羊只状态</span>
         </template>
-        <template #default="scope">
-          <dict-tag :options="sheep_status" :value="scope.row.statusId"/>
-        </template>
       </el-table-column>
       <el-table-column
         v-if="columns['weaningWeight'].visible"
@@ -564,9 +561,6 @@
         <template #header>
           <span style="font-weight: bold; color: #333;">配种类型</span>
         </template>
-        <template #default="scope">
-          <dict-tag :options="breed_type" :value="scope.row.matingTypeId"/>
-        </template>
       </el-table-column>
       <el-table-column
         v-if="columns['pregDate'].visible"
@@ -751,9 +745,6 @@
         <template #header>
           <span style="font-weight: bold; color: #333;">是否性控</span>
         </template>
-        <template #default="scope">
-          <dict-tag :options="controlled" :value="scope.row.controlled"/>
-        </template>
       </el-table-column>
       <el-table-column
         v-if="columns['body'].visible"
@@ -790,9 +781,6 @@
         <template #header>
           <span style="font-weight: bold; color: #333;">入群来源</span>
         </template>
-        <template #default="scope">
-          <dict-tag :options="source" :value="scope.row.source"/>
-        </template>
       </el-table-column>
       <el-table-column
         v-if="columns['sourceDate'].visible"
@@ -999,10 +987,6 @@ import { listSheep_file, getSheep_file } from "@/api/fileManagement/sheep_file"
 
 const { proxy } = getCurrentInstance()
 const { sheep_gender } = proxy.useDict('sheep_gender')
-const { breed_type } = proxy.useDict('breed_type')
-const { controlled } = proxy.useDict('controlled')
-const { source } = proxy.useDict('source')
-const { sheep_status } = proxy.useDict('sheep_status')
 const sheep_fileList = ref([])
 const open = ref(false)
 const loading = ref(true)

src/views/fileManagement/sheep_grouping/index.vue

@@ -9,14 +9,6 @@
           @keyup.enter="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="耳号" prop="bsManageTags">
-        <el-input
-          v-model="queryParams.bsManageTags"
-          placeholder="请输入耳号"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="分组" prop="groupId">
         <el-select
           v-model="queryParams.groupId"
@@ -81,33 +73,15 @@
     </el-row>
 
     <el-table v-loading="loading" :data="sheep_groupingList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center"/>
-      <el-table-column label="主键ID" align="center" prop="id" sortable/>
-      <el-table-column label="羊只ID" align="center" prop="sheep_id" sortable/>
-      <el-table-column label="分组ID" align="center" prop="group_id" sortable/>
-      <el-table-column label="分组名称" align="center" prop="groupName" sortable>
+      <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="分组ID" align="center" prop="groupId" />
+      <el-table-column label="分组名称" align="center" prop="groupName">
         <template #default="scope">
-          {{ getGroupName(scope.row.group_id) }}
+          {{ getGroupName(scope.row.groupId) }}
         </template>
-      </el-table-column>
-      <el-table-column label="耳号" align="center" prop="bs_manage_tags" sortable/>
-      <el-table-column label="品种" align="center" prop="variety" sortable/>
-      <el-table-column label="性别" align="center" prop="gender" sortable>
-        <template #default="scope">
-          <dict-tag :options="sheep_gender" :value="scope.row.gender"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="羊只类型" align="center" prop="name" sortable/>
-      <el-table-column label="出生日期" align="center" prop="birthday" sortable/>
-      <el-table-column label="胎次" align="center" prop="parity" sortable/>
-      <el-table-column label="月龄" align="center" prop="month_age" sortable/>
-      <el-table-column label="繁殖状态" align="center" prop="breed" sortable/> 
-      <el-table-column label="出生体重" align="center" prop="birth_weight" sortable/>
-      <el-table-column label="断奶体重" align="center" prop="weaning_weight" sortable/>
-      <el-table-column label="当前体重" align="center" prop="current_weight" sortable/>
-      <el-table-column label="父号" align="center" prop="father_manage_tags" sortable/>
-      <el-table-column label="母号" align="center" prop="mother_manage_tags" sortable/>
-      <el-table-column label="家系" align="center" prop="family" sortable/>
+</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)" v-hasPermi="['sheep_grouping:sheep_grouping:edit']">修改</el-button>
@@ -154,8 +128,6 @@
 <script setup name="Sheep_grouping">
 import { listSheep_grouping, getSheep_grouping, delSheep_grouping, addSheep_grouping, updateSheep_grouping } from "@/api/fileManagement/sheep_grouping"
 import {listLeafGroup} from "@/api/fileManagement/group_management"
-import {listSheep_grouping_join} from "@/api/fileManagement/sheep_grouping"
-
 
 const { proxy } = getCurrentInstance()
 
@@ -169,7 +141,6 @@ const multiple = ref(true)
 const total = ref(0)
 const title = ref("")
 const leafGroupOptions = ref([])
-const { sheep_gender } = proxy.useDict('sheep_gender')
 
 const data = reactive({
   form: {},
@@ -177,8 +148,7 @@ const data = reactive({
     pageNum: 1,
     pageSize: 10,
     sheepId: null,
-    groupId: null,
-    bsManageTags: ''
+    groupId: null
   },
   leafGroupOptions: [],
   rules: {
@@ -194,38 +164,13 @@ const data = reactive({
 const { queryParams, form, rules } = toRefs(data)
 
 /** 查询羊只分组关联列表 */
-// function getList() {
-//   loading.value = true
-//   listSheep_grouping(queryParams.value).then(response => {
-//     sheep_groupingList.value = response.rows
-//     total.value = response.total
-//     loading.value = false
-//   })
-// }
-
-import { getSheep_file } from '@/api/fileManagement/sheep_file'
-
-async function getList() {
+function getList() {
   loading.value = true
-  try {
-      // 1. 把耳号字符串拆成数组
-    const params = {
-      ...queryParams.value,
-      bsManageTags: queryParams.value.bsManageTags
-        ? String(queryParams.value.bsManageTags)
-            .split(/[,，\s]+/)
-            .map(s => s.trim())
-            .filter(Boolean)
-        : undefined
-    }
-    console.log(params)
-    const { rows, total: t } = await listSheep_grouping_join(params)
-    console.log(rows)
-    sheep_groupingList.value = rows
-    total.value = t
-  } finally {
+  listSheep_grouping(queryParams.value).then(response => {
+    sheep_groupingList.value = response.rows
+    total.value = response.total
     loading.value = false
-  }
+  })
 }
 
 // 取消按钮