Commit af9f3485 authored by liuzeheng's avatar liuzeheng

控货订单

parent 2f6223e1
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
</el-form-item> </el-form-item>
<el-form-item :label="$t('订单状态')" prop="status"> <el-form-item :label="$t('订单状态')" prop="status">
<dict-selector :type="DICT_TYPE.ORDER_STATUS" v-model="queryParams.status" <dict-selector :type="DICT_TYPE.ORDER_STATUS" v-model="queryParams.status"
@keyup.enter.native="handleQuery" clearable /> @keyup.enter.native="handleQuery" clearable @change="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item :label="$t('提单号')" prop="tidanNo"> <el-form-item :label="$t('提单号')" prop="tidanNo">
<el-input v-model="queryParams.tidanNo" :placeholder="$t('提单号')" clearable @keyup.enter.native="handleQuery" /> <el-input v-model="queryParams.tidanNo" :placeholder="$t('提单号')" clearable @keyup.enter.native="handleQuery" />
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item :label="$t('订单类型')" prop="number"> <el-form-item :label="$t('订单类型')" prop="number">
<el-select v-model="queryParams.type" :placeholder="$t('请选择')" clearable > <el-select v-model="queryParams.type" :placeholder="$t('请选择')" clearable @change="handleQuery" >
<el-option :label="$t('普通订单')" :value="0"></el-option> <el-option :label="$t('普通订单')" :value="0"></el-option>
<el-option :label="$t('集运服务')" :value="1"></el-option> <el-option :label="$t('集运服务')" :value="1"></el-option>
<el-option :label="$t('海外仓')" :value="2"></el-option> <el-option :label="$t('海外仓')" :value="2"></el-option>
......
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
<el-form-item :label="$t('目的国')" prop="destCountryId"> <el-form-item :label="$t('目的国')" prop="destCountryId">
<el-select v-model="destCountryId" multiple :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.guojia" :label="item.guojiaName" :value="item.guojia"
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -745,6 +745,7 @@ export default { ...@@ -745,6 +745,7 @@ export default {
deep:true, //深度监听 deep:true, //深度监听
handler () { handler () {
this.findBycityCode(); this.findBycityCode();
} }
} }
...@@ -872,6 +873,21 @@ export default { ...@@ -872,6 +873,21 @@ export default {
.catch(error => { .catch(error => {
console.log(error); console.log(error);
}); });
//目的城市
getRegionList(4, 4).then(({data}) => {
this.AddressCity = data;
})
.catch(error => {
console.log(error);
});
//目的仓
getRegionList(5, 5).then(({data}) => {
this.AddressTown = data;
})
.catch(error => {
console.log(error);
});
}, },
findByprovinceCode () { findByprovinceCode () {
//获取当前省份值id,获取该省份下城市 destCountryId provinceCode //获取当前省份值id,获取该省份下城市 destCountryId provinceCode
...@@ -889,10 +905,29 @@ export default { ...@@ -889,10 +905,29 @@ export default {
//获取当前城市值id,获取该城市下区域 //获取当前城市值id,获取该城市下区域
getRegionList(3, this.objectiveId).then(({data}) => { getRegionList(3, this.objectiveId).then(({data}) => {
this.AddressTown = data; this.AddressTown = data;
// 去重
// let uniqueDataList = data.filter((item, index, self) => {
// // 返回第一个匹配项的索引,用于判断当前项是否为第一个匹配项
// const firstIndex = self.findIndex((obj) => obj.guojia === item.guojia);
// // 如果当前项是第一个匹配项,则保留,否则过滤掉
// return index === firstIndex;
// });
// this.AddressProvince = uniqueDataList
}) })
.catch(error => { .catch(error => {
console.log(error); console.log(error);
}); });
}, },
getDictDatas, getDictDatas,
......
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