Merge remote-tracking branch 'origin/dev' into dev

src/views/tirePartsMall/statisticAnalysis/customerTransactions/detailsInfo.vue

@@ -415,8 +415,8 @@ export default {
             delete params.storageName
             delete params.createUser
             console.log(params);
-            getList({ customerId: this.detailData.id, status: '待确认,待发货,已发货,退款请核', bsType: 'XS', current:page.currentPage,
-            size:page.pageSize,...params})
+            getList({ customerId: this.detailData.id, bsType: 'XS', current:page.currentPage,
+            size:page.pageSize,...params, status: '待确认,待发货,已发货,退款请核'})
                 .then(res => {
                     this.sellList = res.data.data.records ? res.data.data.records : [];
                     this.page.total = res.data.data.total;

src/views/tirePartsMall/statisticAnalysis/supplierTransactions/detailsInfo.vue

@@ -382,7 +382,7 @@ export default {
             console.log(data,page);
             //id: id, status: '待确认,待发货,已发货,退款请核', bsType: 'XS'
             // data.status = '待确认,待发货,已发货,退款请核'
-            getList({ id: this.detailData.id, bsType: 'CG',...data,current:page.currentPage,
+            getList({ customerId: this.detailData.id, bsType: 'CG',...data,current:page.currentPage,
             size:page.pageSize })
                 .then(res => {
                     this.sellList = res.data.data.records ? res.data.data.records : [];