Commit 22ab0f26 authored by huhaiqing's avatar huhaiqing

修改海运缺陷

parent b50e658d
...@@ -403,6 +403,7 @@ export default { ...@@ -403,6 +403,7 @@ export default {
let params = { ...this.queryParams }; let params = { ...this.queryParams };
params.page = undefined; params.page = undefined;
params.pageSize = undefined; params.pageSize = undefined;
params.transportTypeList = ["1", "2"];
this.addBeginAndEndTime(params, this.dateRangeCreateTime, "createTime"); this.addBeginAndEndTime(params, this.dateRangeCreateTime, "createTime");
// 执行导出 // 执行导出
this.$modal this.$modal
......
...@@ -403,6 +403,7 @@ export default { ...@@ -403,6 +403,7 @@ export default {
let params = { ...this.queryParams }; let params = { ...this.queryParams };
params.page = undefined; params.page = undefined;
params.pageSize = undefined; params.pageSize = undefined;
params.transportTypeList = ['4'];
this.addBeginAndEndTime(params, this.dateRangeCreateTime, "createTime"); this.addBeginAndEndTime(params, this.dateRangeCreateTime, "createTime");
// 执行导出 // 执行导出
this.$modal this.$modal
...@@ -412,7 +413,7 @@ export default { ...@@ -412,7 +413,7 @@ export default {
return exportboxExcel(params); return exportboxExcel(params);
}) })
.then((response) => { .then((response) => {
this.$download.excel(response, "${table.classComment}.xls"); this.$download.excel(response, this.$t("海空联运") + ".xls");
this.exportLoading = false; this.exportLoading = false;
}) })
.catch(() => {}); .catch(() => {});
......
...@@ -132,9 +132,13 @@ ...@@ -132,9 +132,13 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="price" :label="$t('金额')" align="center"></el-table-column> <el-table-column prop="price" :label="$t('金额')" align="center"></el-table-column>
<el-table-column prop="" :label="$t('实付金额')" align="center"></el-table-column> <el-table-column prop="payPrice" :label="$t('实付金额')" align="center"></el-table-column>
<el-table-column prop="" :label="$t('实付日期')" align="center"></el-table-column> <el-table-column prop="payTime" :label="$t('实付日期')" align="center">
<el-table-column prop="" :label="$t('操作')" align="center"> <template slot-scope="scope">
<span v-if="scope.row.payTime">{{formatDate(scope.row.payTime)}}</span>
</template>
</el-table-column>
<el-table-column :label="$t('操作')" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="primary" size="small" @click="editCostClick(scope.row)" style="marginRight:10px;">{{$t('编辑')}}</el-button> <el-button type="primary" size="small" @click="editCostClick(scope.row)" style="marginRight:10px;">{{$t('编辑')}}</el-button>
<el-popconfirm :title="$t('确定是否删除')" @confirm="deleteCostClick(scope.row)"> <el-popconfirm :title="$t('确定是否删除')" @confirm="deleteCostClick(scope.row)">
......
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