合并分支

@@ -27,6 +27,7 @@
       <filter-item>
         <Button type="primary" @click="search">筛选</Button>
         <Button @click="reset">清空条件</Button>
+        <Button type="success" @click="exportData">导出</Button>
       </filter-item>
     </layout-filter>
     <layout-list>
@@ -42,6 +43,7 @@ import { ReturnedListTable } from '../components';
 import { ReturnedService } from 'services/order';
 import { OrderConfig } from 'pages/order/configs';
 import _ from 'lodash';
+import qs from 'querystringify';
 
 export default {
   components: { ReturnedListTable },
@@ -99,6 +101,11 @@ export default {
       this.query.orderStatusStr = '';
       this.search();
     },
+    exportData() {
+      const querystring = qs.stringify(this.query, true);
+      const href = `${ReturnedService.exportReturnedGoods}${querystring}`;
+      window.open(href, '_blank');
+    },
   },
 };
 </script>

@@ -71,4 +71,6 @@ class ReturnedService extends Service {
     return this.post(apiUrl.getReturnedInfo, params);
   }
 }
+
+ReturnedService.exportReturnedGoods = '/Api/erp/exportReturnedGoods';
 export default ReturnedService;

@@ -115,6 +115,7 @@ const domainApis = {
     queryRefuseReason: '/erp-gateway-web/cs/refuseReason/queryAll',
     returnedReject: '/erp-gateway-web/shop/returnedGoods/returnedGoodsReject',
     getReturnedInfo: '/erp-gateway-web/shop/returnedGoods/queryById',
+    exportReturnedGoods: '/erp-gateway-web/shop/export/exportReturnedGoods',
 
     // 提现申请管理
     shopWithdrawList: '/erp-gateway-web/shop/withdraw/list', //资金操作明细列表