From 0dc1988198e508ed5eeb7b573c72bb69b65cb2eb Mon Sep 17 00:00:00 2001
From: zhaoyiran <zhaoyrd@yonyou.com>
Date: Wed, 22 May 2024 10:59:59 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=8F=91=E8=B4=A7=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/deliverPlanDetail/index.ts | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/api/wms/deliverPlanDetail/index.ts b/src/api/wms/deliverPlanDetail/index.ts
index 33aeffdb9..ea6887451 100644
--- a/src/api/wms/deliverPlanDetail/index.ts
+++ b/src/api/wms/deliverPlanDetail/index.ts
@@ -24,6 +24,17 @@ export const selectDetailByMasterID = async (id: number) => {
 
 // 查询发货计划子列表
 export const getDeliverPlanDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/deliver-plan-detail/senior', data })
+  } else {
+      return await request.get({ url: `/wms/deliver-plan-detail/page`, params })
+  }
+}
+
+// 查询发货计划子列表
+export const getDeliverPlanDetailPage1 = async (params) => {
   return await request.get({ url: `/wms/deliver-plan-detail/page`, params })
 }
 

From 510b86039cf37f898a46a506fa32b7dd75cff390 Mon Sep 17 00:00:00 2001
From: zhousq <zhoushaoqiang@sina.com>
Date: Wed, 22 May 2024 11:12:28 +0800
Subject: [PATCH 2/2] =?UTF-8?q?2024-05-22=E6=8A=A5=E5=BA=9F=E6=8B=86?=
 =?UTF-8?q?=E8=A7=A3=20=E9=A1=B5=E9=9D=A2=E4=B8=BB=E4=BB=8E=E6=98=8E?=
 =?UTF-8?q?=E7=BB=86=E6=98=BE=E7=A4=BA=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mes/dismantlingMain/dismantlingMain.data.ts | 1 -
 src/views/mes/dismantlingMain/index.vue               | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/views/mes/dismantlingMain/dismantlingMain.data.ts b/src/views/mes/dismantlingMain/dismantlingMain.data.ts
index 7f3bfb25f..9d43d8a76 100644
--- a/src/views/mes/dismantlingMain/dismantlingMain.data.ts
+++ b/src/views/mes/dismantlingMain/dismantlingMain.data.ts
@@ -74,7 +74,6 @@ export const DismantlingMain = useCrudSchemas(reactive<CrudSchema[]>([
         defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
       }
     },
-    isForm: false,
   },
   {
     label: '删除用户名',
diff --git a/src/views/mes/dismantlingMain/index.vue b/src/views/mes/dismantlingMain/index.vue
index c4c87bdf8..5e7a4a94b 100644
--- a/src/views/mes/dismantlingMain/index.vue
+++ b/src/views/mes/dismantlingMain/index.vue
@@ -53,7 +53,7 @@
   <!-- 详情 -->
   <Detail ref="detailRef"
           :isBasic="false"
-          :isBasicMes="true" 
+          :isBasicMes="false" 
           :allSchemas="DismantlingMain.allSchemas"
           :detailAllSchemas="DismantlingDetail.allSchemas"
           :detailAllSchemasRules="DismantlingDetailRules"