新增运营模块导出

src/views/basic/coderule/basicTenantCode.vue

@@ -117,7 +117,7 @@
           <el-pagination
             align="right"
             background
-            @size-change="sizeChange"
+            @size-change="sititlezeChange"
             @current-change="currentChange"
             :current-page="page.currentPage"
             :page-sizes="[30, 50, 80, 120]"
@@ -182,7 +182,11 @@
         <!-- 表单按钮 -->
         <template #footer>
           <span v-if="!view" class="dialog-footer">
-            <el-button type="primary" icon="el-icon-circle-check" @click="handleSubmit"
+            <el-button
+              type="primary"
+              icon="el-icon-circle-check"
+              :loading="buttonLoadingList.handleSubmitBtn"
+              @click="handleSubmit"
               >提 交</el-button
             >
             <el-button icon="el-icon-circle-close" @click="box = false">取 消</el-button>
@@ -303,6 +307,9 @@ export default {
           },
         ],
       },
+      buttonLoadingList: {
+        handleSubmitBtn: false,
+      },
     };
   },
   created() {
@@ -370,6 +377,7 @@ export default {
     handleSubmit() {
       //表单校验添加租户编码
       this.$refs.form.validate(valid => {
+        this.buttonLoadingList.handleSubmitBtn = true;
         if (valid) {
           if (!this.form.id) {
             add(this.form).then(() => {
@@ -390,6 +398,7 @@ export default {
               });
             });
           }
+          this.buttonLoadingList.handleSubmitBtn = false;
         } else {
           console.log('error submit!!');
           return false;
@@ -527,7 +536,7 @@ export default {
     margin-right: 0;
   }
 }
-:deep(.el-form-item__label){
-  padding-right:8px;
+:deep(.el-form-item__label) {
+  padding-right: 8px;
 }
 </style>

src/views/basic/forklift/basicForklift.vue

@@ -502,7 +502,11 @@
         <!-- 表单按钮 -->
         <template #footer>
           <span v-if="!view" class="dialog-footer">
-            <el-button type="primary" icon="el-icon-circle-check" @click="handleSubmit"
+            <el-button
+              type="primary"
+              icon="el-icon-circle-check"
+              :loading="buttonLoadingList.handleSubmitBtn"
+              @click="handleSubmit"
               >提 交</el-button
             >
             <el-button icon="el-icon-circle-close" @click="box = false">取 消</el-button>
@@ -859,6 +863,9 @@ export default {
         //   {pattern: /(^[1-9]\d{0,9}(\.\d{1,3})?$)|(^0(\.\d{1,2})?$)/, message: '押金格式不正确!'}
         // ],
       },
+      buttonLoadingList: {
+        handleSubmitBtn: false,
+      },
     };
   },
   mounted() {
@@ -1063,6 +1070,7 @@ export default {
     handleSubmit() {
       this.$refs.form.validate(valid => {
         if (valid) {
+          this.buttonLoadingList.handleSubmitBtn = true;
           this.urlsplit();
           if (!this.form.id) {
             add(this.form).then(() => {
@@ -1083,6 +1091,7 @@ export default {
               });
             });
           }
+          this.buttonLoadingList.handleSubmitBtn = false;
         } else {
           console.log('error submit!!');
           return false;

src/views/basic/printTemplate/basicPrintTemplate.vue

@@ -31,10 +31,16 @@
           icon="el-icon-delete"
           plain
           v-if="permission.basicPrintTemplate_delete"
+          :loading="buttonLoadingList.handleDeleteBtn"
           @click="handleDelete"
           >删 除
         </el-button>
-        <el-button type="warning" plain icon="el-icon-download" @click="handleExport"
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          :loading="buttonLoadingList.handleExportBtn"
+          @click="handleExport"
           >导 出
         </el-button>
       </template>
@@ -94,6 +100,10 @@ export default {
       option: option,
       data: [],
       fileName: '',
+      buttonLoadingList: {
+        handleDeleteBtn: false,
+        handleExportBtn: false,
+      },
     };
   },
   computed: {
@@ -205,6 +215,7 @@ export default {
         type: 'warning',
       })
         .then(() => {
+          this.buttonLoadingList.handleDeleteBtn = true;
           return remove(this.ids);
         })
         .then(() => {
@@ -213,6 +224,7 @@ export default {
             type: 'success',
             message: '操作成功!',
           });
+          this.buttonLoadingList.handleDeleteBtn = false;
           this.$refs.crud.toggleSelection();
         });
     },
@@ -228,10 +240,20 @@ export default {
         type: 'warning',
       }).then(() => {
         NProgress.start();
-        exportBlob(downloadUrl, values).then(res => {
-          downloadXls(res.data, `打印模板信息${dateNow()}.xlsx`);
-          NProgress.done();
-        });
+        this.buttonLoadingList.handleExportBtn = true;
+        try {
+          exportBlob(downloadUrl, values)
+            .then(res => {
+              downloadXls(res.data, `打印模板信息${dateNow()}.xlsx`);
+              NProgress.done();
+            })
+            .catch(err => {
+              console.log('err :>> ', err);
+            });
+        } catch (error) {
+        } finally {
+          this.buttonLoadingList.handleExportBtn = false;
+        }
       });
     },
     beforeOpen(done, type) {
@@ -330,7 +352,7 @@ export default {
 }
 </style>
 
-<style  lang="scss">
+<style lang="scss">
 .avue-form__group {
   .no-print {
     display: flex;
@@ -349,25 +371,25 @@ export default {
     margin-right: 8px;
   }
 }
-:deep(.el-form-item__label){
-  width:auto !important;
+:deep(.el-form-item__label) {
+  width: auto !important;
 }
-.no-print{
-//  margin-left:auto;
-  .el-button{
-     margin-right:0
+.no-print {
+  //  margin-left:auto;
+  .el-button {
+    margin-right: 0;
   }
 }
 </style>
 
-<style scoped lang='scss'>
-:deep(.no-print){
- margin-left:auto;
-  .el-button{
-     margin-right:0
+<style scoped lang="scss">
+:deep(.no-print) {
+  margin-left: auto;
+  .el-button {
+    margin-right: 0;
   }
 }
-:deep(.avue-form__row){
-    max-width:300px;
+:deep(.avue-form__row) {
+  max-width: 300px;
 }
 </style>

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

@@ -1089,6 +1089,7 @@ export default {
       if (!!this.ids) {
         row.ids = this.ids;
       }
+      row = { ...row, ...this.query };
       stockArticExport(row).then(res => {
         console.log(res.data);
         downloadXls(res.data, '全部订单数据.xlsx');

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

@@ -94,7 +94,9 @@
               v-if="handler"
               >修改服务类型</el-button
             >
-            <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
+            >
           </div>
           <!--   <div class="avue-crud__left">
             <el-button type="primary" icon="el-icon-plus" @click="handlebill"  v-if = "!handler">创建提货单</el-button>
@@ -374,7 +376,8 @@ import {
   add,
   update,
   remove,
-  addStock, stockArticExport
+  addStock,
+  stockArticExport,
 } from '@/api/distribution/distributionStockArticle';
 import { getListOwn } from '@/api/distribution/distributionParcelList';
 import { addCallDelivery } from '@/api/distribution/distrilbutionCallDelivery';
@@ -984,21 +987,20 @@ export default {
       });
       return ids.join(',');
     },
-
   },
   methods: {
     //导出
     handleExport() {
-      let row = {  };
-      if(!!this.ids){
+      let row = {};
+      if (!!this.ids) {
         row.ids = this.ids;
       }
-      row.typeService ="1";
-      stockArticExport(row).then( res =>{
+      row.typeService = '1';
+      row = { ...row, ...this.query };
+      stockArticExport(row).then(res => {
         console.log(res.data);
         downloadXls(res.data, '商配订单数据.xlsx');
       });
-
     },
 
     showdrawer(value) {
@@ -1535,9 +1537,6 @@ export default {
       return y + '-' + m + '-' + d + ' ' + h + ':' + minute + ':' + s;
     },
     onLoad(page, params = {}) {
-
-
-
       this.loading = true;
       if (this.stockupDate.length > 0) {
         let startDate = this.stockupDate[0];

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

@@ -1015,6 +1015,7 @@ export default {
         row.ids = this.ids;
       }
       row.typeService = '2';
+      row = { ...row, ...this.query };
       stockArticExport(row).then(res => {
         console.log(res.data);
         downloadXls(res.data, '市配订单数据.xlsx');

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

@@ -1188,6 +1188,7 @@ export default {
         row.ids = this.ids;
       }
       row.typeService = '3';
+      row = { ...row, ...this.query };
       stockArticExport(row).then(res => {
         console.log(res.data);
         downloadXls(res.data, '自提订单数据.xlsx');

src/views/distribution/inventory/distributionStockList.vue

@@ -29,8 +29,10 @@
             <!-- <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="handleExport" 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">
@@ -922,8 +924,8 @@ export default {
     },
     //导出
     handleExport() {
-      let row = {  };
-      if(!!this.ids){
+      let row = {};
+      if (!!this.ids) {
         row.ids = this.ids;
       }
       // exportBlob(
@@ -932,12 +934,11 @@ export default {
       //   downloadXls(res.data, '库存品数据.xlsx');
       // });
 
-
-      stockExport(row).then( res =>{
+      row = { ...row, ...this.query };
+      stockExport(row).then(res => {
         console.log(res.data);
         downloadXls(res.data, '全部库存品数据.xlsx');
       });
-
     },
     //导入
     handleImport() {
@@ -1265,8 +1266,8 @@ export default {
 .el-input {
   margin-left: 8px;
 }
-:deep(.el-form-item__label){
-  width:auto !important;
-  padding:0
+:deep(.el-form-item__label) {
+  width: auto !important;
+  padding: 0;
 }
 </style>

src/views/distribution/inventory/distributionStockListDiscuss.vue

@@ -29,8 +29,10 @@
             <!-- <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="handleExport" 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">
@@ -350,7 +352,8 @@ import {
   update,
   remove,
   addParcels,
-  getStockListOwn, stockExport
+  getStockListOwn,
+  stockExport,
 } from '@/api/distribution/distributionStockList';
 import { getListParcelDetails } from '@/api/distribution/distributionParcelDetails';
 import { getListMaterial } from '@/api/basic/basicMaterial';
@@ -928,20 +931,19 @@ export default {
       this.query[row.prop] = index;
       this.onLoad(this.page);
     },
-//导出
+    //导出
     handleExport() {
       let row = {
-        serviceType: this.query.serviceType
+        serviceType: this.query.serviceType,
       };
-      if(!!this.ids){
+      if (!!this.ids) {
         row.ids = this.ids;
       }
-
-      stockExport(row).then( res =>{
+      row = { ...row, ...this.query };
+      stockExport(row).then(res => {
         console.log(res.data);
         downloadXls(res.data, '商配库存品数据.xlsx');
       });
-
     },
     handleImport() {
       this.excelBox = true;
@@ -1265,8 +1267,8 @@ export default {
 .el-input {
   margin-left: 8px;
 }
-:deep(.el-form-item__label){
-  width:auto !important;
-  padding:0;
+:deep(.el-form-item__label) {
+  width: auto !important;
+  padding: 0;
 }
 </style>

src/views/distribution/inventory/distributionStockListMarket.vue

@@ -29,8 +29,10 @@
             <!-- <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="handleExport" 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,7 +311,8 @@ import {
   update,
   remove,
   addParcels,
-  getStockListOwn, stockExport
+  getStockListOwn,
+  stockExport,
 } from '@/api/distribution/distributionStockList';
 import { getListParcelDetails } from '@/api/distribution/distributionParcelDetails';
 import { getListMaterial } from '@/api/basic/basicMaterial';
@@ -922,17 +925,16 @@ export default {
     //导出
     handleExport() {
       let row = {
-        serviceType: this.query.serviceType
+        serviceType: this.query.serviceType,
       };
-      if(!!this.ids){
+      if (!!this.ids) {
         row.ids = this.ids;
       }
-
-      stockExport(row).then( res =>{
+      row = { ...row, ...this.query };
+      stockExport(row).then(res => {
         console.log(res.data);
         downloadXls(res.data, '市配库存品数据.xlsx');
       });
-
     },
 
     handleImport() {
@@ -1255,8 +1257,8 @@ export default {
 .el-input {
   margin-left: 8px;
 }
-:deep(.el-form-item__label){
-  width:auto !important;
-  padding:0
+:deep(.el-form-item__label) {
+  width: auto !important;
+  padding: 0;
 }
 </style>

src/views/distribution/inventory/distributionStockListSelf.vue

@@ -29,9 +29,10 @@
             <!-- <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="handleExport" 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">
@@ -310,7 +311,8 @@ import {
   update,
   remove,
   addParcels,
-  getStockListOwn, stockExport
+  getStockListOwn,
+  stockExport,
 } from '@/api/distribution/distributionStockList';
 import { getListParcelDetails } from '@/api/distribution/distributionParcelDetails';
 import { getListMaterial } from '@/api/basic/basicMaterial';
@@ -923,16 +925,16 @@ export default {
     //导出
     handleExport() {
       let row = {
-        serviceType: this.query.serviceType
+        serviceType: this.query.serviceType,
       };
-      if(!!this.ids){
+      if (!!this.ids) {
         row.ids = this.ids;
       }
-      stockExport(row).then( res =>{
+      row = { ...row, ...this.query };
+      stockExport(row).then(res => {
         console.log(res.data);
         downloadXls(res.data, '自提库存品数据.xlsx');
       });
-
     },
 
     handleImport() {
@@ -1257,8 +1259,8 @@ export default {
 .el-input {
   margin-left: 8px;
 }
-:deep(.el-form-item__label){
-  width:auto !important;
-  padding:0
+:deep(.el-form-item__label) {
+  width: auto !important;
+  padding: 0;
 }
 </style>

src/views/distribution/signdetail/distributionSigndetail.vue

@@ -7,12 +7,8 @@
           <div class="avue-crud__left">
             <!--            <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-download"
-              @click="handleExportInfo"
-              plain
-            >导出
+            <el-button type="danger" icon="el-icon-download" @click="handleExportInfo" plain
+              >导出
             </el-button>
           </div>
           <!-- 头部右侧按钮模块 -->
@@ -105,7 +101,8 @@ import {
   getDetail,
   add,
   update,
-  remove, getSigndetailExport
+  remove,
+  getSigndetailExport,
 } from '@/api/distribution/distributionSigndetail';
 import option from '@/option/distribution/distributionSigndetail';
 import { mapGetters } from 'vuex';
@@ -316,11 +313,11 @@ export default {
           width: '130',
           checkarr: [
             {
-              value: '2',
+              value: '1',
               label: '是',
             },
             {
-              value: '1',
+              value: '2',
               label: '否',
             },
           ],
@@ -474,7 +471,7 @@ export default {
     /**
      * 导出
      * */
-    handleExportInfo(){
+    handleExportInfo() {
       let row = {};
       // if (!!this.ids) {
       //   row.ids = this.ids;
@@ -482,11 +479,11 @@ export default {
       const ids = this.selectionList.join(',');
       row.ids = ids;
       // console.log("<><><>>",ids);
+      row = {...row, ...this.query}
       getSigndetailExport(row).then(res => {
         // console.log(res.data);
         downloadXls(res.data, '签收明细数据.xlsx');
       });
-
     },
     showdrawer(value) {
       this.drawerShow = value;
@@ -716,5 +713,4 @@ export default {
   display: flex;
   align-items: flex-end;
 }
-
 </style>

src/views/distribution/signfor/distributionSignfor.vue

@@ -76,12 +76,8 @@
         <div class="avue-crud__header">
           <!-- 头部左侧按钮模块 -->
           <div class="avue-crud__left">
-            <el-button
-              type="danger"
-              icon="el-icon-download"
-              @click="handleExportInfo"
-              plain
-            >导出
+            <el-button type="danger" icon="el-icon-download" @click="handleExportInfo" plain
+              >导出
             </el-button>
           </div>
           <!-- 头部右侧按钮模块 -->
@@ -199,7 +195,9 @@ import {
   update,
   remove,
   getPage,
-  getstatistics, getSignforExport, getSignforExportOwn
+  getstatistics,
+  getSignforExport,
+  getSignforExportOwn,
 } from '@/api/distribution/distributionSignfor';
 import option from '@/option/distribution/distributionSignfor';
 import { mapGetters } from 'vuex';
@@ -304,7 +302,20 @@ export default {
           type: 3,
           values: '',
           width: '130',
-          checkarr: [],
+          checkarr: [
+            {
+              label: '商配',
+              value: '1',
+            },
+            {
+              label: '市配',
+              value: '2',
+            },
+            {
+              label: '自提',
+              value: '3',
+            },
+          ],
           fixed: false,
           sortable: true,
         },
@@ -413,7 +424,7 @@ export default {
         {
           prop: 'sijiSigningStatus',
           label: '司机签收状态',
-          type: 2,
+          type: 1,
           values: '',
           width: '150',
           checkarr: [],
@@ -424,7 +435,7 @@ export default {
         {
           prop: 'wenyuanSigningStatus',
           label: '文员复核状态',
-          type: 2,
+          type: 1,
           values: '',
           width: '150',
           checkarr: [],
@@ -575,7 +586,7 @@ export default {
     /**
      * 导出
      * */
-    handleExportInfo(){
+    handleExportInfo() {
       let row = {};
       // if (!!this.ids) {
       //   row.ids = this.ids;
@@ -583,12 +594,12 @@ export default {
       const ids = this.selectionList.join(',');
       row.ids = ids;
       row.signingStatus = '2';
+      row = { ...row, ...this.query };
       // console.log("<><><>>",ids);
       getSignforExportOwn(row).then(res => {
         // console.log(res.data);
         downloadXls(res.data, '签收数据.xlsx');
       });
-
     },
     showdrawer(value) {
       this.drawerShow = value;
@@ -644,7 +655,7 @@ export default {
         path: '/distribution/signfor/distributionSignforedt',
         query: {
           id: row.id,
-          reservationId:row.reservationId,
+          reservationId: row.reservationId,
           name: '签收查看',
         },
       });
@@ -653,6 +664,8 @@ export default {
       console.log(index, row);
     },
     selectsc(index, row) {
+      console.log('index :>> ', index);
+      console.log('row :>> ', row);
       this.query[row.prop] = index;
       if (!index) {
         delete this.query[row.prop];

src/views/distribution/signfor/distributionSignfortreat.vue

@@ -621,11 +621,11 @@ export default {
           width: '130',
           checkarr: [
             {
-              label: '市配',
+              label: '商配',
               value: '1',
             },
             {
-              label: '商配',
+              label: '市配',
               value: '2',
             },
             {
@@ -719,7 +719,7 @@ export default {
         {
           prop: 'sijiSigningStatus',
           label: '司机签收状态',
-          type: 3,
+          type: 1,
           values: '',
           width: '150',
           checkarr: [
@@ -739,7 +739,7 @@ export default {
         {
           prop: 'wenyuanSigningStatus',
           label: '文员审核状态',
-          type: 3,
+          type: 1,
           values: '',
           width: '150',
           checkarr: [
@@ -1400,6 +1400,8 @@ export default {
       row.ids = ids;
       row.signingStatus = '1';
       // console.log("<><><>>",ids);
+      row = { ...row, ...this.query };
+      delete row.deliveryTypeName;
       getSignforExport(row).then(res => {
         // console.log(res.data);
         downloadXls(res.data, '待签收数据.xlsx');
@@ -1717,7 +1719,7 @@ export default {
         path: '/distribution/signfor/distributionSignforedt',
         query: {
           id: row.id,
-          reservationId:row.reservationId,
+          reservationId: row.reservationId,
           name: '待签收查看',
         },
       });
@@ -1730,6 +1732,10 @@ export default {
       if (!index) {
         delete this.query[row.prop];
       }
+      if (row.prop === 'deliveryTypeName') {
+        this.query.deliveryType = index;
+        if (!index) delete this.query.deliveryType;
+      }
       this.onLoad(this.page);
     },
     timesc(index, row) {

src/views/warehouse/warehouseWaybill.vue

@@ -3,17 +3,17 @@
     <div class="avue-crud">
       <el-row v-if="!search">
         <!-- 查询模块 -->
-        <el-form :inline="true" :model="query" class='fr-fo'>
+        <el-form :inline="true" :model="query" class="fr-fo">
           <div>
-          <el-form-item label="运单号:">
-            <el-input v-model="query.waybillNo" placeholder="请输入运单号"></el-input>
-          </el-form-item>
-          <el-form-item label="客户车次号:">
-            <el-input v-model="query.customerTrain" placeholder="请输入客户车次号"></el-input>
-          </el-form-item>
-        </div>
+            <el-form-item label="运单号:">
+              <el-input v-model="query.waybillNo" placeholder="请输入运单号"></el-input>
+            </el-form-item>
+            <el-form-item label="客户车次号:">
+              <el-input v-model="query.customerTrain" placeholder="请输入客户车次号"></el-input>
+            </el-form-item>
+          </div>
           <!-- 查询按钮 -->
-          <el-form-item class='el-btn'>
+          <el-form-item class="el-btn">
             <el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button>
             <el-button icon="el-icon-delete" @click="searchReset()">清 空</el-button>
           </el-form-item>
@@ -27,12 +27,8 @@
             <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 type="danger" icon="el-icon-download" @click="handleExportInfo" plain
+            >导出
           </el-button>
 
           <div></div>
@@ -398,7 +394,8 @@ import {
   add,
   update,
   remove,
-  splitOrder, getWarehouseWaybillExport
+  splitOrder,
+  getWarehouseWaybillExport,
 } from '@/api/warehouse/warehouseWaybill';
 import option from '@/option/warehouse/warehouseWaybill';
 import { mapGetters } from 'vuex';
@@ -905,23 +902,22 @@ export default {
     },
   },
   methods: {
-
     /**
      * 导出
      * */
-    handleExportInfo(){
+    handleExportInfo() {
       let row = {};
       if (!!this.ids) {
         row.ids = this.ids;
       }
       // const ids = this.selectionList.join(',');
       // row.ids = ids;
-      console.log("<><><>>",row.ids);
+      row = { ...row, ...this.query };
+      console.log('<><><>>', row.ids);
       getWarehouseWaybillExport(row).then(res => {
         // console.log(res.data);
         downloadXls(res.data, '在库运单数据.xlsx');
       });
-
     },
     showdrawer(value) {
       this.drawerShow = value;
@@ -1379,16 +1375,16 @@ export default {
 }
 </style>
 
-<style scoped lang='scss'>
+<style scoped lang="scss">
 .el-form-item__label {
   justify-content: flex-start;
 }
-.fr-fo{
-    display: flex;
-    width: 100%;
-    justify-content: space-between;
+.fr-fo {
+  display: flex;
+  width: 100%;
+  justify-content: space-between;
 }
-.el-btn{
-    margin-right:0
+.el-btn {
+  margin-right: 0;
 }
 </style>