修bug

src/components/feed/PigAgeStageTable.vue

@@ -199,12 +199,23 @@ export default {
     };
 
     // 处理查看营养需求详情
-    const handleViewNutrientRequirements = (pigType) => {
+    const handleViewNutrientRequirements = async (pigType) => { // 添加 async
-      currentNutrientRequirements.value = pigType.pig_nutrient_requirements || [];
+      try {
-      currentBreedName.value = pigType.breed_name;
+        // 强制重新获取该 pigType 的最新详情
-      currentAgeStageName.value = pigType.age_stage_name;
+        const response = await FeedApi.getPigTypeById(pigType.id);
-      currentPigTypeId.value = pigType.id; // 设置当前的 pigType ID
+        if (response.data) {
-      showNutrientDialog.value = true;
+          currentNutrientRequirements.value = response.data.pig_nutrient_requirements || [];
+          currentBreedName.value = response.data.breed_name;
+          currentAgeStageName.value = response.data.age_stage_name;
+          currentPigTypeId.value = response.data.id; // 设置当前的 pigType ID
+          showNutrientDialog.value = true;
+        } else {
+          ElMessage.error('获取猪类型详情失败');
+        }
+      } catch (error) {
+        console.error('获取猪类型详情失败:', error);
+        ElMessage.error('获取猪类型详情失败');
+      }
     };
 
     const handleEdit = (row) => {

src/components/feed/PigBreedTable.vue

@@ -275,12 +275,23 @@ export default {
     };
 
     // 处理查看营养需求详情
-    const handleViewNutrientRequirements = (pigType) => {
+    const handleViewNutrientRequirements = async (pigType) => { // 添加 async
-      currentNutrientRequirements.value = pigType.pig_nutrient_requirements || [];
+      try {
-      currentBreedName.value = pigType.breed_name;
+        // 强制重新获取该 pigType 的最新详情
-      currentAgeStageName.value = pigType.age_stage_name;
+        const response = await FeedApi.getPigTypeById(pigType.id);
-      currentPigTypeId.value = pigType.id; // 设置当前的 pigType ID
+        if (response.data) {
-      showNutrientDialog.value = true;
+          currentNutrientRequirements.value = response.data.pig_nutrient_requirements || [];
+          currentBreedName.value = response.data.breed_name;
+          currentAgeStageName.value = response.data.age_stage_name;
+          currentPigTypeId.value = response.data.id; // 设置当前的 pigType ID
+          showNutrientDialog.value = true;
+        } else {
+          ElMessage.error('获取猪类型详情失败');
+        }
+      } catch (error) {
+        console.error('获取猪类型详情失败:', error);
+        ElMessage.error('获取猪类型详情失败');
+      }
     };
 
     const handleEdit = (row) => {

src/components/feed/PigNutrientRequirementsEditor.vue

@@ -132,7 +132,7 @@ export default {
 
       try {
         // 调用API更新营养需求
-        await FeedApi.updatePigNutrientRequirements(props.pigTypeId, { pig_nutrient_requirements: requirementsToSave });
+        await FeedApi.updatePigTypeNutrientRequirements(props.pigTypeId, { nutrient_requirements: requirementsToSave });
         ElMessage.success('营养需求更新成功');
         emit('save'); // 通知父组件保存成功
       } catch (error) {

src/components/feed/RecipeDetailDialog.vue

@@ -225,11 +225,11 @@ export default {
 
     // 保存配方
     const handleSaveRecipe = async () => {
-      // 验证占比总和是否为100
+      // 验证占比总和是否不超过100
       const totalPercentage = localIngredientDetails.value.reduce((sum, ing) => sum + ing.percentage, 0);
 
-      if (Math.abs(totalPercentage - 100) > 0.001) { // 允许浮点数误差
+      if (totalPercentage > 100.001) { // 允许浮点数误差
-        ElMessage.error(`原料总占比必须为100%，当前为${totalPercentage.toFixed(2)}%`);
+        ElMessage.error(`原料总占比不能超过100%，当前为${totalPercentage.toFixed(2)}%`);
         return;
       }