|
@@ -380,29 +380,24 @@ const validateNumericFields = (fields: Record<string, any>, fieldsToValidate: st
|
|
|
|
|
|
for (const field of fieldsToValidate) {
|
|
|
const value = fields[field];
|
|
|
+ const column = flatWeekColumns.value.find(col => col.field === field);
|
|
|
+ const title = column ? column.title : field;
|
|
|
+
|
|
|
if (numericFields.includes(field)) {
|
|
|
if (value === null || value === undefined || value === '') {
|
|
|
- const column = weekColumns.value.find(col => col.field === field);
|
|
|
- const title = column ? column.title : field;
|
|
|
ElMessage.warning(`${title} 不能为空`);
|
|
|
return false;
|
|
|
}
|
|
|
if (isNaN(Number(value))) {
|
|
|
- const column = weekColumns.value.find(col => col.field === field);
|
|
|
- const title = column ? column.title : field;
|
|
|
ElMessage.warning(`${title} 必须为数字`);
|
|
|
return false;
|
|
|
}
|
|
|
} else if (integerFields.includes(field)) {
|
|
|
if (value === null || value === undefined || value === '') {
|
|
|
- const column = weekColumns.value.find(col => col.field === field);
|
|
|
- const title = column ? column.title : field;
|
|
|
ElMessage.warning(`${title} 不能为空`);
|
|
|
return false;
|
|
|
}
|
|
|
if (!Number.isInteger(Number(value)) || isNaN(Number(value))) {
|
|
|
- const column = weekColumns.value.find(col => col.field === field);
|
|
|
- const title = column ? column.title : field;
|
|
|
ElMessage.warning(`${title} 必须为整数`);
|
|
|
return false;
|
|
|
}
|