diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue index e51eeca17..266b38258 100644 --- a/src/components/BasicForm/src/BasicForm.vue +++ b/src/components/BasicForm/src/BasicForm.vue @@ -446,21 +446,15 @@ const formHeight = ref({}) if (!wsCache.get('ShowPackingNumber')) { if (formSchema.value) { formSchema.value = formSchema.value.filter(item => item.field != 'packingNumber') + } + if (rules.value && rules.value.packingNumber) { delete rules.value.packingNumber } - - // delete rules.value.packUnit - // delete rules.value.packQty - // delete rules.value.outPackUnit - // delete rules.value.inPackUnit if (props.tableAllSchemas) { tableAllSchemas.value.tableFormColumns = props.tableAllSchemas.tableFormColumns.filter(item => item.field != 'packingNumber') - delete tableFormRules.value.packingNumber - // delete tableFormRules.value.packUnit - // delete tableFormRules.value.packQty - // delete tableFormRules.value.outPackUnit - // delete tableFormRules.value.inPackUnit - // delete tableFormRules.value.countQty + if (tableFormRules.value && tableFormRules.value.packingNumber) { + delete tableFormRules.value.packingNumber + } } } diff --git a/src/components/Detail/src/Detail.vue b/src/components/Detail/src/Detail.vue index ee8391f3f..0fbac974f 100644 --- a/src/components/Detail/src/Detail.vue +++ b/src/components/Detail/src/Detail.vue @@ -462,7 +462,11 @@ const detailAllSchemasRules = ref(props.detailAllSchemasRules) if (!wsCache.get('ShowPackingNumber')) { if (allSchemas.value) { allSchemas.value.detailSchema = props.allSchemas.detailSchema.filter(item => item.field != 'packingNumber') + } + if (detailAllSchemasRef.value) { detailAllSchemasRef.value.tableColumns = props.detailAllSchemas.tableColumns.filter(item => item.field != 'packingNumber') + } + if (detailAllSchemasRules.value&&detailAllSchemasRules.value.packingNumber) { delete detailAllSchemasRules.value.packingNumber } }