|
@@ -1181,8 +1181,9 @@
|
|
|
const fieldElement = repeatingForm.value.elementItem[j]
|
|
const fieldElement = repeatingForm.value.elementItem[j]
|
|
|
const fieldName = fieldElement.tableField || fieldElement.name
|
|
const fieldName = fieldElement.tableField || fieldElement.name
|
|
|
const fieldValue = item[fieldName]
|
|
const fieldValue = item[fieldName]
|
|
|
-
|
|
|
|
|
- if (fieldValue == '' || fieldValue === undefined || fieldValue === null) {
|
|
|
|
|
|
|
+
|
|
|
|
|
+ // 只有当 noNull 等于 '1' 时才进行非空验证
|
|
|
|
|
+ if (fieldElement.noNull == '1' && (fieldValue == '' || fieldValue === undefined || fieldValue === null)) {
|
|
|
const name = fieldElement.elementName.slice(3)
|
|
const name = fieldElement.elementName.slice(3)
|
|
|
$modal.msgError(`详情表${name}不能为空`)
|
|
$modal.msgError(`详情表${name}不能为空`)
|
|
|
return false
|
|
return false
|