From 1e50facb613591cd54155ad00e418315bf68909f Mon Sep 17 00:00:00 2001
From: caoyizhong <1270296080@qq.com>
Date: Tue, 17 Oct 2023 15:19:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=BA=93=E5=AD=98=E5=93=81?=
 =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=98=8E=E7=BB=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/distribution/distributionStockList.js |  2 +-
 .../inventory/distributionStockList.vue       |  2 +-
 .../distributionStockListDetails.vue          | 21 ++++++++++++-------
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/api/distribution/distributionStockList.js b/src/api/distribution/distributionStockList.js
index aa77f2f5..d9621e5b 100644
--- a/src/api/distribution/distributionStockList.js
+++ b/src/api/distribution/distributionStockList.js
@@ -145,7 +145,7 @@ export const stockExport = (row) => {
  */
 export const stockInfoExport = (row) => {
   return request({
-    url: '/api/logpm-distribution//distributionStockListInfo/export-distributionStockListInfo',
+    url: '/api/logpm-distribution/distributionStockListInfo/export-distributionStockListInfo',
     method: 'get',
     params: {
       ...row
diff --git a/src/views/distribution/inventory/distributionStockList.vue b/src/views/distribution/inventory/distributionStockList.vue
index 8ce4484f..06d86b64 100644
--- a/src/views/distribution/inventory/distributionStockList.vue
+++ b/src/views/distribution/inventory/distributionStockList.vue
@@ -935,7 +935,7 @@ export default {
 
       stockExport(row).then( res =>{
         console.log(res.data);
-        downloadXls(res.data, '库存品数据.xlsx');
+        downloadXls(res.data, '全部库存品数据.xlsx');
       });
 
     },
diff --git a/src/views/distribution/inventory/distributionStockListDetails.vue b/src/views/distribution/inventory/distributionStockListDetails.vue
index 66e62e01..dd970a5f 100644
--- a/src/views/distribution/inventory/distributionStockListDetails.vue
+++ b/src/views/distribution/inventory/distributionStockListDetails.vue
@@ -129,7 +129,7 @@
             </div>
           </el-tab-pane>
           <el-tab-pane label="入库明细" name="enter">
-<!--            <el-button type="danger" icon="el-icon-plus" @click="handleExport" plain>导 出</el-button>-->
+            <el-button type="danger" icon="el-icon-plus" @click="handleExport" plain>导 出</el-button>
             <tablecmt
               :columnList="columnListarrs.columnWarehousing"
               :tableData="data2"
@@ -221,7 +221,7 @@ import {
   add,
   update,
   remove,
-  getListAllocation, stockExport
+  getListAllocation, stockExport, stockInfoExport
 } from '@/api/distribution/distributionStockList';
 import option from '@/option/distribution/distributionStockList';
 import { mapGetters } from 'vuex';
@@ -563,9 +563,17 @@ export default {
       if(!!this.ids){
         row.ids = this.ids;
       }
-      stockExport(row).then( res =>{
+      row.marketId = this.queryOwn.marketId;
+      row.serviceType = this.queryOwn.serviceType;
+      row.materialId = this.queryOwn.materialId;
+      row.warehouseId = this.queryOwn.warehouseId;
+      row.storeId = !!this.queryOwn.storeId && this.queryOwn.storeId != '-1' ? this.queryOwn.storeId : null;
+      if (!!this.queryOwn.pid) {
+        row.pid = this.queryOwn.pid;
+      }
+      stockInfoExport(row).then( res =>{
         console.log(res.data);
-        downloadXls(res.data, '库存品数据.xlsx');
+        downloadXls(res.data, `${this.$route.query.name}库存品入库明细数据.xlsx`);
       });
 
     },
@@ -772,9 +780,8 @@ export default {
       this.query.serviceType = this.queryOwn.serviceType;
       this.query.materialId = this.queryOwn.materialId;
       this.query.warehouseId = this.queryOwn.warehouseId;
-      this.query.storeId =
-        !!this.queryOwn.storeId && this.queryOwn.storeId != '-1' ? this.queryOwn.storeId : null;
-      if (this.queryOwn.pid != '-1') {
+      this.query.storeId = !!this.queryOwn.storeId && this.queryOwn.storeId != '-1' ? this.queryOwn.storeId : null;
+      if (!!this.queryOwn.pid) {
         this.query.pid = this.queryOwn.pid;
       }
       let b = await getStockListInfoList(