Compare commits

...

4 Commits

Author SHA1 Message Date
2734306690 修bug 2025-11-28 16:16:40 +08:00
543adc1ad6 修bug 2025-11-28 16:15:26 +08:00
7bcd8fb873 修bug 2025-11-28 14:08:29 +08:00
ae87ddb56d 修bug 2025-11-28 14:04:57 +08:00
4 changed files with 38 additions and 16 deletions

View File

@@ -199,12 +199,23 @@ export default {
};
// 处理查看营养需求详情
const handleViewNutrientRequirements = (pigType) => {
currentNutrientRequirements.value = pigType.pig_nutrient_requirements || [];
currentBreedName.value = pigType.breed_name;
currentAgeStageName.value = pigType.age_stage_name;
currentPigTypeId.value = pigType.id; // 设置当前的 pigType ID
showNutrientDialog.value = true;
const handleViewNutrientRequirements = async (pigType) => { // 添加 async
try {
// 强制重新获取该 pigType 的最新详情
const response = await FeedApi.getPigTypeById(pigType.id);
if (response.data) {
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) => {

View File

@@ -275,12 +275,23 @@ export default {
};
// 处理查看营养需求详情
const handleViewNutrientRequirements = (pigType) => {
currentNutrientRequirements.value = pigType.pig_nutrient_requirements || [];
currentBreedName.value = pigType.breed_name;
currentAgeStageName.value = pigType.age_stage_name;
currentPigTypeId.value = pigType.id; // 设置当前的 pigType ID
showNutrientDialog.value = true;
const handleViewNutrientRequirements = async (pigType) => { // 添加 async
try {
// 强制重新获取该 pigType 的最新详情
const response = await FeedApi.getPigTypeById(pigType.id);
if (response.data) {
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) => {

View File

@@ -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) {

View File

@@ -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) { // 允许浮点数误差
ElMessage.error(`原料总占比必须为100%,当前为${totalPercentage.toFixed(2)}%`);
if (totalPercentage > 100.001) { // 允许浮点数误差
ElMessage.error(`原料总占比不能超过100%,当前为${totalPercentage.toFixed(2)}%`);
return;
}