diff --git a/packages/FormConfig.vue b/packages/FormConfig.vue index 83caa6b0d743350b343c0d60ee50295ee4328dd2..00b1abf3363e76ca78785d2000895e5505beceb2 100644 --- a/packages/FormConfig.vue +++ b/packages/FormConfig.vue @@ -38,10 +38,10 @@ - + - + --> - + + + + - + - + export default { - name: "form-config", + name: "FormConfig", props: ["data"], } diff --git a/packages/config/date.vue b/packages/config/date.vue index 0942503959ce5b86f6796101f18750acfcffbfe5..af7804dce0e8152af97bb6ba64ce56a3b54e2502 100644 --- a/packages/config/date.vue +++ b/packages/config/date.vue @@ -79,8 +79,8 @@ let checkAge = (rule, value, callback) => { ? 1 : 0) console.log(age) - if (age < 18) { - callback(new Error("必须年满18岁")) + if (age < 40 || age > 80) { + callback(new Error("年龄不符合筛查条件")) } else { callback() } diff --git a/src/components/FormComponents/CustomForm/FormItemSelf.vue b/src/components/FormComponents/CustomForm/FormItemSelf.vue index 51eb50536d62fa34539ffbfffdee7d001f033b15..060d4bdfa041db4f57f8f1bc8cc5c0f169dd6059 100644 --- a/src/components/FormComponents/CustomForm/FormItemSelf.vue +++ b/src/components/FormComponents/CustomForm/FormItemSelf.vue @@ -5,11 +5,14 @@ :style="item.styles" :class="{ isDefects: defectsSet.includes(item.prop) }" > - +
- {{ columnIndex + 1 }} + {{ item.labelSuffix || columnIndex + 1 }}
- --> +
@@ -701,7 +711,6 @@ export default { .el-col { height: 100%; - height: 53px; display: flex; align-items: center; } @@ -710,6 +719,7 @@ export default { height: 100%; background: #fafafa; border-right: 1px solid #ccc; + font-size: 14px; justify-content: center; display: flex; align-items: center; diff --git a/src/components/FormComponents/CustomForm/index.vue b/src/components/FormComponents/CustomForm/index.vue index 7e7a92f1d81b912aae21bf5df99037e1f3137054..df9f253f66aaae55bdcbe7bd8e75fab8164d892f 100644 --- a/src/components/FormComponents/CustomForm/index.vue +++ b/src/components/FormComponents/CustomForm/index.vue @@ -68,6 +68,17 @@