diff --git a/src/views/mes/deviceledger/DeviceLedgerForm.vue b/src/views/mes/deviceledger/DeviceLedgerForm.vue index 69c77769..dc58b8ab 100644 --- a/src/views/mes/deviceledger/DeviceLedgerForm.vue +++ b/src/views/mes/deviceledger/DeviceLedgerForm.vue @@ -63,18 +63,7 @@ class="!w-full" :placeholder="t('EquipmentManagement.EquipmentLedger.placeholderRatedCapacity')" /> - - - - - - - - - - + @@ -510,9 +499,7 @@ const initFormData = () => ({ fileUrl: undefined, qrcodeUrl: undefined, sort: undefined, - dvId: undefined, - dailyAverageValue: undefined, - dataCollectionCapacity: undefined + dvId: undefined }) const formData = ref({ @@ -547,8 +534,6 @@ const formRules = reactive({ deviceName: [{ required: true, message: t('EquipmentManagement.EquipmentLedger.placeholderDeviceName'), trigger: 'blur' }], deviceType: [{ required: true, message: t('EquipmentManagement.EquipmentLedger.placeholderDeviceType'), trigger: 'change' }], ratedCapacity: [{ validator: validateScheduledRequired('额定产能'), trigger: ['blur', 'change'] }], - dailyAverageValue: [{ validator: validateScheduledRequired('每日报工平均值'), trigger: ['blur', 'change'] }], - dataCollectionCapacity: [{ validator: validateScheduledRequired('数据采集产能'), trigger: ['blur', 'change'] }], productionDate: [{ required: true, message: t('EquipmentManagement.EquipmentLedger.placeholderProductionDate'), trigger: 'change' }], factoryEntryDate: [{ required: true, message: t('EquipmentManagement.EquipmentLedger.placeholderFactoryEntryDate'), trigger: 'change' }] }) @@ -557,7 +542,7 @@ const formRef = ref() // 表单 Ref watch( () => formData.value.isScheduled, () => { - formRef.value?.clearValidate?.(['ratedCapacity', 'dailyAverageValue', 'dataCollectionCapacity']) + formRef.value?.clearValidate?.(['ratedCapacity']) } ) @@ -705,8 +690,6 @@ const open = async (type: string, id?: number, defaultDeviceTypeId?: number) => componentIds: parseIdsValue((detail as any)?.componentId), beijianIds: parseIdsValue((detail as any)?.beijianId), qrcodeUrl: (detail as any)?.qrcodeUrl, - dailyAverageValue: normalizeNumberish((detail as any)?.dailyAverageValue), - dataCollectionCapacity: normalizeNumberish((detail as any)?.dataCollectionCapacity), } } finally { formLoading.value = false @@ -934,9 +917,7 @@ const submitForm = async () => { deviceManager: formData.value.deviceManagerIds?.length ? formData.value.deviceManagerIds.join(',') : undefined, componentId: formData.value.componentIds?.length ? formData.value.componentIds.join(',') : undefined, beijianId: formData.value.beijianIds?.length ? formData.value.beijianIds.join(',') : undefined, - fileUrl: normalizeFileUrlAsJsonArrayString((formData.value as any).fileUrl), - dailyAverageValue: normalizeNumberish((formData.value as any).dailyAverageValue), - dataCollectionCapacity: normalizeNumberish((formData.value as any).dataCollectionCapacity) + fileUrl: normalizeFileUrlAsJsonArrayString((formData.value as any).fileUrl) } as unknown as DeviceLedgerVO delete (data as any).deviceManagerIds delete (data as any).componentIds