Merge branch 'pre-production'

src/api/warehouse/warehouseWaybill.js

@@ -12,6 +12,22 @@ export const getList = (current, size, params) => {
   })
 }
 
+/**
+ * 导出
+ * @param row
+ * @returns {AxiosPromise}
+ */
+export const getWarehouseWaybillExport = row => {
+  return request({
+    url: '/logpm-warehouse/warehouseWaybill/export-exportWarehouseWaybill',
+    method: 'get',
+    params: {
+      ...row
+    },
+    responseType: 'blob',
+  })
+};
+
 export const getDetail = (id) => {
   return request({
     url: '/logpm-warehouse/warehouseWaybill/detail',

src/router/views/index.js

@@ -1047,18 +1047,18 @@ export default [
   //     },
   //   ],
   // },
-  {
+  // {
-    path: '/distribution/signfor/devtmp',
+  //   path: '/distribution/signfor/devtmp',
-    component: Layout,
+  //   component: Layout,
-    redirect: '/distribution/signfor/devtmp',
+  //   redirect: '/distribution/signfor/devtmp',
-    children: [
+  //   children: [
-      {
+  //     {
-        path: '/distribution/signfor/devtmp',
+  //       path: '/distribution/signfor/devtmp',
-        name: '签收明细重构',
+  //       name: '签收明细重构',
-        component: () => import('@/views/distribution/signfor/devtmp.vue'),
+  //       component: () => import('@/views/distribution/signfor/devtmp.vue'),
-      },
+  //     },
-    ],
+  //   ],
-  },
+  // },
   // {
   //   path: 'basicdata/goodsShelf/basicdataGoodsShelfView',
   //   component: Layout,

src/views/distribution/signfor/distributionSignfor.vue

@@ -644,6 +644,7 @@ export default {
         path: '/distribution/signfor/distributionSignforedt',
         query: {
           id: row.id,
+          reservationId:row.reservationId,
           name: '签收查看',
         },
       });

src/views/warehouse/warehouseWaybill.vue

@@ -26,6 +26,15 @@
             <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>
           </div> -->
+
+          <el-button
+            type="danger"
+            icon="el-icon-download"
+            @click="handleExportInfo"
+            plain
+          >导出
+          </el-button>
+
           <div></div>
           <!-- 头部右侧按钮模块 -->
           <div class="avue-crud__right">
@@ -389,10 +398,11 @@ import {
   add,
   update,
   remove,
-  splitOrder,
+  splitOrder, getWarehouseWaybillExport
 } from '@/api/warehouse/warehouseWaybill';
 import option from '@/option/warehouse/warehouseWaybill';
 import { mapGetters } from 'vuex';
+import { downloadXls } from '@/utils/util';
 
 export default {
   data() {
@@ -895,6 +905,24 @@ export default {
     },
   },
   methods: {
+
+    /**
+     * 导出
+     * */
+    handleExportInfo(){
+      let row = {};
+      if (!!this.ids) {
+        row.ids = this.ids;
+      }
+      // const ids = this.selectionList.join(',');
+      // row.ids = ids;
+      console.log("<><><>>",row.ids);
+      getWarehouseWaybillExport(row).then(res => {
+        // console.log(res.data);
+        downloadXls(res.data, '在库运单数据.xlsx');
+      });
+
+    },
     showdrawer(value) {
       this.drawerShow = value;
     },
@@ -917,6 +945,7 @@ export default {
     },
     selectionsc(value) {
       console.log(value);
+      this.selectionList = value.map(item => item.id);
     },
     delectsolt(scope) {
       const { row } = scope;