diff --git a/src/views/business/fieldTest/approve/edit.vue b/src/views/business/fieldTest/approve/edit.vue index 07712d6..87b7dd7 100644 --- a/src/views/business/fieldTest/approve/edit.vue +++ b/src/views/business/fieldTest/approve/edit.vue @@ -66,13 +66,25 @@ remark: '', // 备注 processId: '', // 流程实例id }) + +// 自定义校验规则--要求预计结束时间大于预计开始时间 +const requireOverTimeValid = (rule: any, value: any, callback: any) => { + if (!value) { + return callback(new Error('要求预计结束时间不能为空')) + } + if (new Date(form.value.preEndTime).getTime() <= new Date(form.value.preStartTime).getTime()) { + return callback(new Error('不能小于预计开始时间')) + } + callback() +} // 校验规则 const formRules = ref({ directorId: [{ required: true, message: '要求负责人不能为空', trigger: ['blur', 'change'] }], taskSource: [{ required: true, message: '要求任务来源不能为空', trigger: ['blur', 'change'] }], preCost: [{ required: true, message: '要求预计计量费用不能为空', trigger: ['blur', 'change'] }], preStartTime: [{ required: true, message: '要求预计开始时间不能为空', trigger: ['blur', 'change'] }], - preEndTime: [{ required: true, message: '要求预计结束时间不能为空', trigger: ['blur', 'change'] }], + preEndTime: [{ type: 'date', validator: requireOverTimeValid, trigger: 'change' }], + // preEndTime: [{ required: true, message: '要求预计结束时间不能为空', trigger: ['blur', 'change'] }], executiveAddress: [{ required: true, message: '要求现场测试、校准或检定地点不能为空', trigger: ['blur', 'change'] }], hazardSourceAndPreventionMethod: [{ required: true, message: '要求主要危害源及预防措施不能为空', trigger: ['blur', 'change'] }], executiveEnvironment: [{ required: true, message: '要求现场环境条件不能为空', trigger: ['blur', 'change'] }], diff --git a/src/views/business/fieldTest/approve/edit.vue b/src/views/business/fieldTest/approve/edit.vue index 07712d6..87b7dd7 100644 --- a/src/views/business/fieldTest/approve/edit.vue +++ b/src/views/business/fieldTest/approve/edit.vue @@ -66,13 +66,25 @@ remark: '', // 备注 processId: '', // 流程实例id }) + +// 自定义校验规则--要求预计结束时间大于预计开始时间 +const requireOverTimeValid = (rule: any, value: any, callback: any) => { + if (!value) { + return callback(new Error('要求预计结束时间不能为空')) + } + if (new Date(form.value.preEndTime).getTime() <= new Date(form.value.preStartTime).getTime()) { + return callback(new Error('不能小于预计开始时间')) + } + callback() +} // 校验规则 const formRules = ref({ directorId: [{ required: true, message: '要求负责人不能为空', trigger: ['blur', 'change'] }], taskSource: [{ required: true, message: '要求任务来源不能为空', trigger: ['blur', 'change'] }], preCost: [{ required: true, message: '要求预计计量费用不能为空', trigger: ['blur', 'change'] }], preStartTime: [{ required: true, message: '要求预计开始时间不能为空', trigger: ['blur', 'change'] }], - preEndTime: [{ required: true, message: '要求预计结束时间不能为空', trigger: ['blur', 'change'] }], + preEndTime: [{ type: 'date', validator: requireOverTimeValid, trigger: 'change' }], + // preEndTime: [{ required: true, message: '要求预计结束时间不能为空', trigger: ['blur', 'change'] }], executiveAddress: [{ required: true, message: '要求现场测试、校准或检定地点不能为空', trigger: ['blur', 'change'] }], hazardSourceAndPreventionMethod: [{ required: true, message: '要求主要危害源及预防措施不能为空', trigger: ['blur', 'change'] }], executiveEnvironment: [{ required: true, message: '要求现场环境条件不能为空', trigger: ['blur', 'change'] }], diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue index 29d029d..0352604 100644 --- a/src/views/business/fieldTest/record/edit.vue +++ b/src/views/business/fieldTest/record/edit.vue @@ -54,10 +54,14 @@ laboratoryId: [{ required: true, message: '要求实验室不能为空', trigger: ['blur', 'change'] }], siteExecutiveNo: [{ required: true, message: '要求现场检测编号不能为空', trigger: ['blur', 'change'] }], executiveAddress: [{ required: true, message: '要求现场工作地点不能为空', trigger: ['blur', 'change'] }], - outputVoltage: [{ required: true, message: '要求供电电压不能为空', trigger: ['blur', 'change'] }], - zeroGroundVoltage: [{ required: true, message: '要求零地电压不能为空', trigger: ['blur', 'change'] }], - temperature: [{ required: true, message: '要求温度不能为空', trigger: ['blur', 'change'] }], - humidity: [{ required: true, message: '要求相对湿度不能为空', trigger: ['blur', 'change'] }], + outputVoltage: [{ required: true, message: '要求供电电压不能为空', trigger: ['blur', 'change'] }, + { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '供电电压只能为数字', trigger: ['blur', 'change'] }], + zeroGroundVoltage: [{ required: true, message: '要求零地电压不能为空', trigger: ['blur', 'change'] }, + { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '零地电压只能为数字', trigger: ['blur', 'change'] }], + temperature: [{ required: true, message: '要求温度不能为空', trigger: ['blur', 'change'] }, + { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度只能为数字', trigger: ['blur', 'change'] }], + humidity: [{ required: true, message: '要求相对湿度不能为空', trigger: ['blur', 'change'] }, + { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '相对湿度只能为数字', trigger: ['blur', 'change'] }], }) // ----------------------------------路由参数-------------------------------------------- if ($route.params && $route.params.type) { @@ -155,6 +159,7 @@ }) } +// 获取详情信息 const getInfo = () => { getRecordDetail({ id: infoId.value }).then((res) => { form.value = res.data @@ -458,7 +463,7 @@ align="center" /> @@ -468,6 +473,9 @@ label="外观及功能检查" align="center" > + @@ -477,6 +485,9 @@ label="指标测试结果" align="center" > + @@ -486,6 +497,9 @@ label="记录人" align="center" > +