新增羊只中羊只类型改为非必填；转场转群部分搜索框去除创建时间和事件类型；三个改**页面的新增，查询，导出完善；每页条数设置；填写数字的字段数可排序

src/views/produce/other/castrate/index.vue

@@ -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="创建时间" style="width: 308px">
-        <el-date-picker v-model="daterangeCreateTime" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
+      <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-form-item>
       <el-form-item label="管理耳号" prop="manageTags">
@@ -51,19 +51,23 @@
     <!-- 列表表格 -->
     <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="eventDate" width="130">
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.eventDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
       <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} {h}:{i}') }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template #default="scope">
           <!-- 按需添加 是否需要修改功能 -->
@@ -76,7 +80,7 @@
     </el-table>
 
     <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
-      v-model:limit="queryParams.pageSize" @pagination="getList" />
+      v-model:limit="queryParams.pageSize" @pagination="getList" :page-sizes="[20, 50, 100, 200, 500, 1000, 2000]" />
 
     <!-- 新增/修改弹窗 -->
     <el-dialog :title="title" v-model="open" width="500px" append-to-body>
@@ -101,6 +105,9 @@
         <el-form-item label="技术员" prop="technician">
           <el-input v-model="form.technician" placeholder="请输入技术员" />
         </el-form-item>
+        <el-form-item label="事件日期" prop="eventDate">
+          <el-date-picker v-model="form.eventDate" value-format="YYYY-MM-DD" type="date" placeholder="请选择事件日期" />
+        </el-form-item>
       </el-form>
       <template #footer>
         <div class="dialog-footer">
@@ -131,37 +138,38 @@ const title = ref('')
 const daterangeCreateTime = ref([])
 const sheepOptions = ref([])
 const varietyOptions = ref([])
-
+const daterangeEventDate = ref([])
 
 const data = reactive({
   form: {
     manageTags: [],
     sheepfold: null,
+    sheepfoldDisabled: false,
     technician: null,
-    tagDetails: {}
+    tagDetails: {},
+    eventDate: null,
   },
   queryParams: {
     pageNum: 1,
-    pageSize: 10,
+    pageSize: 20,
     manageTags: null,
     // sheepId: null,
     sheepfold: null,
     varietyId: null,
     technician: null,
-    createTime: null
+    createTime: null,
+    beginEventDate: null,
+    endEventDate: null,
   },
   rules: {
-    // sheepId: [
-    //   { required: true, message: '羊只id不能为空', trigger: 'blur' }
-    // ],
     manageTags: [
       { required: true, message: '请输入管理耳号', trigger: 'blur' }
     ],
-    // sheepfold: [
-    //   { required: true, message: '请选择羊舍', trigger: 'change' }
-    // ],
     technician: [
       { required: true, message: '请输入技术员', trigger: 'blur' }
+    ],
+    eventDate: [
+      { required: true, message: '请选择事件日期', trigger: 'change' }
     ]
   }
 })
@@ -257,9 +265,14 @@ function getList() {
     q.params.beginCreateTime = daterangeCreateTime.value[0];
     q.params.endCreateTime = daterangeCreateTime.value[1];
   }
+  if (daterangeEventDate.value?.length) {
+    q.params.beginEventDate = daterangeEventDate.value[0];
+    q.params.endEventDate = daterangeEventDate.value[1];
+  }
 
   listCastrate(q).then(res => {
     castrateList.value = res.rows;
+    console.log("后端返回的列表数据：", res.rows);
     total.value = res.total;
     loading.value = false;
   });
@@ -282,6 +295,7 @@ function reset() {
     manageTags: [],
     sheepfold: null,
     technician: null,
+    eventDate: null
   };
   sheepOptions.value = [];
   proxy.resetForm('castrateRef');
@@ -296,6 +310,7 @@ function handleQuery() {
 //重置
 function resetQuery() {
   daterangeCreateTime.value = []
+  daterangeEventDate.value = []
   proxy.resetForm('queryRef')
   handleQuery()
 }
@@ -388,7 +403,8 @@ function submitForm() {
         sheepfold: details.sheepfoldId || form.value.sheepfold,
         technician: form.value.technician,
         varietyId: details.varietyId,
-        comment: details.comment
+        comment: details.comment,
+        eventDate: form.value.eventDate
       });
     });