发货需求模板，导入

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'
           },

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:[],