From ea86cd343dc60cd653b1c57c6c5f70fa219800a4 Mon Sep 17 00:00:00 2001
From: ljlong_2630 <ljlong_2630@yeah.net>
Date: Fri, 22 Nov 2024 22:10:59 +0800
Subject: [PATCH] =?UTF-8?q?YT-1062=EF=BC=9Abug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ImportForm/src/ImportFormStep.vue     | 12 ++++++++++++
 .../deliverRecordMain/deliverRecordMain.data.ts      |  2 ++
 .../deliverRecordMain/index.vue                      |  1 -
 .../deliverRecordMain/deliverRecordMain.data.ts      |  1 +
 .../inducedProduct/deliverRecordMain/index.vue       |  1 +
 5 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/components/ImportForm/src/ImportFormStep.vue b/src/components/ImportForm/src/ImportFormStep.vue
index 34170ac47..0228aed64 100644
--- a/src/components/ImportForm/src/ImportFormStep.vue
+++ b/src/components/ImportForm/src/ImportFormStep.vue
@@ -228,6 +228,11 @@ const props = defineProps({
     type:Boolean,
     default:false
   },
+  sourcePage:{
+    type:String,
+    required: false,
+    default:''
+  },
 })
 
 // 确保 tableObject 是响应式的
@@ -326,6 +331,13 @@ const submitForm = async () => {
     return;
   }
   
+  if(props.sourcePage == 'inducedProduct'){
+    if(!formRef.value.formModel?.customerCode){
+      message.error('请输入客户代码')
+      return
+    }
+  }
+
   const elForm = unref(formRef)?.getElFormRef()
   // 校验表单
   if (!elForm) return
diff --git a/src/views/wms/deliversettlementManage/directSupplyPinRecordMain/deliverRecordMain/deliverRecordMain.data.ts b/src/views/wms/deliversettlementManage/directSupplyPinRecordMain/deliverRecordMain/deliverRecordMain.data.ts
index 6d2b63475..c0afdfae0 100644
--- a/src/views/wms/deliversettlementManage/directSupplyPinRecordMain/deliverRecordMain/deliverRecordMain.data.ts
+++ b/src/views/wms/deliversettlementManage/directSupplyPinRecordMain/deliverRecordMain/deliverRecordMain.data.ts
@@ -330,6 +330,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain: true,
   },
   {
     label: '包装规格',
@@ -396,6 +397,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain: true,
   },
   {
     label: '从库位',
diff --git a/src/views/wms/deliversettlementManage/directSupplyPinRecordMain/deliverRecordMain/index.vue b/src/views/wms/deliversettlementManage/directSupplyPinRecordMain/deliverRecordMain/index.vue
index 8e93dd99b..22f2846e5 100644
--- a/src/views/wms/deliversettlementManage/directSupplyPinRecordMain/deliverRecordMain/index.vue
+++ b/src/views/wms/deliversettlementManage/directSupplyPinRecordMain/deliverRecordMain/index.vue
@@ -69,7 +69,6 @@
                      @success="importSuccess" 
                      :isShowDownloadBtn="true" 
                      :extend="importExtend"
-                     :formSchema="ExtendColumn.allSchemas.formSchema" 
                      :rules="ExtendColumnRules"
                      accept=".xlsx,.xls"
                      :importTemplateData="importTemplateData"
diff --git a/src/views/wms/deliversettlementManage/ftSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts b/src/views/wms/deliversettlementManage/ftSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts
index a99a9e113..7881765dd 100644
--- a/src/views/wms/deliversettlementManage/ftSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts
+++ b/src/views/wms/deliversettlementManage/ftSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts
@@ -307,6 +307,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain: true,
     isTable: false,
   },
   {
diff --git a/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/index.vue b/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/index.vue
index 082daee5f..e2e47a829 100644
--- a/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/index.vue
+++ b/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/index.vue
@@ -73,6 +73,7 @@
       :isShowDownloadBtn="false" 
       :confirmFormSuccess="confirmFormSuccess"
       @searchTableSuccess="searchTableSuccess"
+      sourcePage="inducedProduct"
   />
 </template>
 <script setup lang="ts">