From b841f494ee6dc5fba240c4cd2c46cceb8fe55d6f Mon Sep 17 00:00:00 2001 From: zhang_li Date: Thu, 29 May 2025 10:50:10 +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?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../eam/mold/moldinspectionjob/index.vue | 29 ++++++++++--------- .../moldInspectionMain.data.ts | 6 ++-- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/src/views/eam/mold/moldinspectionjob/index.vue b/src/views/eam/mold/moldinspectionjob/index.vue index 6078d2d..d84ae66 100644 --- a/src/views/eam/mold/moldinspectionjob/index.vue +++ b/src/views/eam/mold/moldinspectionjob/index.vue @@ -640,14 +640,14 @@ function detailOnChange(field, cur, item,formRef) { 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:''}) - MoldInspectionDetailRules.uncompleted = [{ required: true, message: '该项为必填项' }] - MoldInspectionDetailRules.completionTime = [{ required: false }] + 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 - MoldInspectionDetailRules.uncompleted = [{ required: false }] formRef.setValues({uncompleted:''}) - MoldInspectionDetailRules.completionTime = [{ required: true , message: '该项为必填项'}] + item.tableFormRules.uncompleted = [{ required: true, message: '该项为必填项' , trigger: ['blur','change']}] + item.tableFormRules.completionTime = [{ required: true, message: '该项为必填项' , trigger: ['blur','change']}] } } } @@ -656,20 +656,20 @@ 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 - MoldInspectionDetailRules.uncompleted = [{ required: false }] - MoldInspectionDetailRules.completionTime = [{ required: true ,message: '该项为必填项'}] 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 - MoldInspectionDetailRules.uncompleted = [{ required: true,message: '该项为必填项' }] - MoldInspectionDetailRules.completionTime = [{ required: false }] + 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 - MoldInspectionDetailRules.uncompleted = [{ required: false }] - MoldInspectionDetailRules.completionTime = [{ required: true ,message: '该项为必填项'}] + item.tableFormRules.uncompleted = [{ required: false, message: '该项为必填项' , trigger: ['blur','change']}] + item.tableFormRules.completionTime = [{ required: true, message: '该项为必填项' , trigger: ['blur','change']}] } } callback() @@ -736,18 +736,19 @@ const orderPrint = (row) => { const formSelectChange = (field, cur, item) =>{ if (field == 'status') { + item.tableFormRules = cloneDeep(MoldInspectionMainRules) if (cur == '1') { item['disabled_' + 'uncompleted'] = false item['disabled_' + 'completionTime'] = true item['completionTime']='' - MoldInspectionDetailRules.uncompleted = [{ required: true, message: '该项为必填项' }] - MoldInspectionDetailRules.completionTime = [{ required: false }] + item.tableFormRules.uncompleted = [{ required: true, message: '该项为必填项' , trigger: ['blur','change']}] + item.tableFormRules.completionTime = [{ required: false, message: '该项为必填项' , trigger: ['blur','change']}] } else { item['disabled_' + 'uncompleted'] = true item['disabled_' + 'completionTime'] = false item['uncompleted']='' - MoldInspectionDetailRules.uncompleted = [{ required: false }] - MoldInspectionDetailRules.completionTime = [{ required: true , message: '该项为必填项'}] + item.tableFormRules.uncompleted = [{ required: false, message: '该项为必填项' , trigger: ['blur','change']}] + item.tableFormRules.completionTime = [{ required: true, message: '该项为必填项' , trigger: ['blur','change']}] } } } diff --git a/src/views/eam/mold/moldinspectionjob/moldInspectionMain.data.ts b/src/views/eam/mold/moldinspectionjob/moldInspectionMain.data.ts index 047bdca..cac514e 100644 --- a/src/views/eam/mold/moldinspectionjob/moldInspectionMain.data.ts +++ b/src/views/eam/mold/moldinspectionjob/moldInspectionMain.data.ts @@ -42,9 +42,9 @@ export const MoldInspectionMainRules = reactive({ status: [required], type: [required], faultType: [required], - uncompleted: [ - { required: true, message: '该项为必填项', trigger: 'blur' } - ], + + completionTime: [{ required: false, message: '该项为必填项', trigger: 'blur' }], + uncompleted: [{ required: false, message: '该项为必填项', trigger: 'blur' }] }) export const MoldInspectionMain = useCrudSchemas(reactive([