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

自编号报表的bug,还没改完

parent 0d51c7fb
......@@ -22,8 +22,8 @@
/>
</el-select>
</el-form-item>
<el-form-item :label="$t('目的国')">
<el-select v-model="queryParams.destCountryId" :placeholder="$t('请选择')" clearable filterable >
<el-form-item :label="$t('目的国')" :rules="{required: true}">
<el-select v-model="queryParams.destCountryId" :placeholder="$t('请选择')" filterable default-first-option>
<el-option
v-for="item in countryList"
:key="item.id"
......@@ -33,7 +33,7 @@
</el-select>
</el-form-item>
<el-form-item :label="$t('目的仓')">
<el-select v-model="queryParams.destWarehouseId" :placeholder="$t('请选择')" clearable>
<el-select v-model="queryParams.destWarehouseId" :placeholder="queryParams.destCountryId ? $t('请选择') : $t('请先选择目的国')" clearable>
<el-option
v-for="item in importWarehouseList"
:key="item.id"
......@@ -169,7 +169,11 @@ export default {
return this.warehouseList.filter(item => +item.tradeType === 2 || +item.tradeType === 3)
},
importWarehouseList(){
return this.warehouseList.filter(item => +item.tradeType === 1 || +item.tradeType === 3)
// 目的仓根据选择的目的国过滤
if(!this.queryParams.destCountryId) return []
return this.warehouseList.filter(item => {
return this.queryParams.destCountryId === item.guojia && ( +item.tradeType === 1 || +item.tradeType === 3)
})
},
},
methods: {
......
......@@ -2,6 +2,9 @@
<div class="app-container">
<!-- 搜索 -->
<el-card>
<div slot="header">
<div class="card-title">{{$route.query.containerNumber}} - {{ $t('订单费用报表') }}</div>
</div>
<el-form
:model="queryParams"
ref="queryForm"
......@@ -92,8 +95,11 @@
</el-table-column>
<el-table-column :label="$t('是否重泡货')">
<template slot-scope="{row}">
<el-tooltip v-if="row.orderType != 1" effect="dark" content="111" placement="top-start">
<!--1 普货 2 重货 3 泡货-->
<dict-tag :type="DICT_TYPE.ECW_YESNO" :value="row.itemType != 1 ? '1' : '0'"></dict-tag>
<span>{{$t('')}}</span>
</el-tooltip>
<span v-else>{{$t('')}}</span>
</template>
</el-table-column>
<el-table-column :label="$t('收费数据')">
......
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