From a2714d3c712a220cf5015f7b8bc0716413644a7d Mon Sep 17 00:00:00 2001
From: woody <woody@gmail.com>
Date: Tue, 13 May 2025 10:13:03 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat(yihandeled):=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E4=BB=93=E5=82=A8=E5=AF=BC=E5=87=BA=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Delivery/yihandeled.vue | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/src/components/Delivery/yihandeled.vue b/src/components/Delivery/yihandeled.vue
index a5c8f24..c9a4e7c 100644
--- a/src/components/Delivery/yihandeled.vue
+++ b/src/components/Delivery/yihandeled.vue
@@ -37,6 +37,16 @@
             class="thebtn1"
             @click="handleExport"
           >{{ '导出' }}</el-button>
+          <<<<<<< Updated upstream
+          =======
+          <el-button
+            v-hasButtons="['DeliveryHandledExport']"
+            size="small"
+            class="thebtn1"
+            @click="handleWaresExport"
+          >仓储导出</el-button>
+
+          >>>>>>> Stashed changes
         </div>
       </div>
       <el-table
@@ -1286,6 +1296,20 @@ export default {
           `${'已合单'}${new Date().getTime()}.xlsx`
         )
       })
+    },
+    handleWaresExport() {
+      this.params.pkDeliverList = this.idList
+      this.$confirm('是否确认导出所有数据项?', '警告', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then((_) => {
+        this.download(
+          '/sale/manage/deliver-handled/wms-export',
+          { ...this.params },
+          `${'已合单-仓储导出'}${new Date().getTime()}.xlsx`
+        )
+      })
     }
   }
 }

From 0caeb218f78e09af0ab9c213406940a87c5311e6 Mon Sep 17 00:00:00 2001
From: woody <woody@gmail.com>
Date: Tue, 13 May 2025 10:17:09 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat(yihandeled):=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E4=BB=93=E5=82=A8=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Delivery/yihandeled.vue | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/components/Delivery/yihandeled.vue b/src/components/Delivery/yihandeled.vue
index c9a4e7c..f655bdb 100644
--- a/src/components/Delivery/yihandeled.vue
+++ b/src/components/Delivery/yihandeled.vue
@@ -37,16 +37,12 @@
             class="thebtn1"
             @click="handleExport"
           >{{ '导出' }}</el-button>
-          <<<<<<< Updated upstream
-          =======
           <el-button
             v-hasButtons="['DeliveryHandledExport']"
             size="small"
             class="thebtn1"
             @click="handleWaresExport"
           >仓储导出</el-button>
-
-          >>>>>>> Stashed changes
         </div>
       </div>
       <el-table