Commit 44ac9d5a authored by dragondean@qq.com's avatar dragondean@qq.com

控货的两个小bug

parent bfa17f4a
...@@ -161,12 +161,12 @@ import CustomerSelector from '@/components/CustomerSelector' ...@@ -161,12 +161,12 @@ import CustomerSelector from '@/components/CustomerSelector'
import Transfer from '@/views/ecw/order/components/Transfer' import Transfer from '@/views/ecw/order/components/Transfer'
import Release from './components/Release' import Release from './components/Release'
import CargoControlEdit from './components/CargoControlEdit' import CargoControlEdit from './components/CargoControlEdit'
import { getCargoControlOrderPage, batchReview, orderReview, getPickRleaseInfo } from "@/api/ecw/orderCargoControl" import { getCargoControlOrderPage, batchReview, orderReview, getPickRleaseInfo, exportCargoControl } from "@/api/ecw/orderCargoControl"
import TransferCargo from '@/views/ecw/order/components/TransferCargo' import TransferCargo from '@/views/ecw/order/components/TransferCargo'
import Fallback from './components/Fallback' import Fallback from './components/Fallback'
import {getWarehouseList} from '@/api/ecw/warehouse' import {getWarehouseList} from '@/api/ecw/warehouse'
export default { export default {
name: "EcwOrderCargonControl", name: "EcwOrderCargocontrol",
components: { components: {
CustomerSelector, ProductSelector, Selector, Transfer, Release,CargoControlEdit, TransferCargo, Fallback CustomerSelector, ProductSelector, Selector, Transfer, Release,CargoControlEdit, TransferCargo, Fallback
}, },
...@@ -269,9 +269,9 @@ export default { ...@@ -269,9 +269,9 @@ export default {
// 执行导出 // 执行导出
this.$modal.confirm('是否确认导出所有订单数据项?').then(() => { this.$modal.confirm('是否确认导出所有订单数据项?').then(() => {
this.exportLoading = true; this.exportLoading = true;
return exportOrderExcel(this.combinedQueryParams); return exportCargoControl(this.combinedQueryParams);
}).then(response => { }).then(response => {
this.$download.excel(response, '${table.classComment}.xls'); this.$download.excel(response, this.$t('控货订单') + '.xlsx');
this.exportLoading = false; this.exportLoading = false;
}).catch(() => { }); }).catch(() => { });
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment