From 9848b78f7d30a4c5411ef0a04ef121a4fa69d8fb Mon Sep 17 00:00:00 2001 From: zhang_li Date: Thu, 29 May 2025 10:40:47 +0800 Subject: [PATCH] =?UTF-8?q?SBBJ-1138=E8=AE=BE=E5=A4=87=E3=80=81=E6=A8=A1?= =?UTF-8?q?=E5=85=B7=E6=A3=80=E4=BF=AE=E5=B7=A5=E5=8D=95=EF=BC=8C=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E6=98=AF=E5=90=A6=E5=AE=8C=E6=88=90=EF=BC=8C=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E5=AE=8C=E6=88=90=E6=97=B6=EF=BC=8C=E5=BA=94=E5=AE=8C?= =?UTF-8?q?=E6=88=90=E6=97=B6=E9=97=B4=E6=98=AF=E5=BF=85=E5=A1=AB=E9=A1=B9?= =?UTF-8?q?=EF=BC=9B=E9=80=89=E6=8B=A9=E6=98=AF=E4=B8=BA=E5=AE=8C=E6=88=90?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E6=9C=AA=E5=AE=8C=E6=88=90=E5=8E=9F=E5=9B=A0?= =?UTF-8?q?=E6=98=AF=E5=BF=85=E5=A1=AB=E9=A1=B9=EF=BC=8C=E7=8E=B0=E4=B8=8D?= =?UTF-8?q?=E6=AD=A3=E7=A1=AE=20=20=E5=85=88=E9=80=89=E6=8B=A9=E5=AE=8C?= =?UTF-8?q?=E6=88=90=E6=B2=A1=E5=AE=8C=E6=88=90=EF=BC=8C=E5=9C=A8=E5=A1=AB?= =?UTF-8?q?=E5=86=99=E5=85=B6=E4=BB=96=EF=BC=8C=E9=80=89=E6=8B=A9=E6=9C=AA?= =?UTF-8?q?=E5=AE=8C=E6=88=90=EF=BC=8C=E5=AE=8C=E6=88=90=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E5=8F=98=E4=B8=BA=E5=BF=85=E5=A1=AB=E9=A1=B9=20@=E5=BC=A0?= =?UTF-8?q?=E7=AB=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../deviceInspectionMain.data.ts | 4 +-- .../eam/device/deviceinspectionjob/index.vue | 29 ++++++++++--------- 2 files changed, 17 insertions(+), 16 deletions(-) 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']}] } }