src/views/produce/bodyManage/body_score/index.vue

@@ -183,9 +183,6 @@ const data = reactive({
     score: [
       { required: true, message: '请输入体况评分', trigger: 'blur' }
     ],
-    datetime:[
-      { required: true, message: '请选择事件日期', trigger: 'blur' }
-    ],
     technician: [
       { required: true, message: '请输入技术员', trigger: 'blur' }
     ]

src/views/produce/bodyManage/breast_rating/index.vue

@@ -182,9 +182,6 @@ const data = reactive({
     manageTags: [
       { required: true, message: '请输入管理耳号', trigger: 'blur' }
     ],
-    eventDate:[
-      { required: true, message: '请选择事件日期', trigger: 'blur' }
-    ],
     score: [
       { required: true, message: '请输入乳房评分', trigger: 'blur' }
     ],

src/views/produce/manage_sheep/add_sheep/index.vue

@@ -14,24 +14,9 @@
             <el-input v-model="form.earNumber" placeholder="请输入耳号" @blur="handleEarNumberBlur" />
           </el-form-item>
         </el-col>
-        <el-col :span="10">
-          <el-form-item label="入群日期" prop="joinDate">
-            <el-date-picker v-model="form.joinDate" type="date" placeholder="选择入群日期" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-
-      <el-row :gutter="20">
-        <el-col :span="10">
-          <el-form-item label="牧场" prop="ranchId">
-            <el-select v-model="form.ranchId" placeholder="请选择牧场" clearable @change="handleRanchChange" required>
-              <el-option v-for="ranch in ranchOptions" :key="ranch.id" :label="ranch.ranchName" :value="ranch.id" />
-            </el-select>
-          </el-form-item>
-        </el-col>
         <el-col :span="10">
           <el-form-item label="羊舍" prop="sheepfold">
-            <el-select v-model="form.sheepfold" placeholder="请选择羊舍" clearable :disabled="!form.ranchId">
+            <el-select v-model="form.sheepfold" placeholder="请选择羊舍" clearable>
               <el-option v-for="item in sheepfoldOptions" :key="item.id" :label="item.sheepfoldName" :value="item.id" />
             </el-select>
           </el-form-item>
@@ -99,7 +84,11 @@
       </el-row>
 
       <el-row :gutter="20">
-
+        <el-col :span="10">
+          <el-form-item label="入群日期" prop="joinDate">
+            <el-date-picker v-model="form.joinDate" type="date" placeholder="选择入群日期" />
+          </el-form-item>
+        </el-col>
         <el-col :span="10">
           <el-form-item label="技术员" prop="technician">
             <el-input v-model="form.technician" placeholder="请输入技术员" />
@@ -141,7 +130,6 @@ import { ref, getCurrentInstance } from 'vue'
 import request from '@/utils/request'
 import { addSheep, exportSheepForm } from '@/api/produce/manage_sheep/add_sheep'
 import { getSheepTypeList } from "@/api/produce/bodyManage/body_measure"
-import { listRanch } from '@/api/produce/manage_sheep/trans_group'
 import { listSheepfold_management as listSheepfold } from '@/api/fileManagement/sheepfold_management'
 import { getToken } from '@/utils/auth'
 
@@ -149,7 +137,6 @@ import { getToken } from '@/utils/auth'
 const { proxy } = getCurrentInstance()
 const form = ref({
   earNumber: '',
-  ranchId: null,
   sheepfold: '',
   father: '',
   mother: '',
@@ -164,17 +151,14 @@ const form = ref({
   technician: ''
 })
 const formRef = ref(null)
-const sheepfoldOptions = ref([])
+
-const varietyOptions = ref([])
-const ranchOptions = ref([])
 const rules = {
   earNumber: [
     { required: true, message: '请输入耳号', trigger: 'blur' },
     { validator: checkEarNumberExists, trigger: 'blur' }
   ],
-  ranchId: [{ required: true, message: '请选择牧场', trigger: 'change' }],
   sheepfold: [{ required: true, message: '请选择羊舍', trigger: 'change' }],
-  bornWeight: [{ required: true, message: '请输入出生体重', trigger: 'change' }],
+  bornWeight: [{ required: true, message: '请输入出生体重', trigger: 'blur' }],
   birthday: [{ required: true, message: '请选择出生日期', trigger: 'change' }],
   gender: [{ required: true, message: '请选择性别', trigger: 'change' }],
   varietyId: [{ required: true, message: '请选择品种', trigger: 'change' }],
@@ -215,33 +199,15 @@ function handleEarNumberBlur() {
   formRef.value.validateField('earNumber')
 }
 
-function handleRanchChange(ranchId) {
-  form.value.sheepfold = '';
-  sheepfoldOptions.value = [];
 
-  if (!ranchId) return;
+const sheepfoldOptions = ref([])
-
+const varietyOptions = ref([])
-  listSheepfold({
-    pageNum: 1,
-    pageSize: 9999,
-    ranchId: ranchId
-  }).then(res => {
-    if (res.rows && res.rows.length > 0) {
-      sheepfoldOptions.value = res.rows || [];
-    } else {
-      proxy.$modal.msgWarning(`该牧场下暂无羊舍数据`);
-    }
-  }).catch(error => {
-    console.error('加载羊舍数据失败', error);
-    proxy.$modal.msgError('获取羊舍数据失败');
-  });
-}
 
 //羊舍列表
 function getSheepfoldOptions() {
-  // listSheepfold({ pageNum: 1, pageSize: 9999 }).then(res => {
+  listSheepfold({ pageNum: 1, pageSize: 9999 }).then(res => {
-  //   sheepfoldOptions.value = res.rows || []
+    sheepfoldOptions.value = res.rows || []
-  // })
+  })
 }
 
 //品种列表
@@ -255,19 +221,6 @@ function getVarietyOptions() {
   })
 }
 
-//加载所有牧场列表
-function loadRanchList() {
-  listRanch().then(res => {
-    ranchOptions.value = res.rows.map(ranch => ({
-      id: ranch.id,
-      ranchName: ranch.ranch
-    }));
-  }).catch(error => {
-    console.error('加载牧场列表失败', error);
-    proxy.$modal.msgError('获取牧场数据失败');
-  });
-}
-
 // 加载羊只类别数据
 const sheepTypeList = ref([]);
 function loadSheepTypeList() {
@@ -304,7 +257,6 @@ function submitForm() {
     addSheep(formData).then(res => {
       if (res.code === 200) {
         proxy.$modal.msgSuccess('新增成功');
-        formRef.value.clearValidate();
         resetForm();
       } else {
         proxy.$modal.msgError(res.msg || '新增失败');
@@ -384,7 +336,6 @@ function handleImportError(err) {
 onMounted(() => {
   getSheepfoldOptions()
   loadSheepTypeList()
-  loadRanchList()
   getVarietyOptions()
 })
 </script>