diff --git a/src/views/eam/device/deviceinspectionjob/deviceInspectionMain.data.ts b/src/views/eam/device/deviceinspectionjob/deviceInspectionMain.data.ts index 3461703..c73766a 100644 --- a/src/views/eam/device/deviceinspectionjob/deviceInspectionMain.data.ts +++ b/src/views/eam/device/deviceinspectionjob/deviceInspectionMain.data.ts @@ -483,8 +483,8 @@ export const DeviceInspectionDetailRules = reactive({ status: [required], actualMinutes: [required, { validator: validateNum, message: '请输入正整数', trigger: 'blur' }], maintenance: [required], - completionTime: [{ required: true, message: '该项为必填项', trigger: 'blur' }], - uncompleted: [{ required: true, message: '该项为必填项', trigger: 'blur' }] + completionTime: [{ required: false, message: '该项为必填项', trigger: 'blur' }], + uncompleted: [{ required: false, message: '该项为必填项', trigger: 'blur' }] }) export const DeviceInspectionDetail = useCrudSchemas( diff --git a/src/views/eam/device/deviceinspectionjob/index.vue b/src/views/eam/device/deviceinspectionjob/index.vue index e2fb4f9..c96a1c4 100644 --- a/src/views/eam/device/deviceinspectionjob/index.vue +++ b/src/views/eam/device/deviceinspectionjob/index.vue @@ -502,8 +502,9 @@ const onChange = (field, cur, item) => { } const formSelectChange = (field, cur, item) => { - item.tableFormRules = cloneDeep(DeviceInspectionDetailRules) + console.log(4444,field) if (field == 'status') { + item.tableFormRules = cloneDeep(DeviceInspectionDetailRules) if (cur == '1') { DeviceInspectionDetail.allSchemas.tableFormColumns.find(item => item.field == 'uncompleted').disabled = false DeviceInspectionDetail.allSchemas.tableFormColumns.find(item => item.field == 'completionTime').disabled = true @@ -648,20 +649,21 @@ const submitForm = async (formType, data) => { } -function detailOnChange(field, cur, item,formRef) { +function detailOnChange(field, cur, item, formRef) { + console.log(2233,field) if (field == 'status') { if (cur == '1') { DeviceInspectionDetail.allSchemas.formSchema.find(item => item.field == 'uncompleted').componentProps.disabled = false DeviceInspectionDetail.allSchemas.formSchema.find(item => item.field == 'completionTime').componentProps.disabled = true formRef.setValues({completionTime:''}) - DeviceInspectionDetailRules.uncompleted = [{ required: true, message: '该项为必填项' }] - DeviceInspectionDetailRules.completionTime = [{ required: false }] + item.tableFormRules.uncompleted = [{ required: true, message: '该项为必填项' , trigger: ['blur','change']}] + item.tableFormRules.completionTime = [{ required: false, message: '该项为必填项' , trigger: ['blur','change']}] } else { DeviceInspectionDetail.allSchemas.formSchema.find(item => item.field == 'uncompleted').componentProps.disabled = true DeviceInspectionDetail.allSchemas.formSchema.find(item => item.field == 'completionTime').componentProps.disabled = false - DeviceInspectionDetailRules.uncompleted = [{ required: false }] formRef.setValues({uncompleted:''}) - DeviceInspectionDetailRules.completionTime = [{ required: true , message: '该项为必填项'}] + item.tableFormRules.uncompleted = [{ required: false, message: '该项为必填项', trigger: ['blur', 'change'] }] + item.tableFormRules.completionTime = [{ required: true, message: '该项为必填项' , trigger: ['blur','change']}] } } } @@ -669,22 +671,21 @@ function detailOnChange(field, cur, item,formRef) { const openFormCallBack = (type, row, masterParmas, callback) => { if (row == undefined || row == null) { DeviceInspectionDetail.allSchemas.formSchema.find(item => item.field == 'uncompleted').componentProps.disabled = true - DeviceInspectionDetail.allSchemas.formSchema.find(item => item.field == 'completionTime').componentProps.disabled = false - DeviceInspectionDetailRules.uncompleted = [{ required: false }] - DeviceInspectionDetailRules.completionTime = [{ required: true ,message: '该项为必填项'}] + DeviceInspectionDetail.allSchemas.formSchema.find(item => item.field == 'completionTime').componentProps.disabled = false DeviceInspectionDetail.allSchemas.formSchema.find(item => item.field == 'status').value = '0' + item.tableFormRules.uncompleted = [{ required: false, message: '该项为必填项', trigger: ['blur', 'change'] }] + item.tableFormRules.completionTime = [{ required: true, message: '该项为必填项' , trigger: ['blur','change']}] } else { if (row.status == '1') { DeviceInspectionDetail.allSchemas.formSchema.find(item => item.field == 'uncompleted').componentProps.disabled = false DeviceInspectionDetail.allSchemas.formSchema.find(item => item.field == 'completionTime').componentProps.disabled = true - - DeviceInspectionDetailRules.uncompleted = [{ required: true,message: '该项为必填项' }] - DeviceInspectionDetailRules.completionTime = [{ required: false }] + item.tableFormRules.uncompleted = [{ required: true, message: '该项为必填项', trigger: ['blur', 'change'] }] + item.tableFormRules.completionTime = [{ required: false, message: '该项为必填项' , trigger: ['blur','change']}] } else { DeviceInspectionDetail.allSchemas.formSchema.find(item => item.field == 'uncompleted').componentProps.disabled = true DeviceInspectionDetail.allSchemas.formSchema.find(item => item.field == 'completionTime').componentProps.disabled = false - DeviceInspectionDetailRules.uncompleted = [{ required: false }] - DeviceInspectionDetailRules.completionTime = [{ required: true ,message: '该项为必填项'}] + item.tableFormRules.uncompleted = [{ required: false, message: '该项为必填项', trigger: ['blur', 'change'] }] + item.tableFormRules.completionTime = [{ required: true, message: '该项为必填项' , trigger: ['blur','change']}] } }