Commit bc045b2e authored by liuzeheng's avatar liuzeheng

筛选调整

parent 75aae5f6
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
<el-form-item :label="$t('目的国')" prop="destCountryId"> <el-form-item :label="$t('目的国')" prop="destCountryId">
<el-select v-model="destCountryId" :label="destCountryId" :placeholder="$t('请选择目的国')" clearable @change="handleQuery"> <el-select v-model="destCountryId" multiple :label="destCountryId" :placeholder="$t('请选择目的国')" clearable @change="handleQuery">
<el-option <el-option
v-for="item in AddressProvince" :key="item.shi" :label="item.guojiaName" :value="item.guojia" v-for="item in AddressProvince" :key="item.shi" :label="item.guojiaName" :value="item.guojia"
></el-option> ></el-option>
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
</el-form-item> </el-form-item>
<el-form-item :label="$t('目的城市')" prop="objectiveId"> <el-form-item :label="$t('目的城市')" prop="objectiveId">
<el-select v-model="objectiveId" :placeholder="$t('请根据目的国选择目的城市')" style="width: 200px" clearable @change="handleQuery"> <el-select v-model="objectiveId" multiple :placeholder="$t('请根据目的国选择目的城市')" style="width: 200px" clearable @change="handleQuery">
<el-option <el-option
v-for="item in AddressCity" :key="item.shi" :label="item.shiName" :value="item.shi" v-for="item in AddressCity" :key="item.shi" :label="item.shiName" :value="item.shi"
></el-option> ></el-option>
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
</el-form-item> </el-form-item>
<el-form-item :label="$t('目的仓')" prop="destWarehouseId"> <el-form-item :label="$t('目的仓')" prop="destWarehouseId">
<el-select v-model="destWarehouseId" :placeholder="$t('请根据目的城市选择目的仓')" style="width: 200px" clearable @change="handleQuery"> <el-select v-model="destWarehouseId" multiple :placeholder="$t('请根据目的城市选择目的仓')" style="width: 200px" clearable @change="handleQuery">
<el-option <el-option
v-for="item in AddressTown" :key="item.id" :label="item.titleZh" :value="item.id" v-for="item in AddressTown" :key="item.id" :label="item.titleZh" :value="item.id"
></el-option> ></el-option>
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
<el-form-item :label="$t('运输方式')" prop="transportId" v-if="!transportId"> <el-form-item :label="$t('运输方式')" prop="transportId" v-if="!transportId">
<dict-selector :type="DICT_TYPE.ECW_TRANSPORT_TYPE" v-model.number="queryParams.transportId" clearable @change="handleQuery"/> <dict-selector :type="DICT_TYPE.ECW_TRANSPORT_TYPE" multiple v-model.number="queryParams.transportId" clearable @change="handleQuery"/>
</el-form-item> </el-form-item>
<!-- <el-form-item :label="$t('商品分类')" prop="goodsType"> <!-- <el-form-item :label="$t('商品分类')" prop="goodsType">
...@@ -637,10 +637,10 @@ export default { ...@@ -637,10 +637,10 @@ export default {
AddressCity: [], AddressCity: [],
AddressProvince: [], AddressProvince: [],
AddressTown: [], AddressTown: [],
destCountryId: '', destCountryId: [],
countryId:'', countryId:'',
//destCountryId:'', //destCountryId:'',
objectiveId: '', objectiveId: [],
destWarehouseId: '', destWarehouseId: '',
// 选中数组 // 选中数组
...@@ -804,11 +804,20 @@ export default { ...@@ -804,11 +804,20 @@ export default {
queryParams[this.prodParam.key] = this.prodParam.value queryParams[this.prodParam.key] = this.prodParam.value
} }
//目的国 //目的国
if(this.destCountryId !=null && this.destCountryId !=''){
queryParams.destCountryId = this.destCountryId queryParams.destCountryId = this.destCountryId
}
if(this.objectiveId !=null && this.objectiveId !=''){
//目的城市 //目的城市
queryParams.objectiveId = this.objectiveId queryParams.objectiveId = this.objectiveId
}
if(this.destWarehouseId !=null && this.destWarehouseId !=''){
//目的仓 //目的仓
queryParams.destWarehouseId = this.destWarehouseId queryParams.destWarehouseId = this.destWarehouseId
}
return queryParams return queryParams
}, },
......
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