From fcc3501afc9ffe5ea5ebc86e3ca26d29faa8afea Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Fri, 18 Oct 2024 10:43:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8E=BB=E6=8E=89=E5=8C=85?=
 =?UTF-8?q?=E8=A3=85bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/BasicForm/src/BasicForm.vue | 16 +++++-----------
 src/components/Detail/src/Detail.vue       |  4 ++++
 2 files changed, 9 insertions(+), 11 deletions(-)

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
   }
 }