diff --git a/src/views/eam/device/deviceinspectionjob/deviceInspectionMain.data.ts b/src/views/eam/device/deviceinspectionjob/deviceInspectionMain.data.ts index 5e87ede..749a1d0 100644 --- a/src/views/eam/device/deviceinspectionjob/deviceInspectionMain.data.ts +++ b/src/views/eam/device/deviceinspectionjob/deviceInspectionMain.data.ts @@ -482,11 +482,11 @@ export const DeviceInspectionDetailRules = reactive({ { validator: validateNum, message: '请输入正整数', trigger: 'blur' } ], number: [required], - status: [required], - actualMinutes: [required, { validator: validateNum, message: '请输入正整数', trigger: 'blur' }], + // status: [required], + // actualMinutes: [required, { validator: validateNum, message: '请输入正整数', trigger: 'blur' }], maintenance: [required], - completionTime: [{ required: false, message: '该项为必填项', trigger: 'blur' }], - uncompleted: [{ required: false, message: '该项为必填项', trigger: 'blur' }] + // completionTime: [{ required: false, message: '该项为必填项', trigger: 'blur' }], + // uncompleted: [{ required: false, message: '该项为必填项', trigger: 'blur' }] }) export const DeviceInspectionDetail = useCrudSchemas( @@ -762,10 +762,10 @@ export const DeviceInspectionAddDetailRules = reactive({ { validator: validateNum, message: '请输入正整数', trigger: 'blur' } ], number: [required], - status: [required], - actualMinutes: [required, { validator: validateNum, message: '请输入正整数', trigger: 'blur' }], + // status: [required], + // actualMinutes: [required, { validator: validateNum, message: '请输入正整数', trigger: 'blur' }], maintenance: [required], - uncompleted: [{ required: true, message: '该项为必填项', trigger: 'blur' }] + // uncompleted: [{ required: true, message: '该项为必填项', trigger: 'blur' }] }) export const DeviceInspectionAddDetail = useCrudSchemas( diff --git a/src/views/eam/device/deviceinspectionjob/index.vue b/src/views/eam/device/deviceinspectionjob/index.vue index c96a1c4..bd10a2b 100644 --- a/src/views/eam/device/deviceinspectionjob/index.vue +++ b/src/views/eam/device/deviceinspectionjob/index.vue @@ -651,45 +651,45 @@ const submitForm = async (formType, data) => { 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:''}) - 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 - formRef.setValues({uncompleted:''}) - item.tableFormRules.uncompleted = [{ required: false, message: '该项为必填项', trigger: ['blur', 'change'] }] - item.tableFormRules.completionTime = [{ required: true, message: '该项为必填项' , trigger: ['blur','change']}] - } - } + // 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:''}) + // 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 + // formRef.setValues({uncompleted:''}) + // item.tableFormRules.uncompleted = [{ required: false, message: '该项为必填项', trigger: ['blur', 'change'] }] + // item.tableFormRules.completionTime = [{ required: true, message: '该项为必填项' , trigger: ['blur','change']}] + // } + // } } 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 - 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 - 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 - item.tableFormRules.uncompleted = [{ required: false, message: '该项为必填项', trigger: ['blur', 'change'] }] - item.tableFormRules.completionTime = [{ required: true, message: '该项为必填项' , trigger: ['blur','change']}] - } - } + // 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 + // 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 + // 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 + // item.tableFormRules.uncompleted = [{ required: false, message: '该项为必填项', trigger: ['blur', 'change'] }] + // item.tableFormRules.completionTime = [{ required: true, message: '该项为必填项' , trigger: ['blur','change']}] + // } + // } - callback() + // callback() } function buttonControllFunction(row, val) { diff --git a/src/views/eam/mold/moldinspectionjob/index.vue b/src/views/eam/mold/moldinspectionjob/index.vue index d84ae66..eb41ac9 100644 --- a/src/views/eam/mold/moldinspectionjob/index.vue +++ b/src/views/eam/mold/moldinspectionjob/index.vue @@ -635,44 +635,44 @@ const submitForm = async (formType, data) => { function detailOnChange(field, cur, item,formRef) { - if (field == 'status') { - if (cur == '1') { - MoldInspectionDetail.allSchemas.formSchema.find(item => item.field == 'uncompleted').componentProps.disabled = false - MoldInspectionDetail.allSchemas.formSchema.find(item => item.field == 'completionTime').componentProps.disabled = true - formRef.setValues({completionTime:''}) - item.tableFormRules.uncompleted = [{ required: true, message: '该项为必填项' , trigger: ['blur','change']}] - item.tableFormRules.completionTime = [{ required: false, message: '该项为必填项' , trigger: ['blur','change']}] - } else { - MoldInspectionDetail.allSchemas.formSchema.find(item => item.field == 'uncompleted').componentProps.disabled = true - MoldInspectionDetail.allSchemas.formSchema.find(item => item.field == 'completionTime').componentProps.disabled = false - formRef.setValues({uncompleted:''}) - item.tableFormRules.uncompleted = [{ required: true, message: '该项为必填项' , trigger: ['blur','change']}] - item.tableFormRules.completionTime = [{ required: true, message: '该项为必填项' , trigger: ['blur','change']}] - } - } + // if (field == 'status') { + // if (cur == '1') { + // MoldInspectionDetail.allSchemas.formSchema.find(item => item.field == 'uncompleted').componentProps.disabled = false + // MoldInspectionDetail.allSchemas.formSchema.find(item => item.field == 'completionTime').componentProps.disabled = true + // formRef.setValues({completionTime:''}) + // item.tableFormRules.uncompleted = [{ required: true, message: '该项为必填项' , trigger: ['blur','change']}] + // item.tableFormRules.completionTime = [{ required: false, message: '该项为必填项' , trigger: ['blur','change']}] + // } else { + // MoldInspectionDetail.allSchemas.formSchema.find(item => item.field == 'uncompleted').componentProps.disabled = true + // MoldInspectionDetail.allSchemas.formSchema.find(item => item.field == 'completionTime').componentProps.disabled = false + // formRef.setValues({uncompleted:''}) + // item.tableFormRules.uncompleted = [{ required: true, message: '该项为必填项' , trigger: ['blur','change']}] + // item.tableFormRules.completionTime = [{ required: true, message: '该项为必填项' , trigger: ['blur','change']}] + // } + // } } const openFormCallBack = (type, row, masterParmas, callback) => { - if (row == undefined || row == null) { - MoldInspectionDetail.allSchemas.formSchema.find(item => item.field == 'uncompleted').componentProps.disabled = true - MoldInspectionDetail.allSchemas.formSchema.find(item => item.field == 'completionTime').componentProps.disabled = false - MoldInspectionDetail.allSchemas.formSchema.find(item => item.field == 'status').value = '0' - item.tableFormRules.uncompleted = [{ required: true, message: '该项为必填项' , trigger: ['blur','change']}] - item.tableFormRules.completionTime = [{ required: false, message: '该项为必填项' , trigger: ['blur','change']}] - } else { - if (row.status == '1') { - MoldInspectionDetail.allSchemas.formSchema.find(item => item.field == 'uncompleted').componentProps.disabled = false - MoldInspectionDetail.allSchemas.formSchema.find(item => item.field == 'completionTime').componentProps.disabled = true - item.tableFormRules.uncompleted = [{ required: true, message: '该项为必填项' , trigger: ['blur','change']}] - item.tableFormRules.completionTime = [{ required: false, message: '该项为必填项' , trigger: ['blur','change']}] - } else { - MoldInspectionDetail.allSchemas.formSchema.find(item => item.field == 'uncompleted').componentProps.disabled = true - MoldInspectionDetail.allSchemas.formSchema.find(item => item.field == 'completionTime').componentProps.disabled = false - item.tableFormRules.uncompleted = [{ required: false, message: '该项为必填项' , trigger: ['blur','change']}] - item.tableFormRules.completionTime = [{ required: true, message: '该项为必填项' , trigger: ['blur','change']}] - } - } - callback() + // if (row == undefined || row == null) { + // MoldInspectionDetail.allSchemas.formSchema.find(item => item.field == 'uncompleted').componentProps.disabled = true + // MoldInspectionDetail.allSchemas.formSchema.find(item => item.field == 'completionTime').componentProps.disabled = false + // MoldInspectionDetail.allSchemas.formSchema.find(item => item.field == 'status').value = '0' + // item.tableFormRules.uncompleted = [{ required: true, message: '该项为必填项' , trigger: ['blur','change']}] + // item.tableFormRules.completionTime = [{ required: false, message: '该项为必填项' , trigger: ['blur','change']}] + // } else { + // if (row.status == '1') { + // MoldInspectionDetail.allSchemas.formSchema.find(item => item.field == 'uncompleted').componentProps.disabled = false + // MoldInspectionDetail.allSchemas.formSchema.find(item => item.field == 'completionTime').componentProps.disabled = true + // item.tableFormRules.uncompleted = [{ required: true, message: '该项为必填项' , trigger: ['blur','change']}] + // item.tableFormRules.completionTime = [{ required: false, message: '该项为必填项' , trigger: ['blur','change']}] + // } else { + // MoldInspectionDetail.allSchemas.formSchema.find(item => item.field == 'uncompleted').componentProps.disabled = true + // MoldInspectionDetail.allSchemas.formSchema.find(item => item.field == 'completionTime').componentProps.disabled = false + // item.tableFormRules.uncompleted = [{ required: false, message: '该项为必填项' , trigger: ['blur','change']}] + // item.tableFormRules.completionTime = [{ required: true, message: '该项为必填项' , trigger: ['blur','change']}] + // } + // } + // callback() } function buttonControllFunction(row, val) { diff --git a/src/views/eam/mold/moldinspectionjob/moldInspectionMain.data.ts b/src/views/eam/mold/moldinspectionjob/moldInspectionMain.data.ts index 3b182af..ad1b229 100644 --- a/src/views/eam/mold/moldinspectionjob/moldInspectionMain.data.ts +++ b/src/views/eam/mold/moldinspectionjob/moldInspectionMain.data.ts @@ -437,10 +437,10 @@ export const MoldInspectionDetailRules = reactive({ { validator:validateNum, message: '请输入正整数', trigger: 'blur'} ], number: [required], - actualMinutes: [ - required, - { validator:validateNum, message: '请输入正整数', trigger: 'blur'} - ], + // actualMinutes: [ + // required, + // { validator:validateNum, message: '请输入正整数', trigger: 'blur'} + // ], maintenance: [required], }) @@ -718,10 +718,10 @@ export const MoldInspectionAddDetailRules = reactive({ { validator:validateNum, message: '请输入正整数', trigger: 'blur'} ], number: [required], - actualMinutes: [ - required, - { validator:validateNum, message: '请输入正整数', trigger: 'blur'} - ], + // actualMinutes: [ + // required, + // { validator:validateNum, message: '请输入正整数', trigger: 'blur'} + // ], maintenance: [required], })