From 5439e39fb1cbb0957ea9073a78a5afc8440e4327 Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Tue, 16 Apr 2024 18:25:26 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A6=81=E8=B4=A7=E8=AE=A1=E5=88=92=E4=B8=BB?=
 =?UTF-8?q?=E5=AD=90=E8=A1=A8=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                                          | 8 ++++----
 .../supplierdeliver/purchasePlanMain/index.vue            | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.env.development b/.env.development
index de969391d..957ca7ea4 100644
--- a/.env.development
+++ b/.env.development
@@ -4,10 +4,10 @@ NODE_ENV=development
 VITE_DEV=false
 
 # 请求路径
-VITE_BASE_URL='http://192.168.0.108:12080'
+VITE_BASE_URL='http://192.168.0.113:12080'
 
 # 上传路径
-VITE_UPLOAD_URL='http://192.168.0.108:12080/api/admin-api/infra/file/upload'
+VITE_UPLOAD_URL='http://192.168.0.113:12080/api/admin-api/infra/file/upload'
 
 # 接口前缀
 VITE_API_BASEPATH=/dev-api
@@ -31,7 +31,7 @@ VITE_SOURCEMAP=false
 VITE_OUT_DIR=dist
 
 # 自定义接口路径
-VITE_INTERFACE_URL='http://192.168.0.108:12080/magic/web/index.html'
+VITE_INTERFACE_URL='http://192.168.0.113:12080/magic/web/index.html'
 
 # 积木报表请求路径
-VITE_JMREPORT_BASE_URL='http://192.168.0.108:12080'
\ No newline at end of file
+VITE_JMREPORT_BASE_URL='http://192.168.0.113:12080'
\ No newline at end of file
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
index b34d082ac..16b698b03 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
@@ -1,13 +1,13 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="PurchasePlanMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="[...PurchasePlanMain.allSchemas.searchSchema,...PurchasePlanDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
   <!-- 列表头部 -->
   <TableHead :HeadButttondata="HeadButttondata" @button-base-click="buttonBaseClick" :routeName="routeName"
     @updataTableColumns="updataTableColumns" @searchFormClick="searchFormClick"
-    :allSchemas="PurchasePlanMain.allSchemas" />
+    :allSchemas="PurchasePlanMain.allSchemas" :detailAllSchemas="PurchasePlanDetail.allSchemas"/>
 
   <!-- 列表 -->
   <ContentWrap>
@@ -86,7 +86,7 @@
   const route = useRoute() // 路由信息
   const routeName = ref()
   routeName.value = route.name
-  const tableColumns = ref(PurchasePlanMain.allSchemas.tableColumns)
+  const tableColumns = ref([...PurchasePlanMain.allSchemas.tableColumns,...PurchasePlanDetail.allSchemas.tableMainColumns])
 
   // 字段设置 更新主列表字段
   const updataTableColumns = (val) => {