From a1b10ad97b01bc0b500e18de94a1d47f16c17198 Mon Sep 17 00:00:00 2001
From: songguoqiang <yiran_zhao6@163.com>
Date: Tue, 10 Jun 2025 19:36:10 +0800
Subject: [PATCH] =?UTF-8?q?YT-2717:=E7=BA=B3=E5=85=A5=E5=8F=97=E9=A2=86?=
 =?UTF-8?q?=E4=B9=A6=E5=AF=BC=E5=85=A5=E6=B7=BB=E5=8A=A0loading?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ImportForm/src/ImportFormStep.vue         | 13 +++--
 .../deliverRecordMain.data.ts                 | 52 +++++++++++++------
 2 files changed, 44 insertions(+), 21 deletions(-)

diff --git a/src/components/ImportForm/src/ImportFormStep.vue b/src/components/ImportForm/src/ImportFormStep.vue
index aa795a718..07a7d8ca3 100644
--- a/src/components/ImportForm/src/ImportFormStep.vue
+++ b/src/components/ImportForm/src/ImportFormStep.vue
@@ -56,7 +56,7 @@
         <div class="warning-message" v-if="active == 1 && !error">
           
         </div>
-        <div class="table-container">
+        <div class="table-container" v-loading="isShowLoading">
           <Table v-clientTable
             :columns="Array.isArray(currentColumns) ? currentColumns : []"
             :data="tableObject.tableList"
@@ -88,8 +88,8 @@
             {{ t('ts.下载差异数据') }}
           </el-button>
         </div>
-        <el-button :disabled="formLoading" type="primary" @click="submitForm" v-if="active == 0 || (active == 1 && !error)">{{ t('ts.下一步') }}</el-button>
-        <el-button :disabled="formLoading" type="primary" @click="submitForm" v-if="active == 2 || (active == 1 && error)">{{ t('ts.好的') }}</el-button>
+        <el-button :disabled="formLoading || isShowLoading" type="primary" @click="submitForm" v-if="active == 0 || (active == 1 && !error)">{{ t('ts.下一步') }}</el-button>
+        <el-button :disabled="formLoading || isShowLoading" type="primary" @click="submitForm" v-if="active == 2 || (active == 1 && error)">{{ t('ts.好的') }}</el-button>
         <el-button @click="dialogVisible = false">{{ t('ts.取 消') }}</el-button>
       </div>
     </template>
@@ -298,14 +298,17 @@ const open = () => {
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 
 const formRef = ref()
+const isShowLoading = ref(false)
 
 /** 提交表单 */
 const submitForm = async () => {
   // 如果当前在确认数据步骤，调用确认函数
   if (active.value === 1) {
-    if(error.value){
+    isShowLoading.value = true
+    if(error.value){ 
       dialogVisible.value = false
       error.value = false
+      isShowLoading.value = false
     }else{
       if (props.confirmFormSuccess) {
         await props.confirmFormSuccess(props.tableObject.tableList,
@@ -313,11 +316,13 @@ const submitForm = async () => {
             if(msg){
               message.error(msg)
               error.value = false
+              isShowLoading.value = false
               return
             }else{
               message.success("导入成功！")
               error.value = false
               active.value = 2  // 设置为第三步
+              isShowLoading.value = false
               return
             }
           }
diff --git a/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/deliverRecordMain.data.ts b/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/deliverRecordMain.data.ts
index 608fdca4e..3da24ff4c 100644
--- a/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/deliverRecordMain.data.ts
+++ b/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/deliverRecordMain.data.ts
@@ -43,24 +43,24 @@ export const DeliverRecordMain = useCrudSchemas(
         }
       }
     },
-    {
-      label: '客户订单号',
-      field: 'customerOrderNumber',
-      sort: 'custom',
-      table: {
-        width: 180
-      },
-      isTable: true,
-      isForm: false,
-      isSearch: true,
-      hiddenSearchHigh: true,
-      search: {
-        component: 'Input',
-        componentProps: {
+    // {
+    //   label: '客户订单号',
+    //   field: 'customerOrderNumber',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 180
+    //   },
+    //   isTable: true,
+    //   isForm: false,
+    //   isSearch: true,
+    //   hiddenSearchHigh: true,
+    //   search: {
+    //     component: 'Input',
+    //     componentProps: {
           
-        }
-      },
-    },
+    //     }
+    //   },
+    // },
     {
       label: '客户代码',
       field: 'customerCode',
@@ -579,6 +579,24 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     isTable: false,
     isTableForm: false,
   },
+  {
+      label: '客户订单号',
+      field: 'customerOrderNumber',
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isTable: true,
+      isForm: false,
+      isSearch: true,
+      hiddenSearchHigh: false,
+      search: {
+        component: 'Input',
+        componentProps: {
+          
+        }
+      },
+    },
   {
     label: '品番',
     field: 'itemCode',