diff --git a/src/components/FormComponents/CustomForm/FormItemSelf.vue b/src/components/FormComponents/CustomForm/FormItemSelf.vue index f3bc7ca831ba9794014fd0eeadbea91e6427cf2e..7e7c311ff8bc11d38dd089010d246e4fe0b34073 100644 --- a/src/components/FormComponents/CustomForm/FormItemSelf.vue +++ b/src/components/FormComponents/CustomForm/FormItemSelf.vue @@ -798,6 +798,13 @@ export default { message: "请选择" + targetItem.label, }, ] + } else if (targetItem.type == "upload") { + targetItem.rules = [ + { + required: true, + message: "请上传" + targetItem.label, + }, + ] } else { targetItem.rules = [ { @@ -829,13 +836,24 @@ export default { if (filterArr.includes(targetItem.column[index].prop)) { return } - if (targetItem.column[index].type == "checkbox") { + if ( + targetItem.column[index].type == "checkbox" || + targetItem.column[index].type == "date" || + targetItem.column[index].type == "radio" + ) { targetItem.column[index].rules = [ { required: true, message: "请选择" + targetItem.column[index].label, }, ] + } else if (targetItem.column[index].type == "upload") { + targetItem.rules = [ + { + required: true, + message: "请上传" + targetItem.column[index].label, + }, + ] } else { targetItem.column[index].rules = [ { diff --git a/src/components/FormComponents/CustomForm/FormItemText.vue b/src/components/FormComponents/CustomForm/FormItemText.vue index e9262da5d9a512135275f8ce2b3145fad4b54d24..8da2ed0f48220d9b825359dae6754e9121241c3e 100644 --- a/src/components/FormComponents/CustomForm/FormItemText.vue +++ b/src/components/FormComponents/CustomForm/FormItemText.vue @@ -28,7 +28,7 @@ {{ unionName }} {{ - String(form[item.prop]) | getItemText(item.dicData, item.type) + form[item.prop] | getItemText(item.dicData, item.type) }} {{