From cfc85b3ca5977c8552b492e6e1c0d3a22e7e262a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=90=8C=E6=B5=B7?=
 <14166000+zhangtonghai@user.noreply.gitee.com>
Date: Wed, 8 May 2024 18:06:42 +0800
Subject: [PATCH] 05/08

---
 .env.development                                   |  6 +++---
 src/App.vue                                        |  5 ++++-
 src/hooks/web/usePage.ts                           | 10 ++++++++++
 src/layouts/default/tabs/components/TabContent.vue |  2 ++
 src/layouts/default/tabs/index.vue                 |  2 ++
 src/views/operation/seaexport/columns.tsx          |  2 +-
 src/views/operation/seaexport/detail/index.vue     |  3 ++-
 src/views/operation/seaexport/index.vue            |  5 ++---
 vite.config.ts                                     |  2 +-
 9 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/.env.development b/.env.development
index 36bf6ce4..8fa90a6c 100644
--- a/.env.development
+++ b/.env.development
@@ -2,7 +2,7 @@
  # @Author: 张同海 14166000+zhangtonghai@user.noreply.gitee.com
  # @Date: 2024-04-17 10:30:29
  # @LastEditors: 张同海 14166000+zhangtonghai@user.noreply.gitee.com
- # @LastEditTime: 2024-05-06 15:42:39
+ # @LastEditTime: 2024-05-08 17:52:03
  # @FilePath: \ds-wms-client-web\.env.development
  # @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 ### 
@@ -22,8 +22,8 @@ VITE_PROXY=[["/api","http://60.209.125.238:3008"],["/stage-api","https://www.666
 VITE_DROP_CONSOLE = false
 
 # 后台接口父地址(必填)
-# VITE_GLOB_API_URL=http://localhost:3008
-VITE_GLOB_API_URL="/api"   # 开发 测试环境
+VITE_GLOB_API_URL=http://localhost:3008
+# VITE_GLOB_API_URL="/api"   # 开发 测试环境
 
 # File upload address， optional
 #VITE_GLOB_UPLOAD_URL=http://localhost:8091/api/Common/UploadFile
diff --git a/src/App.vue b/src/App.vue
index d86ba4ac..43fbd990 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,9 @@
 <!--
  * @Author: 张同海 14166000+zhangtonghai@user.noreply.gitee.com
- * @Date: 2024-04-17 10:30:29
+ * @Date: 2024-05-06 09:18:47
+ * @LastEditors: 张同海 14166000+zhangtonghai@user.noreply.gitee.com
+ * @LastEditTime: 2024-05-08 15:17:28
+ * @FilePath: \ds-wms-client-web\src\App.vue
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
 <template>
diff --git a/src/hooks/web/usePage.ts b/src/hooks/web/usePage.ts
index 78a405d9..ba809454 100644
--- a/src/hooks/web/usePage.ts
+++ b/src/hooks/web/usePage.ts
@@ -1,3 +1,11 @@
+/*
+ * @Author: 张同海 14166000+zhangtonghai@user.noreply.gitee.com
+ * @Date: 2024-04-17 10:30:30
+ * @LastEditors: 张同海 14166000+zhangtonghai@user.noreply.gitee.com
+ * @LastEditTime: 2024-05-08 17:51:51
+ * @FilePath: \ds-wms-client-web\src\hooks\web\usePage.ts
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ */
 import type { RouteLocationRaw, Router } from 'vue-router'
 
 import { PageEnum } from '/@/enums/pageEnum'
@@ -19,6 +27,8 @@ function handleError(e: Error) {
 export function useGo(_router?: Router) {
   const { push, replace } = _router || useRouter()
   function go(opt: RouteLocationRawEx = PageEnum.BASE_HOME, isReplace = false) {
+    console.log('go' ,opt ,isReplace);
+    
     if (!opt) {
       return
     }
diff --git a/src/layouts/default/tabs/components/TabContent.vue b/src/layouts/default/tabs/components/TabContent.vue
index 136e551f..9d27dbf5 100644
--- a/src/layouts/default/tabs/components/TabContent.vue
+++ b/src/layouts/default/tabs/components/TabContent.vue
@@ -59,6 +59,8 @@
       )
 
       function handleContext(e) {
+        console.log('handleContext')
+
         props.tabItem && handleContextMenu(props.tabItem)(e)
       }
 
diff --git a/src/layouts/default/tabs/index.vue b/src/layouts/default/tabs/index.vue
index bbbbccd1..caf9fc52 100644
--- a/src/layouts/default/tabs/index.vue
+++ b/src/layouts/default/tabs/index.vue
@@ -111,6 +111,8 @@
       })
 
       function handleChange(activeKey: any) {
+        console.log(activeKey)
+
         activeKeyRef.value = activeKey
         go(activeKey, false)
       }
diff --git a/src/views/operation/seaexport/columns.tsx b/src/views/operation/seaexport/columns.tsx
index bedb8a36..4edf54b4 100644
--- a/src/views/operation/seaexport/columns.tsx
+++ b/src/views/operation/seaexport/columns.tsx
@@ -2408,7 +2408,7 @@ export const cargoInfoFormSchema1: FormSchema[] = [
       span: 24,
     },
     componentProps: {
-      rows: 4,
+      rows: 6,
     },
   },
 ]
diff --git a/src/views/operation/seaexport/detail/index.vue b/src/views/operation/seaexport/detail/index.vue
index 4cfa3667..c7dc1494 100644
--- a/src/views/operation/seaexport/detail/index.vue
+++ b/src/views/operation/seaexport/detail/index.vue
@@ -5,9 +5,10 @@
       :class="!Showtabs ? 'Showtabs' : ''"
       :tabBarStyle="tabBarStyle"
       :activeKey="tabActiveKey"
-      :animated="Object.keys($refs).includes('RefsedOrder') ? false : true"
       @change="changeTab"
     >
+      <!-- 暂时隐藏  ZTH -->
+      <!-- :animated="Object.keys($refs).includes('RefsedOrder') ? false : true" -->
       <a-tab-pane key="1" tab="主单信息" :forceRender="true">
         <a-row :gutter="24">
           <a-col :span="18" class="left-box" style="padding-right: 0">
diff --git a/src/views/operation/seaexport/index.vue b/src/views/operation/seaexport/index.vue
index beffc556..da4dc4b2 100644
--- a/src/views/operation/seaexport/index.vue
+++ b/src/views/operation/seaexport/index.vue
@@ -1537,7 +1537,6 @@
     BookingOrderBachUpdate,
     GetCarrierlist,
     DjyCustomerSuggest,
-    GetYardlist,
     GetSysUserPage,
     DjyCustomerpage,
     GetCtn,
@@ -2653,8 +2652,8 @@
     switch (type) {
       case 'CARRIER':
         return GetCarrierlist
-      case 'YARDID':
-        return GetYardlist
+      // case 'YARDID':
+      //   return GetYardlist
       case 'CNTRTOTAL':
         return GetCtn
       case 'KINDPKGS':
diff --git a/vite.config.ts b/vite.config.ts
index 6bb1e048..17fa3fb1 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -60,7 +60,7 @@ export default ({ command, mode }: ConfigEnv): UserConfig => {
       proxy: createProxy(VITE_PROXY),
     },
     esbuild: {
-      pure: VITE_DROP_CONSOLE ? ['console.log', 'debugger'] : [],
+      // pure: VITE_DROP_CONSOLE ? ['console.log', 'debugger'] : [],  //暂时 关闭  ZTH
     },
     build: {
       target: 'es2015',