Commit e7a0fd06 authored by dragondean@qq.com's avatar dragondean@qq.com

重货导出无响应,控货列表箱数入仓状态判断条件修正

parent 79c15273
...@@ -90,7 +90,7 @@ ...@@ -90,7 +90,7 @@
<el-table-column :label="$t('唛头')" align="center" prop="marks" /> <el-table-column :label="$t('唛头')" align="center" prop="marks" />
<el-table-column :label="$t('箱数')" align="center" prop="sumNum" > <el-table-column :label="$t('箱数')" align="center" prop="sumNum" >
<template v-slot="{row}"> <template v-slot="{row}">
{{row.inWarehouseState > 1 ? row.sumNum : row.totalNum}} {{row.sumNum > 0 ? row.sumNum : row.totalNum}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('已放箱数')" align="center" prop="sumWeight"> <el-table-column :label="$t('已放箱数')" align="center" prop="sumWeight">
......
...@@ -134,14 +134,14 @@ ...@@ -134,14 +134,14 @@
<el-dropdown-item v-hasPermi="[exportPermiString]" @click.native="exportChecked">导出勾选</el-dropdown-item> <el-dropdown-item v-hasPermi="[exportPermiString]" @click.native="exportChecked">导出勾选</el-dropdown-item>
<el-dropdown-item v-hasPermi="[exportPermiString]" @click.native="exportSearch">导出搜索</el-dropdown-item> <el-dropdown-item v-hasPermi="[exportPermiString]" @click.native="exportSearch">导出搜索</el-dropdown-item>
<template v-if="isAll" v-hasPermi="['ecw:order:export:other']"> <template v-if="isAll" v-hasPermi="['ecw:order:export:other']">
<el-dropdown-item hasPermi="[exportPermiString]" @click.native="exportAbnormal">异常单统计</el-dropdown-item> <el-dropdown-item @click.native="exportAbnormal">异常单统计</el-dropdown-item>
<el-dropdown-item hasPermi="[exportPermiString]" @click.native="exportHeavyOrder">重货单统计</el-dropdown-item> <el-dropdown-item @click.native="exportHeavyOrder">重货单统计</el-dropdown-item>
<el-dropdown-item hasPermi="[exportPermiString]" @click.native="exportReturnOrder">退仓单统计</el-dropdown-item> <el-dropdown-item @click.native="exportReturnOrder">退仓单统计</el-dropdown-item>
<el-dropdown-item hasPermi="[exportPermiString]" @click.native="exportSaleRepay">售后赔偿金额统计</el-dropdown-item> <el-dropdown-item @click.native="exportSaleRepay">售后赔偿金额统计</el-dropdown-item>
<el-dropdown-item hasPermi="[exportPermiString]" @click.native="exportCustomsDatas">报关数据统计</el-dropdown-item> <el-dropdown-item @click.native="exportCustomsDatas">报关数据统计</el-dropdown-item>
<el-dropdown-item hasPermi="[exportPermiString]" @click.native="exportShippingDatas">客户出货量统计</el-dropdown-item> <el-dropdown-item @click.native="exportShippingDatas">客户出货量统计</el-dropdown-item>
<el-dropdown-item hasPermi="[exportPermiString]" @click.native="exportShipFee">预付运费统计</el-dropdown-item> <el-dropdown-item @click.native="exportShipFee">预付运费统计</el-dropdown-item>
<el-dropdown-item @click.native="$message('// TODO')">卸货费统计</el-dropdown-item> <!-- <el-dropdown-item @click.native="$message('// TODO')">卸货费统计</el-dropdown-item> -->
</template> </template>
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
...@@ -666,6 +666,10 @@ export default { ...@@ -666,6 +666,10 @@ export default {
exportUnload(){ exportUnload(){
return this.exportExcel(exportUnload, this.combinedQueryParams, this.$t("卸货费统计")) return this.exportExcel(exportUnload, this.combinedQueryParams, this.$t("卸货费统计"))
}, },
// 导出重货单统计
exportHeavyOrder(){
return this.exportExcel(exportHeavyOrder, this.combinedQueryParams, this.$t("重货单统计"))
},
// 通用导出函数 // 通用导出函数
exportExcel(func, params, fileName = null){ exportExcel(func, params, fileName = null){
this.exportLoading = true; this.exportLoading = true;
......
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