From 2369e02e058ed67565f54fe9ac9a4c0352f28602 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=B8=85?= <3115919733@qq.com>
Date: Wed, 11 Jun 2025 10:57:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E8=B4=A7=E9=9C=80=E6=B1=82=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF=EF=BC=8C=E5=AF=BC=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../deliverydemand/DeliveryDemandDetailList.vue  |  4 ++--
 .../deliverydemand/DeliveryDemandList.vue        | 16 +++++++++-------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/ant-design-vue-jeecg/src/views/tms/outbound/deliverydemand/DeliveryDemandDetailList.vue b/ant-design-vue-jeecg/src/views/tms/outbound/deliverydemand/DeliveryDemandDetailList.vue
index 4ce57e7..6252fa5 100644
--- a/ant-design-vue-jeecg/src/views/tms/outbound/deliverydemand/DeliveryDemandDetailList.vue
+++ b/ant-design-vue-jeecg/src/views/tms/outbound/deliverydemand/DeliveryDemandDetailList.vue
@@ -81,12 +81,12 @@
             dataIndex: 'invoice'
           },
           {
-            title:'取货仓库',
+            title:'发货仓库',
             align:"center",
             dataIndex: 'pickUpHub'
           },
           {
-            title:'取货仓库编码',
+            title:'发货仓库编码',
             align:"center",
             dataIndex: 'pickUpHubCode'
           },
diff --git a/ant-design-vue-jeecg/src/views/tms/outbound/deliverydemand/DeliveryDemandList.vue b/ant-design-vue-jeecg/src/views/tms/outbound/deliverydemand/DeliveryDemandList.vue
index c80913b..34597d0 100644
--- a/ant-design-vue-jeecg/src/views/tms/outbound/deliverydemand/DeliveryDemandList.vue
+++ b/ant-design-vue-jeecg/src/views/tms/outbound/deliverydemand/DeliveryDemandList.vue
@@ -52,10 +52,11 @@
     <div class="table-operator">
       <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
       <a-button type="primary" icon="download" @click="handleExportXls('发货需求')">导出</a-button>
+      <a-button type="primary" icon="download" @click="handleExportTemplate('发货需求模板')">下载模板</a-button>
       <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
         <a-button type="primary" icon="import">导入</a-button>
       </a-upload>
-      <a-button @click="handleMerge" type="primary">合并</a-button>
+      <!-- <a-button @click="handleMerge" type="primary">合并</a-button> -->
       <!-- 高级查询区域 -->
       <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
       <a-dropdown v-if="selectedRowKeys.length > 0">
@@ -205,16 +206,16 @@
             align:"center",
             dataIndex: 'deliveryDate'
           },
+          {
+            title:'取货地点',
+            align:"center",
+            dataIndex: 'pickUpHub'
+          },
           {
             title:'送货地点',
             align:"center",
             dataIndex: 'deliveryAddress'
           },
-          {
-            title:'取货仓库',
-            align:"center",
-            dataIndex: 'pickUpHub'
-          },
           // {
           //   title:'发货单',
           //   align:"center",
@@ -255,7 +256,8 @@
           deleteBatch: "/deliverydemand/deliveryDemand/deleteBatch",
           exportXlsUrl: "/deliverydemand/deliveryDemand/exportXls",
           importExcelUrl: "deliverydemand/deliveryDemand/importExcel",
-          handleMerge: '/deliverydemand/deliveryDemand/handleMerge'
+          handleMerge: '/deliverydemand/deliveryDemand/handleMerge',
+          exportTemplate: '/deliverydemand/deliveryDemand/exportTemplate',
         },
         dictOptions:{},
         superFieldList:[],