|
@@ -258,19 +258,21 @@ export default {
|
|
|
editOpen(row) {
|
|
|
},
|
|
|
outExport() {
|
|
|
- let queryParams = this.search
|
|
|
- if (queryParams.arrivalTime) {
|
|
|
- queryParams.beginCreateTime = queryParams.careteTime[0]
|
|
|
- queryParams.endCreateTime = queryParams.careteTime[1]
|
|
|
- delete queryParams.careteTime
|
|
|
+ let params = { ...this.search }
|
|
|
+ if (params.careteTime && params.careteTime.length > 0) {
|
|
|
+ params = {
|
|
|
+ ...params,
|
|
|
+ beginCreateTime: params.careteTime[0] + ' 00:00:00',
|
|
|
+ endCreateTime: params.careteTime[1] + ' 23:59:59',
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ params = {
|
|
|
+ ...params,
|
|
|
+ beginCreateTime: '',
|
|
|
+ endCreateTime: '',
|
|
|
+ }
|
|
|
}
|
|
|
- // const routeData = this.$router.resolve({
|
|
|
- // path: '/api/blade-land/order/acct-export', //跳转目标窗口的地址
|
|
|
- // query: {
|
|
|
- // ...queryParams //括号内是要传递给新窗口的参数
|
|
|
- // }
|
|
|
- // })
|
|
|
- // window.open(routeData.href.slice(1, routeData.href.length - 1) + '&' + `${this.website.tokenHeader}=${getToken()}`);
|
|
|
+ window.open(`/api/blade-purchase-sales/exportOrder/selBusinessExport?${this.website.tokenHeader}=${getToken()}&corpId=${params.corpId}&salesName=${params.salesName}&beginCreateTime=${params.beginCreateTime}&endCreateTime=${params.endCreateTime}`);
|
|
|
}
|
|
|
}
|
|
|
};
|