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`
+        )
+      })
     }
   }
 }