From 0fb6b053cdf43a0a0050c68c81f2ab9aff7ac66b Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Tue, 20 May 2025 07:52:44 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=BA=E9=99=B7:FWHL-45?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                                    |  4 ++--
 .../packageManage/packagetuomergeMain/index.vue     | 13 ++++++++-----
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/.env.development b/.env.development
index 8db04bcf0..15c6c8fd7 100644
--- a/.env.development
+++ b/.env.development
@@ -4,10 +4,10 @@ NODE_ENV=development
 VITE_DEV=false
 
 # 请求路径
-VITE_BASE_URL='http://localhost:12080'
+VITE_BASE_URL='http://192.168.0.52:12080'
 
 # 上传路径
-VITE_UPLOAD_URL='http://localhost:12080/admin-api/infra/file/upload'
+VITE_UPLOAD_URL='http://192.168.0.52:12080/admin-api/infra/file/upload'
 
 # 接口前缀
 VITE_API_BASEPATH=/dev-api
diff --git a/src/views/wms/inventoryjobManage/packageManage/packagetuomergeMain/index.vue b/src/views/wms/inventoryjobManage/packageManage/packagetuomergeMain/index.vue
index 06efdc228..782a9b021 100644
--- a/src/views/wms/inventoryjobManage/packageManage/packagetuomergeMain/index.vue
+++ b/src/views/wms/inventoryjobManage/packageManage/packagetuomergeMain/index.vue
@@ -72,6 +72,7 @@ import TableHead from '@/components/TableHead/src/TableHead.vue'
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
 import Detail from '@/components/Detail/src/Detail.vue'
 import { usePageLoading } from '@/hooks/web/usePageLoading'
+import { formatDate } from '@/utils/formatTime'
 const { loadStart, loadDone } = usePageLoading()
 
 defineOptions({ name: 'PackagetuomergeMain' })
@@ -107,9 +108,9 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultAddBtn({hasPermi:'wms:packagetuomergeMain:create'}), // 新增
-  defaultButtons.defaultImportBtn({hasPermi:'wms:packagetuomergeMain:import'}), // 导入
-  defaultButtons.defaultExportBtn({hasPermi:'wms:packagetuomergeMain:export'}), // 导出
+  // defaultButtons.defaultAddBtn({hasPermi:'wms:packagetuomergeMain:create'}), // 新增
+  // defaultButtons.defaultImportBtn({hasPermi:'wms:packagetuomergeMain:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:package-tuomerge-main:export'}), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
@@ -209,13 +210,15 @@ const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
+     loadStart()
+    const excelTitle = ref(route.meta.title)
     // 发起导出
     exportLoading.value = true
     const data = await PackagetuomergeMainApi.exportPackagetuomergeMain(tableObject.params)
-    download.excel(data, '合托记录主.xlsx')
+    download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }