From 27004baf0f20043c15b721ec5002ee43a58ed448 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Tue, 20 Aug 2024 16:08:25 +0800
Subject: [PATCH] =?UTF-8?q?HL-5504=20SCP=20=E4=BE=9B=E5=BA=94=E5=95=86?=
 =?UTF-8?q?=E5=8F=91=E8=B4=A7=E7=94=B3=E8=AF=B7=E9=80=89=E6=8B=A9=E8=A6=81?=
 =?UTF-8?q?=E8=B4=A7=E8=AE=A1=E5=88=92=E4=B8=AD=E7=9A=84=E9=80=81=E8=BE=BE?=
 =?UTF-8?q?=E6=97=A5=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchasePlanMain/purchasePlanMain.data.ts | 21 +------------------
 .../supplierdeliverRequestMain.data.ts        | 18 +++++++++++++++-
 2 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
index 514d82d2f..2bac465f9 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
@@ -527,26 +527,7 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  {
-    label: '送达日期',
-    field: 'deliveryDate',
-    table: {
-      width: 180
-    },
-    formatter: dateFormatter2,
-    sortTableDefault:2,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'date',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-      }
-    },
-    detail: {
-      dateFormat: 'YYYY-MM-DD'
-    },
-  },
+  
   {
     label: '采购订单号',
     field: 'poNumber',
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
index 72f0afaa1..f1133dc72 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
@@ -12,6 +12,22 @@ import * as ItemPackageApi from '@/api/wms/itempackage/index'
 import {validateInteger} from '@/utils/validator'
 const { t } = useI18n() // 国际化
 
+
+const PurchasePlanDetailSchemas = {...PurchasePlanDetail.allSchemas}
+if(PurchasePlanDetailSchemas?.tableColumns){
+  PurchasePlanDetailSchemas.tableColumns.splice(2, 0, {
+    label: '送达日期',
+    field: 'deliveryDate',
+    table: {
+      width: 180
+    },
+    width: 180,
+    formatter: dateFormatter2,
+    sortTableDefault:2
+  });
+}
+
+
 // 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
 const queryParams = {
   pageSize: 10,
@@ -107,7 +123,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
         searchListPlaceholder: '请选择要货计划单号', // 输入框占位文本
         searchField: 'number', // 查询弹窗赋值字段
         searchTitle: '要货计划信息', // 查询弹窗标题
-        searchAllSchemas: PurchasePlanDetail.allSchemas, // 查询弹窗所需类
+        searchAllSchemas: PurchasePlanDetailSchemas, // 查询弹窗所需类
         searchPage: PurchasePlanDetailApi.getPurchasePlanDetailPage, // 查询弹窗所需分页方法
         searchCondition: [
           {