Merge branch 'pre-production'

src/api/distribution/distributionStockList.js

@@ -122,6 +122,38 @@ export const update = (row) => {
   })
 }
 
+/**
+ *
+ * @param row
+ * @returns {AxiosPromise}
+ */
+export const stockExport = (row) => {
+  return request({
+    url: '/api/logpm-distribution/distributionStockList/export-distributionStockList',
+    method: 'get',
+    params: {
+      ...row
+    },
+    responseType: 'blob',
+  })
+}
+
+/**
+ * 查询库存品入库明细
+ * @param row
+ * @returns {AxiosPromise}
+ */
+export const stockInfoExport = (row) => {
+  return request({
+    url: '/api/logpm-distribution//distributionStockListInfo/export-distributionStockListInfo',
+    method: 'get',
+    params: {
+      ...row
+    },
+    responseType: 'blob',
+  })
+}
+
 /**
  * 库存品列表
  * @param current

src/views/distribution/inventory/delivery/distributionStockArticle.vue

@@ -1181,6 +1181,7 @@ export default {
             // console.log("cxcxcxc",i);
             let aa = await getListOwn(this.page.currentPage, this.page.pageSize, {
               stockArticleId: i.id,
+              parcelType: "2"
             }).then();
             // console.log("包件物料不存在！！",aa.data.data.records);
             aa.data.data.records.forEach(l => {

src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue

@@ -1131,6 +1131,7 @@ export default {
             // console.log("cxcxcxc",i);
             let aa = await getListOwn(this.page.currentPage, this.page.pageSize, {
               stockArticleIds: i.id,
+              parcelType: "2"
             }).then();
             // console.log("包件物料不存在！！",aa.data.data.records);
             aa.data.data.records.forEach(l => {

src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue

@@ -1350,6 +1350,7 @@ export default {
             // console.log("cxcxcxc",i);
             let aa = await getListOwn(this.page.currentPage, this.page.pageSize, {
               stockArticleIds: i.id,
+              parcelType: "2"
             }).then();
             // console.log("包件物料不存在！！",aa.data.data.records);
             aa.data.data.records.forEach(l => {

src/views/distribution/inventory/distributionStockList.vue

@@ -29,7 +29,8 @@
             <!-- <el-button type="primary" icon="el-icon-plus" @click="handleAdd">新 增</el-button>
             <el-button type="danger" icon="el-icon-delete" @click="handleDelete" plain>删 除</el-button>-->
             <!--            <el-button type="danger" icon="el-icon-delete" @click="handleDelete" plain>全部拆包</el-button>-->
-            <!--            <el-button type="danger" icon="el-icon-plus" @click="handleImport" plain>导 入</el-button>-->
+<!--                        <el-button type="danger" icon="el-icon-plus" @click="handleImport" plain>导 入</el-button>-->
+                        <el-button type="danger" icon="el-icon-plus" @click="handleExport" plain>导 出</el-button>
           </div>
           <!-- 头部右侧按钮模块 -->
           <div class="avue-crud__right">
@@ -309,6 +310,7 @@ import {
   remove,
   addParcels,
   getStockListOwn,
+  stockExport,
 } from '@/api/distribution/distributionStockList';
 import { getListParcelDetails } from '@/api/distribution/distributionParcelDetails';
 import { getListMaterial } from '@/api/basic/basicMaterial';
@@ -918,10 +920,30 @@ export default {
       this.query[row.prop] = index;
       this.onLoad(this.page);
     },
+    //导出
+    handleExport() {
+      let row = {  };
+      if(!!this.ids){
+        row.ids = this.ids;
+      }
+      // exportBlob(
+      //   `/api/logpm-distribution/distributionStockList/export-distributionStockList?${this.website.tokenHeader}=${getToken()}`,`row = ${row}`
+      // ).then(res => {
+      //   downloadXls(res.data, '库存品数据.xlsx');
+      // });
 
+
+      stockExport(row).then( res =>{
+        console.log(res.data);
+        downloadXls(res.data, '库存品数据.xlsx');
+      });
+
+    },
+    //导入
     handleImport() {
       this.excelBox = true;
     },
+
     refreshChange() {
       this.onLoad(this.page);
     },

src/views/distribution/inventory/distributionStockListDetails.vue

@@ -129,6 +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>-->
             <tablecmt
               :columnList="columnListarrs.columnWarehousing"
               :tableData="data2"
@@ -220,12 +221,13 @@ import {
   add,
   update,
   remove,
-  getListAllocation,
+  getListAllocation, stockExport
 } from '@/api/distribution/distributionStockList';
 import option from '@/option/distribution/distributionStockList';
 import { mapGetters } from 'vuex';
 import { getListStock } from '@/api/distribution/distributionStock';
 import { getStockListInfoList } from '@/api/distribution/distributionStockListInfo';
+import { downloadXls } from '@/utils/util';
 
 export default {
   data() {
@@ -554,6 +556,20 @@ export default {
     },
   },
   methods: {
+
+    //导出
+    handleExport() {
+      let row = {  };
+      if(!!this.ids){
+        row.ids = this.ids;
+      }
+      stockExport(row).then( res =>{
+        console.log(res.data);
+        downloadXls(res.data, '库存品数据.xlsx');
+      });
+
+    },
+
     handleClick(tab, event) {
       console.log(tab, event);
       console.log(tab.props.name);

src/views/distribution/inventory/distributionStockListDiscuss.vue

@@ -29,7 +29,8 @@
             <!-- <el-button type="primary" icon="el-icon-plus" @click="handleAdd">新 增</el-button>
              <el-button type="danger" icon="el-icon-delete" @click="handleDelete" plain>删 除</el-button>-->
             <!--            <el-button type="danger" icon="el-icon-delete" @click="handleDelete" plain>全部拆包</el-button>-->
-            <!--            <el-button type="danger" icon="el-icon-plus" @click="handleImport" plain>导 入</el-button>-->
+<!--                        <el-button type="danger" icon="el-icon-plus" @click="handleImport" plain>导 入</el-button>-->
+            <el-button type="danger" icon="el-icon-plus" @click="handleExport" plain>导 出</el-button>
           </div>
           <!-- 头部右侧按钮模块 -->
           <div class="avue-crud__right">
@@ -349,7 +350,7 @@ import {
   update,
   remove,
   addParcels,
-  getStockListOwn,
+  getStockListOwn, stockExport
 } from '@/api/distribution/distributionStockList';
 import { getListParcelDetails } from '@/api/distribution/distributionParcelDetails';
 import { getListMaterial } from '@/api/basic/basicMaterial';
@@ -927,7 +928,21 @@ export default {
       this.query[row.prop] = index;
       this.onLoad(this.page);
     },
+//导出
+    handleExport() {
+      let row = {
+        serviceType: this.query.serviceType
+      };
+      if(!!this.ids){
+        row.ids = this.ids;
+      }
 
+      stockExport(row).then( res =>{
+        console.log(res.data);
+        downloadXls(res.data, '商配库存品数据.xlsx');
+      });
+
+    },
     handleImport() {
       this.excelBox = true;
     },

src/views/distribution/inventory/distributionStockListMarket.vue

@@ -29,7 +29,8 @@
             <!-- <el-button type="primary" icon="el-icon-plus" @click="handleAdd">新 增</el-button>
              <el-button type="danger" icon="el-icon-delete" @click="handleDelete" plain>删 除</el-button>-->
             <!--            <el-button type="danger" icon="el-icon-delete" @click="handleDelete" plain>全部拆包</el-button>-->
-            <!--            <el-button type="danger" icon="el-icon-plus" @click="handleImport" plain>导 入</el-button>-->
+<!--                        <el-button type="danger" icon="el-icon-plus" @click="handleImport" plain>导 入</el-button>-->
+            <el-button type="danger" icon="el-icon-plus" @click="handleExport" plain>导 出</el-button>
           </div>
           <!-- 头部右侧按钮模块 -->
           <div class="avue-crud__right">
@@ -308,7 +309,7 @@ import {
   update,
   remove,
   addParcels,
-  getStockListOwn,
+  getStockListOwn, stockExport
 } from '@/api/distribution/distributionStockList';
 import { getListParcelDetails } from '@/api/distribution/distributionParcelDetails';
 import { getListMaterial } from '@/api/basic/basicMaterial';
@@ -918,6 +919,21 @@ export default {
       this.query[row.prop] = index;
       this.onLoad(this.page);
     },
+    //导出
+    handleExport() {
+      let row = {
+        serviceType: this.query.serviceType
+      };
+      if(!!this.ids){
+        row.ids = this.ids;
+      }
+
+      stockExport(row).then( res =>{
+        console.log(res.data);
+        downloadXls(res.data, '市配库存品数据.xlsx');
+      });
+
+    },
 
     handleImport() {
       this.excelBox = true;

src/views/distribution/inventory/distributionStockListSelf.vue

@@ -29,7 +29,9 @@
             <!-- <el-button type="primary" icon="el-icon-plus" @click="handleAdd">新 增</el-button>
              <el-button type="danger" icon="el-icon-delete" @click="handleDelete" plain>删 除</el-button>-->
             <!--            <el-button type="danger" icon="el-icon-delete" @click="handleDelete" plain>全部拆包</el-button>-->
-            <!--            <el-button type="danger" icon="el-icon-plus" @click="handleImport" plain>导 入</el-button>-->
+<!--                        <el-button type="danger" icon="el-icon-plus" @click="handleImport" plain>导 入</el-button>-->
+            <el-button type="danger" icon="el-icon-plus" @click="handleExport" plain>导 出</el-button>
+
           </div>
           <!-- 头部右侧按钮模块 -->
           <div class="avue-crud__right">
@@ -308,7 +310,7 @@ import {
   update,
   remove,
   addParcels,
-  getStockListOwn,
+  getStockListOwn, stockExport
 } from '@/api/distribution/distributionStockList';
 import { getListParcelDetails } from '@/api/distribution/distributionParcelDetails';
 import { getListMaterial } from '@/api/basic/basicMaterial';
@@ -918,6 +920,20 @@ export default {
       this.query[row.prop] = index;
       this.onLoad(this.page);
     },
+    //导出
+    handleExport() {
+      let row = {
+        serviceType: this.query.serviceType
+      };
+      if(!!this.ids){
+        row.ids = this.ids;
+      }
+      stockExport(row).then( res =>{
+        console.log(res.data);
+        downloadXls(res.data, '自提库存品数据.xlsx');
+      });
+
+    },
 
     handleImport() {
       this.excelBox = true;