Skip to content

J
jiedao-app-operator-master
Commit f3db5918 authored by Administrator's avatar Administrator
Browse files
Options

Merge branch 'pre-release' into 'jd_dev' 

Pre Release最新代码合并入捷道研发分支20241123

See merge request !101
parents c36dbbd9 fc6f13f9
Hide whitespace changes
Inline Side-by-side
Showing with 633 additions and 479 deletions
src/components/RoutersSelector/index.vue
View file @ f3db5918
...@@ -16,7 +16,8 @@ ...@@ -16,7 +16,8 @@
v-model="destCountryIds" v-model="destCountryIds"
multiple multiple
clearable> clearable>
<el-option v-for="item in countryList" :key="item.id" :label="$l(item, 'title')" :value="item.id"/> <el-option v-for="item in destCountryList" :key="item.guojia"
:label="isChinese ? item.guojiaName : item.guojiaNameEn" :value="item.guojia"/>
</el-select> </el-select>
{{ $t('目的城市') }}： {{ $t('目的城市') }}：
...@@ -29,19 +30,21 @@ ...@@ -29,19 +30,21 @@
v-model="destCityIds" v-model="destCityIds"
multiple multiple
clearable> clearable>
<el-option v-for="item in AddressCity" :key="item.shi" :label="item.shiName" :value="item.shi"/> <el-option v-for="item in destCityList" :key="item.shi" :label="isChinese ? item.shiName : item.shiNameEn"
:value="item.shi"/>
</el-select> </el-select>
{{ $t('目的仓') }}： {{ $t('目的仓') }}：
<el-select :placeholder="$t('请选择目的仓')" <el-select :placeholder="$t('请选择目的仓')"
v-model="destWarehouseIds" v-model="destWarehouseIds"
multiple multiple
clearable> clearable>
<el-option v-for="item in AddressTown" :key="item.id" :label="item.titleZh" :value="item.id"/> <el-option v-for="item in destWarehouseList" :key="item.warehouseId"
:label="isChinese ? item.warehouseTitleZh : item.warehouseTitleEn" :value="item.warehouseId"/>
</el-select> </el-select>
<template v-if="type != 'sea'"> <template v-if="type != 'sea'">
{{ $t('出货渠道') }}: {{ $t('出货渠道') }}:
<el-select :placeholder="$t('请选择出货渠道')" v-model="channelId" clearable> <el-select :placeholder="$t('请选择出货渠道')" v-model="channelIds" clearable multiple>
<el-option v-for="item in channelList" :key="item.channelId" :label="item.nameZh" :value="item.channelId"/> <el-option v-for="item in channelList" :key="item.channelId" :label="item.nameZh" :value="item.channelId"/>
</el-select> </el-select>
</template> </template>
...@@ -113,7 +116,7 @@ ...@@ -113,7 +116,7 @@
import {getChannelList} from '@/api/ecw/channel' import {getChannelList} from '@/api/ecw/channel'
import {getListTree, getTradeCityList} from '@/api/ecw/region' import {getListTree, getTradeCityList} from '@/api/ecw/region'
import {getRegionList} from "@/api/ecw/order"; import {getRegionList} from "@/api/ecw/order";
import {openedRouterList} from '@/api/ecw/warehouse' import {getGuojiaAndShiAndWarehouseList, openedRouterList} from '@/api/ecw/warehouse'
import {getProductAttrList} from "@/api/ecw/productAttr"; import {getProductAttrList} from "@/api/ecw/productAttr";
import Template from "@/views/cms/template"; import Template from "@/views/cms/template";
...@@ -153,13 +156,20 @@ export default { ...@@ -153,13 +156,20 @@ export default {
destCountryId: null, destCountryId: null,
destCityId: null, destCityId: null,
destWarehouseId: null, destWarehouseId: null,
destCountryList: [],//目的国
destCityList: [],//目的城市
destWarehouseList: [],//目的仓
destCountryIds: [], destCountryIds: [],
destCityIds: [], destCityIds: [],
destWarehouseIds: [], destWarehouseIds: [],
channelIds: [],
} }
}, },
computed: { computed: {
isChinese() {
return this.$i18n.locale === "zh_CN"
},
importCityList() { importCityList() {
return this.tradeCityList.filter(item => item.type == 1 || item.type == 3) return this.tradeCityList.filter(item => item.type == 1 || item.type == 3)
}, },
...@@ -183,10 +193,14 @@ export default { ...@@ -183,10 +193,14 @@ export default {
}, },
// 根据选择的渠道筛选 // 根据选择的渠道筛选
availChannelList() { availChannelList() {
return this.channelList.filter(item => !this.channelId || this.channelId == item.channelId) return this.channelList.filter(item => !this.channelIds || this.channelIds.includes(item.channelId))
}, },
filteredRouterList() { filteredRouterList() {
let transportTypeList = [] let transportTypeList = []
if (!this.transportType) {
this.transportType = this.type == "sea" ? 1 : 3
}
this.transportTypeDicts this.transportTypeDicts
.filter(this.transportFilter) .filter(this.transportFilter)
.filter(transport => !this.channelId || transport.cssClass == 'channel') .filter(transport => !this.channelId || transport.cssClass == 'channel')
...@@ -226,7 +240,7 @@ export default { ...@@ -226,7 +240,7 @@ export default {
transportTypeList.push(child) transportTypeList.push(child)
} }
}) })
console.log(transportTypeList) console.log("运输线路", transportTypeList)
return transportTypeList return transportTypeList
}, },
// 是否显示商品特性(渠道) // 是否显示商品特性(渠道)
...@@ -299,85 +313,110 @@ export default { ...@@ -299,85 +313,110 @@ export default {
//监听当前地区值的变化，于与上方地区值进行了双向绑定 //监听当前地区值的变化，于与上方地区值进行了双向绑定
deep: true, //深度监听 deep: true, //深度监听
handler() { handler() {
//每当值省份值改变时其下地区值进行清空 console.log("目的国家id集合变更", this.destCityIds)
this.AddressCity = []; this.destWarehouseIds = [];
this.AddressTown = []; this.destCityIds = [];
this.destWarehouseIds = "";
this.destCityIds = "";
this.findByprovinceCode();
if (this.destCountryIds && this.destCountryIds.length > 0) { if (this.destCountryIds && this.destCountryIds.length > 0) {
//1 是所有区域，2 国家，3是市， this.destCityList = this.AddressCity.filter(item => this.destCountryIds.includes(item.guojia))
this.getAddressCity() this.destWarehouseList = this.AddressTown.filter(item => this.destCountryIds.includes(item.guojia))
this.getAddressTown()
} else if (
this.destCountryIds && this.destCountryIds.length > 0 &&
this.destCityIds && this.destCityIds.size() > 0
) {
this.getAddressTown()
} }
// else {
// if (this.destCityIds && this.destCityIds.length > 0) {
// let cityCountryIdList = this.destCityList.filter(item => this.destCityIds.includes(item.shi)).map((city) => {
// return city.guojia
// })
// this.destCountryList = this.countryList.filter(item => cityCountryIdList.includes(item.guojia))
// this.destWarehouseList = this.AddressTown.filter(item => this.destCityIds.includes(item.shi))
// }else {
// if (this.destWarehouseIds && this.destWarehouseIds.length > 0) {
// let warehouseCountryIdList = this.destWarehouseList.filter(item => this.destWarehouseIds.includes(item.warehouseId)).map((warehouse) => {
// return warehouse.guojia
// })
// this.destCountryList = this.countryList.filter(item => warehouseCountryIdList.includes(item.guojia))
// let warehouseCityIdList = this.destWarehouseList.filter(item => this.destWarehouseIds.includes(item.warehouseId)).map((warehouse) => {
// return warehouse.shi
// })
// this.destCityList = this.AddressCity.filter(item => warehouseCityIdList.includes(item.shi))
// }else {
// this.destCountryList = this.countryList;
// this.destCityList = this.AddressCity;
// this.destWarehouseList = this.AddressTown
// }
// }
// }
this.getOpenedRouterList() this.getOpenedRouterList()
}, },
}, },
destCityIds: { destCityIds: {
deep: true, //深度监听 目的仓 deep: true, //深度监听 目的仓
handler() { handler() {
this.AddressTown = []; console.log("目的城市id集合变更", this.destCityIds)
this.destWarehouseIds = ""; this.destWarehouseIds = [];
this.findBycityCode(); if (this.destCityIds && this.destCityIds.length > 0) {
if ( // let cityCountryIdList = this.destCityList.filter(item => this.destCityIds.includes(item.shi)).map((city) => {
this.destCountryIds && this.destCountryIds.length > 0 && // return city.guojia
this.destCityIds && this.destCityIds.length > 0 && // })
this.destWarehouseIds && this.destWarehouseIds.length > 0 // this.destCountryList = this.countryList.filter(item => cityCountryIdList.includes(item.guojia))
) { this.destWarehouseList = this.AddressTown.filter(item => this.destCityIds.includes(item.shi))
//获取当前城市值id，获取该城市下区域
} else if (
this.destCountryIds && this.destCountryIds.length > 0 &&
this.destCityIds && this.destCityIds.length > 0 &&
this.destWarehouseIds && this.destWarehouseIds.length > 0
) {
this.getAddressTown()
} else if (
this.destCountryIds && this.destCountryIds.length > 0 &&
this.destCityIds && this.destCityIds.length > 0
) {
this.findByprovinceCode()
this.getAddressTown()
} else if (
this.destCountryIds && this.destCountryIds.length > 0 &&
this.destCityIds && this.destCityIds.length > 0 &&
this.destWarehouseIds && this.destWarehouseIds.length > 0
) {
//获取当前城市值id，获取该城市下区域
} }
// else {
// if (this.destCountryIds && this.destCountryIds.length > 0) {
// this.destCityList = this.AddressCity.filter(item => this.destCountryIds.includes(item.guojia))
// this.destWarehouseList = this.AddressTown.filter(item => this.destCountryIds.includes(item.guojia))
// }else {
// if (this.destWarehouseIds && this.destWarehouseIds.length > 0) {
// let warehouseCountryIdList = this.destWarehouseList.filter(item => this.destWarehouseIds.includes(item.warehouseId)).map((warehouse) => {
// return warehouse.guojia
// })
// this.destCountryList = this.countryList.filter(item => warehouseCountryIdList.includes(item.guojia))
// let warehouseCityIdList = this.destWarehouseList.filter(item => this.destWarehouseIds.includes(item.warehouseId)).map((warehouse) => {
// return warehouse.shi
// })
// this.destCityList = this.AddressCity.filter(item => warehouseCityIdList.includes(item.shi))
// }else {
// this.destCountryList = this.countryList;
// this.destCityList = this.AddressCity;
// this.destWarehouseList = this.AddressTown
// }
// }
// }
this.getOpenedRouterList() this.getOpenedRouterList()
this.getChannelList()
}, },
}, },
destWarehouseIds: { destWarehouseIds: {
deep: true, //深度监听 deep: true, //深度监听
handler() { handler() {
if ( // console.log("目的仓库id集合变更", this.destWarehouseIds)
this.destCountryIds && this.destCountryIds.length > 0 && // if (this.destWarehouseIds && this.destWarehouseIds.length > 0) {
this.destCityIds && this.destCityIds.length > 0 && // let warehouseCountryIdList = this.destWarehouseList.filter(item => this.destWarehouseIds.includes(item.warehouseId)).map((warehouse) => {
this.destWarehouseIds && this.destWarehouseIds.length > 0 // return warehouse.guojia
) { // })
//获取当前城市值id，获取该城市下区域 // this.destCountryList = this.countryList.filter(item => warehouseCountryIdList.includes(item.guojia))
this.findBycityCode() // let warehouseCityIdList = this.destWarehouseList.filter(item => this.destWarehouseIds.includes(item.warehouseId)).map((warehouse) => {
} else if ( // return warehouse.shi
this.destCountryIds && this.destCountryIds.length > 0 && // })
this.destCityIds && this.destCityIds.length > 0 && // this.destCityList = this.AddressCity.filter(item => warehouseCityIdList.includes(item.shi))
this.destWarehouseIds && this.destWarehouseIds.length > 0 // }else {
) { // if (this.destCountryIds && this.destCountryIds.length > 0) {
this.getAddressTown() // this.destCityList = this.AddressCity.filter(item => this.destCountryIds.includes(item.guojia))
} else if ( // this.destWarehouseList = this.AddressTown.filter(item => this.destCountryIds.includes(item.guojia))
this.destCountryIds && this.destCountryIds.length > 0 && // }else {
this.destCityIds && this.destCityIds.length > 0 && // if (this.destWarehouseIds && this.destWarehouseIds.length > 0) {
this.destWarehouseIds && this.destWarehouseIds.length > 0 // let warehouseCountryIdList = this.destWarehouseList.filter(item => this.destWarehouseIds.includes(item.warehouseId)).map((warehouse) => {
) { // return warehouse.guojia
this.findBycityCode() // })
} // this.destCountryList = this.countryList.filter(item => warehouseCountryIdList.includes(item.guojia))
// let warehouseCityIdList = this.destWarehouseList.filter(item => this.destWarehouseIds.includes(item.warehouseId)).map((warehouse) => {
// return warehouse.shi
// })
// this.destCityList = this.AddressCity.filter(item => warehouseCityIdList.includes(item.shi))
// }else {
// this.destCountryList = this.countryList;
// this.destCityList = this.AddressCity;
// this.destWarehouseList = this.AddressTown
// }
// }
// }
this.getOpenedRouterList() this.getOpenedRouterList()
}, },
}, },
...@@ -390,9 +429,10 @@ export default { ...@@ -390,9 +429,10 @@ export default {
this.changeOption() this.changeOption()
} }
await this.$nextTick() await this.$nextTick()
this.getCountryList() this.getGuojiaAndShiAndWarehouseList()
this.getAddressCity() // this.getCountryList()
this.getAddressTown() // this.getAddressCity()
// this.getAddressTown()
this.getChannelList() this.getChannelList()
if (this.value && this.value.length) { if (this.value && this.value.length) {
this.selectedRoutes = this.value this.selectedRoutes = this.value
...@@ -417,6 +457,20 @@ export default { ...@@ -417,6 +457,20 @@ export default {
this.channelList = res.data this.channelList = res.data
}) })
}, },
getGuojiaAndShiAndWarehouseList() {
getGuojiaAndShiAndWarehouseList({tradeType: 1}).then(res => {
let guojiaAndShiAndWarehouse = res.data
console.log("全部的国家、城市、仓库关联数据", guojiaAndShiAndWarehouse)
// 常量选项
this.countryList = guojiaAndShiAndWarehouse.guojiaList;
this.AddressCity = guojiaAndShiAndWarehouse.shiList;
this.AddressTown = guojiaAndShiAndWarehouse.warehouseList;
// 临时筛选项
this.destCountryList = guojiaAndShiAndWarehouse.guojiaList;
this.destCityList = guojiaAndShiAndWarehouse.shiList;
this.destWarehouseList = guojiaAndShiAndWarehouse.warehouseList;
})
},
getAttrList() { getAttrList() {
getProductAttrList().then(res => { getProductAttrList().then(res => {
this.attrList = res.data this.attrList = res.data
...@@ -447,7 +501,7 @@ export default { ...@@ -447,7 +501,7 @@ export default {
params.startCityId = this.exportCity params.startCityId = this.exportCity
} }
if (this.destCountryIds) { if (this.destCountryIds) {
params.destCountryIds = this.destCountryId params.destCountryIds = this.destCountryIds
} }
if (this.destCityIds) { if (this.destCityIds) {
params.destCityIds = this.destCityIds params.destCityIds = this.destCityIds
...@@ -513,21 +567,21 @@ export default { ...@@ -513,21 +567,21 @@ export default {
return (this.type == 'sea' ? ['1', '2'] : ['3', '4']).indexOf(item.value) > -1 return (this.type == 'sea' ? ['1', '2'] : ['3', '4']).indexOf(item.value) > -1
}, },
/* 国家 */ /* 国家 */
getCountryList() { // getCountryList() {
getListTree({treeType: 1}).then((response) => { // getListTree({treeType: 1}).then((response) => {
this.countryList = response.data; // this.countryList = response.data;
}) // })
}, // },
getAddressCity() { // getAddressCity() {
getRegionList(4, 4).then(({data}) => { // getRegionList(4, 4).then(({data}) => {
this.AddressCity = data; // this.AddressCity = data;
}) // })
}, // },
getAddressTown() { // getAddressTown() {
getRegionList(5, 5).then(({data}) => { // getRegionList(5, 5).then(({data}) => {
this.AddressTown = data; // this.AddressTown = data;
}) // })
}, // },
findByprovinceCode() { findByprovinceCode() {
if (this.destCountryIds != null && this.destCountryIds.length > 0) { if (this.destCountryIds != null && this.destCountryIds.length > 0) {
//获取当前省份值id，获取该省份下城市 destCountryId provinceCode //获取当前省份值id，获取该省份下城市 destCountryId provinceCode
......
src/views/ecw/box/indexAir.vue
View file @ f3db5918
...@@ -5,36 +5,36 @@ ...@@ -5,36 +5,36 @@
<el-form-item :label="$t('自编号')" prop="selfNo"> <el-form-item :label="$t('自编号')" prop="selfNo">
<el-input v-model="queryParams.selfNo" :placeholder="$t('请输入自编号')" clearable @keyup.enter.native="handleQuery" /> <el-input v-model="queryParams.selfNo" :placeholder="$t('请输入自编号')" clearable @keyup.enter.native="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item :label="$t('出货渠道')" prop="shippingChannelId"> <el-form-item :label="$t('出货渠道')" prop="shippingChannelIdList">
<el-select v-model="queryParams.shippingChannelId" :placeholder="$t('请选择出货渠道')"> <el-select v-model="queryParams.shippingChannelIdList" multiple :placeholder="$t('请选择出货渠道')" clearable>
<el-option v-for="item in channelList" :label="$l(item, 'name')" :value="item.channelId" :key="item.channelId"></el-option> <el-option v-for="item in channelList" :label="$l(item, 'name')" :value="item.channelId" :key="item.channelId"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item :label="$t('始发仓')" prop="startWarehouseIdList"> <el-form-item :label="$t('始发仓')" prop="startWarehouseIdList">
<el-select v-model="queryParams.startWarehouseIdList" multiple :placeholder="$t('请选择始发仓')" clearable collapse-tags> <el-select v-model="queryParams.startWarehouseIdList" multiple :placeholder="$t('请选择始发仓')" clearable>
<el-option v-for="item in exportWarehouseList" :label="$l(item, 'title')" :value="item.id" :key="item.id"></el-option> <el-option v-for="item in exportWarehouseList" :label="$l(item, 'title')" :value="item.id" :key="item.id"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item :label="$t('目的国')" prop="countryIdList"> <el-form-item :label="$t('目的国')" prop="countryIdList">
<el-select v-model="countryIdList" multiple :label="countryIdList" :placeholder="$t('请选择目的国')" clearable collapse-tags> <el-select v-model="countryIdList" multiple :label="countryIdList" :placeholder="$t('请选择目的国')" clearable>
<el-option v-for="item in AddressProvince" :key="item.guojia" :label="item.guojiaName" :value="item.guojia"></el-option> <el-option v-for="item in AddressProvince" :key="item.guojia" :label="item.guojiaName" :value="item.guojia"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item :label="$t('目的城市')" prop="destCityIdList"> <el-form-item :label="$t('目的城市')" prop="destCityIdList">
<el-select v-model="destCityIdList" multiple :placeholder="$t('请选择目的城市')" style="width: 200px" clearable collapse-tags> <el-select v-model="destCityIdList" multiple :placeholder="$t('请选择目的城市')" style="width: 200px" clearable>
<el-option v-for="item in AddressCity" :key="item.shi" :label="item.shiName" :value="item.shi"></el-option> <el-option v-for="item in AddressCity" :key="item.shi" :label="item.shiName" :value="item.shi"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item :label="$t('目的仓')" prop="destWarehouseIdList"> <el-form-item :label="$t('目的仓')" prop="destWarehouseIdList">
<el-select v-model="destWarehouseIdList" multiple :placeholder="$t('请选择目的仓')" style="width: 200px" clearable collapse-tags> <el-select v-model="destWarehouseIdList" multiple :placeholder="$t('请选择目的仓')" style="width: 200px" clearable>
<el-option v-for="item in AddressTown" :key="item.id" :label="item.titleZh" :value="item.id"></el-option> <el-option v-for="item in AddressTown" :key="item.id" :label="item.titleZh" :value="item.id"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item :label="$t('状态')" prop="shipmentStatusAirList"> <el-form-item :label="$t('状态')" prop="shipmentStatusAirList">
<el-select v-model="queryParams.shipmentStatusAirList" :placeholder="$t('请选择状态')" clearable size="small" multiple collapse-tags> <el-select v-model="queryParams.shipmentStatusAirList" :placeholder="$t('请选择状态')" clearable size="small" multiple>
<el-option v-for="dict in this.getDictDatas(DICT_TYPE.BOX_AIR_SHIPMENT_STATE)" :key="dict.value" :label="$l(dict, 'label')" :value="dict.value" /> <el-option v-for="dict in this.getDictDatas(DICT_TYPE.BOX_AIR_SHIPMENT_STATE)" :key="dict.value" :label="$l(dict, 'label')" :value="dict.value" />
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -54,10 +54,10 @@ ...@@ -54,10 +54,10 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item :label="$t('起运港')" v-show="showSearch"> <el-form-item :label="$t('起运港')" v-show="showSearch">
<dockSelect v-model="queryParams.bigPortIdList" :placeholder="$t('请选择起运港')" portType="2" :allDocks="allDocks" clearable multiple collapse-tags /> <dockSelect v-model="queryParams.bigPortIdList" :placeholder="$t('请选择起运港')" portType="2" :allDocks="allDocks" clearable multiple />
</el-form-item> </el-form-item>
<el-form-item :label="$t('目的港')" v-show="showSearch"> <el-form-item :label="$t('目的港')" v-show="showSearch">
<dockSelect v-model="queryParams.destPortIdList" :placeholder="$t('请选择目的港')" portType="2" :allDocks="allDocks" clearable multiple collapse-tags /> <dockSelect v-model="queryParams.destPortIdList" :placeholder="$t('请选择目的港')" portType="2" :allDocks="allDocks" clearable multiple />
</el-form-item> </el-form-item>
<el-form-item :label="$t('目的港清关')" prop="destinationClearance" v-show="showSearch"> <el-form-item :label="$t('目的港清关')" prop="destinationClearance" v-show="showSearch">
<el-select v-model="queryParams.destinationClearance" :placeholder="$t('请选择目的港清关')" clearable size="small"> <el-select v-model="queryParams.destinationClearance" :placeholder="$t('请选择目的港清关')" clearable size="small">
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item :label="$t('发货方式')" prop="deliveryType" v-show="showSearch"> <el-form-item :label="$t('发货方式')" prop="deliveryType" v-show="showSearch">
<el-select v-model="queryParams.deliveryType" :placeholder="$t('请选择发货方式')" clearable size="small" multiple collapse-tags> <el-select v-model="queryParams.deliveryType" :placeholder="$t('请选择发货方式')" clearable size="small" multiple>
<el-option v-for="item in deliveryTypeData" :key="item.value" :label="item.label" :value="item.value"> <el-option v-for="item in deliveryTypeData" :key="item.value" :label="item.label" :value="item.value">
</el-option> </el-option>
</el-select> </el-select>
...@@ -83,21 +83,21 @@ ...@@ -83,21 +83,21 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item :label="$t('订舱代理')" v-show="showSearch"> <el-form-item :label="$t('订舱代理')" v-show="showSearch">
<supplierSelect v-model="queryParams.shipperId" :companyType="'5'" :placeholder="$t('请选择订舱代理')" :allSupplier="allSupplier" clearable multiple collapse-tags /> <supplierSelect v-model="queryParams.shipperId" :companyType="'5'" :placeholder="$t('请选择订舱代理')" :allSupplier="allSupplier" clearable multiple />
</el-form-item> </el-form-item>
<el-form-item :label="$t('航空公司')" v-show="showSearch"> <el-form-item :label="$t('航空公司')" v-show="showSearch">
<supplierSelect v-model="queryParams.airlineCompanyIdList" :placeholder="$t('请选择航空公司')" company-type="10" :allSupplier="allSupplier" clearable multiple collapse-tags /> <supplierSelect v-model="queryParams.airlineCompanyIdList" :placeholder="$t('请选择航空公司')" company-type="10" :allSupplier="allSupplier" clearable multiple />
</el-form-item> </el-form-item>
<el-form-item :label="$t('代理公司Agent')" v-show="showSearch"> <el-form-item :label="$t('代理公司Agent')" v-show="showSearch">
<supplierSelect v-model="queryParams.agentIdList" :placeholder="$t('请选择代理公司')" company-type="1" :allSupplier="allSupplier" clearable multiple collapse-tags /> <supplierSelect v-model="queryParams.agentIdList" :placeholder="$t('请选择代理公司')" company-type="1" :allSupplier="allSupplier" clearable multiple />
</el-form-item> </el-form-item>
<el-form-item :label="$t('报关方式')" prop="dcCustomsType" v-show="showSearch"> <el-form-item :label="$t('报关方式')" prop="dcCustomsType" v-show="showSearch">
<el-select v-model="queryParams.dcCustomsType" :placeholder="$t('请选择报关方式')" clearable multiple collapse-tags> <el-select v-model="queryParams.dcCustomsType" :placeholder="$t('请选择报关方式')" clearable multiple>
<el-option v-for="type in this.getDictDatas(DICT_TYPE.BOX_SHIPPING_CUSTOMS_TYPE)" :key="type.value" :label="$l(type, 'label')" :value="type.value"></el-option> <el-option v-for="type in this.getDictDatas(DICT_TYPE.BOX_SHIPPING_CUSTOMS_TYPE)" :key="type.value" :label="$l(type, 'label')" :value="type.value"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item :label="$t('报关公司')" v-show="showSearch"> <el-form-item :label="$t('报关公司')" v-show="showSearch">
<supplierSelect v-model="queryParams.dcCompanyId" :companyType="'2'" :placeholder="$t('请选择报关公司')" :allSupplier="allSupplier" clearable multiple collapse-tags /> <supplierSelect v-model="queryParams.dcCompanyId" :companyType="'2'" :placeholder="$t('请选择报关公司')" :allSupplier="allSupplier" clearable multiple />
</el-form-item> </el-form-item>
<el-row> <el-row>
<el-form-item :label="$t('预计起飞时间')" prop="flyTime" v-show="showSearch"> <el-form-item :label="$t('预计起飞时间')" prop="flyTime" v-show="showSearch">
......
src/views/ecw/box/indexSea.vue
View file @ f3db5918
...@@ -56,42 +56,42 @@ ...@@ -56,42 +56,42 @@
</el-form-item> </el-form-item>
<el-form-item :label="$t('始发仓')" prop="startWarehouseIdList"> <el-form-item :label="$t('始发仓')" prop="startWarehouseIdList">
<el-select v-model="queryParams.startWarehouseIdList" multiple :placeholder="$t('请选择始发仓')" clearable collapse-tags> <el-select v-model="queryParams.startWarehouseIdList" multiple :placeholder="$t('请选择始发仓')" clearable>
<el-option v-for="item in exportWarehouseList" :label="$l(item, 'title')" :value="item.id" :key="item.id"></el-option> <el-option v-for="item in exportWarehouseList" :label="$l(item, 'title')" :value="item.id" :key="item.id"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item :label="$t('目的国')" prop="countryIdList"> <el-form-item :label="$t('目的国')" prop="countryIdList">
<el-select v-model="countryIdList" multiple :label="countryIdList" :placeholder="$t('请选择目的国')" clearable collapse-tags> <el-select v-model="countryIdList" multiple :label="countryIdList" :placeholder="$t('请选择目的国')" clearable>
<el-option v-for="item in AddressProvince" :key="item.guojia" :label="item.guojiaName" :value="item.guojia"></el-option> <el-option v-for="item in AddressProvince" :key="item.guojia" :label="item.guojiaName" :value="item.guojia"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item :label="$t('目的城市')" prop="destCityIdList"> <el-form-item :label="$t('目的城市')" prop="destCityIdList">
<el-select v-model="destCityIdList" multiple :placeholder="$t('请选择目的城市')" style="width: 200px" clearable collapse-tags> <el-select v-model="destCityIdList" multiple :placeholder="$t('请选择目的城市')" style="width: 200px" clearable>
<el-option v-for="item in AddressCity" :key="item.shi" :label="item.shiName" :value="item.shi"></el-option> <el-option v-for="item in AddressCity" :key="item.shi" :label="item.shiName" :value="item.shi"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item :label="$t('目的仓')" prop="destWarehouseIdList"> <el-form-item :label="$t('目的仓')" prop="destWarehouseIdList">
<el-select v-model="destWarehouseIdList" multiple :placeholder="$t('请选择目的仓')" style="width: 200px" clearable collapse-tags> <el-select v-model="destWarehouseIdList" multiple :placeholder="$t('请选择目的仓')" style="width: 200px" clearable>
<el-option v-for="item in AddressTown" :key="item.id" :label="item.titleZh" :value="item.id"></el-option> <el-option v-for="item in AddressTown" :key="item.id" :label="item.titleZh" :value="item.id"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item :label="$t('国家')" prop="countryId"> <!-- <el-form-item :label="$t('国家')" prop="countryId">-->
<el-select <!-- <el-select-->
v-model="queryParams.countryId" <!-- v-model="queryParams.countryId"-->
:placeholder="$t('请选择国家')" <!-- :placeholder="$t('请选择国家')"-->
clearable <!-- clearable-->
size="small" <!-- size="small"-->
> <!-- >-->
<el-option <!-- <el-option-->
v-for="item in countryList" <!-- v-for="item in countryList"-->
:key="item.id" <!-- :key="item.id"-->
:label="$l(item, 'title')" <!-- :label="$l(item, 'title')"-->
:value="item.id" <!-- :value="item.id"-->
> <!-- >-->
</el-option> <!-- </el-option>-->
</el-select> <!-- </el-select>-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item :label="$t('提单制作')" prop="ladingBillStatus"> <el-form-item :label="$t('提单制作')" prop="ladingBillStatus">
<el-select <el-select
v-model="queryParams.ladingBillStatus" v-model="queryParams.ladingBillStatus"
...@@ -127,7 +127,7 @@ ...@@ -127,7 +127,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item :label="$t('出单方式')" v-show="showSearch"> <el-form-item :label="$t('出单方式')" v-show="showSearch">
<el-select v-model="queryParams.cdOutBillType" :placeholder="$t('请选择出单方式')" clearable multiple collapse-tags> <el-select v-model="queryParams.cdOutBillType" :placeholder="$t('请选择出单方式')" clearable multiple>
<el-option v-for="item in method" :key="item.value" :label="item.label" :value="item.value"></el-option> <el-option v-for="item in method" :key="item.value" :label="item.label" :value="item.value"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -163,24 +163,24 @@ ...@@ -163,24 +163,24 @@
</el-row> </el-row>
<el-form-item :label="$t('起运港')" v-show="showSearch"> <el-form-item :label="$t('起运港')" v-show="showSearch">
<dockSelect v-model="queryParams.bigPortIdList" :placeholder="$t('请选择起运港')" portType="2" :allDocks="allDocks" clearable multiple collapse-tags /> <dockSelect v-model="queryParams.bigPortIdList" :placeholder="$t('请选择起运港')" portType="2" :allDocks="allDocks" clearable multiple/>
</el-form-item> </el-form-item>
<el-form-item :label="$t('目的港')" v-show="showSearch"> <el-form-item :label="$t('目的港')" v-show="showSearch">
<dockSelect v-model="queryParams.destPortIdList" :placeholder="$t('请选择目的港')" portType="2" :allDocks="allDocks" clearable multiple collapse-tags /> <dockSelect v-model="queryParams.destPortIdList" :placeholder="$t('请选择目的港')" portType="2" :allDocks="allDocks" clearable multiple/>
</el-form-item> </el-form-item>
<el-form-item :label="$t('驳船港')" v-show="showSearch"> <el-form-item :label="$t('驳船港')" v-show="showSearch">
<dockSelect v-model="queryParams.bargePortIdList" :placeholder="$t('请选择驳船港')" portType="2" :allDocks="allDocks" clearable multiple collapse-tags /> <dockSelect v-model="queryParams.bargePortIdList" :placeholder="$t('请选择驳船港')" portType="2" :allDocks="allDocks" clearable multiple/>
</el-form-item> </el-form-item>
<el-form-item :label="$t('订舱公司')" v-show="showSearch"> <el-form-item :label="$t('订舱公司')" v-show="showSearch">
<supplierSelect v-model="queryParams.spaceCompanyIdList" :companyType="'1'" :placeholder="$t('请选择订舱公司')" :allSupplier="allSupplier" clearable multiple collapse-tags /> <supplierSelect v-model="queryParams.spaceCompanyIdList" :companyType="'1'" :placeholder="$t('请选择订舱公司')" :allSupplier="allSupplier" clearable multiple/>
</el-form-item> </el-form-item>
<el-form-item :label="$t('报关方式')" prop="dcCustomsType" v-show="showSearch"> <el-form-item :label="$t('报关方式')" prop="dcCustomsType" v-show="showSearch">
<el-select v-model="queryParams.dcCustomsType" :placeholder="$t('请选择报关方式')" clearable multiple collapse-tags> <el-select v-model="queryParams.dcCustomsType" :placeholder="$t('请选择报关方式')" clearable multiple>
<el-option v-for="type in this.getDictDatas(DICT_TYPE.BOX_SHIPPING_CUSTOMS_TYPE)" :key="type.value" :label="$l(type, 'label')" :value="type.value"></el-option> <el-option v-for="type in this.getDictDatas(DICT_TYPE.BOX_SHIPPING_CUSTOMS_TYPE)" :key="type.value" :label="$l(type, 'label')" :value="type.value"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item :label="$t('报关公司')" v-show="showSearch"> <el-form-item :label="$t('报关公司')" v-show="showSearch">
<supplierSelect v-model="queryParams.dcCompanyId" :companyType="'2'" :placeholder="$t('请选择报关公司')" :allSupplier="allSupplier" clearable multiple collapse-tags /> <supplierSelect v-model="queryParams.dcCompanyId" :companyType="'2'" :placeholder="$t('请选择报关公司')" :allSupplier="allSupplier" clearable multiple/>
</el-form-item> </el-form-item>
<el-form-item :label="$t('预计驳船时间')" v-show="showSearch"> <el-form-item :label="$t('预计驳船时间')" v-show="showSearch">
<el-date-picker type="datetimerange" :start-placeholder="$t('预计驳船开始日期')" :end-placeholder="$t('预计驳船结束日期')" value-format="yyyy-MM-dd HH:mm:ss" v-model="queryParams.bargeBeginTime"></el-date-picker> <el-date-picker type="datetimerange" :start-placeholder="$t('预计驳船开始日期')" :end-placeholder="$t('预计驳船结束日期')" value-format="yyyy-MM-dd HH:mm:ss" v-model="queryParams.bargeBeginTime"></el-date-picker>
......
src/views/ecw/order/cargoControl.vue
View file @ f3db5918
<template> <template>
<div class="app-container"> <div class="app-container">
<!-- 搜索工作栏 --> <!-- 搜索工作栏 -->
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="140px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="140px" class="search-z">
<el-form-item :label="$t('编号')" prop="orderNo"> <el-form-item :label="$t('编号')" prop="orderNo">
<el-input v-model.trim="noParam.value" :placeholder="$t('请输入订单号、唛头、提单号')" clearable @keyup.enter.native="handleQuery" @input="replaceSpace(noParam, 'value')"> <el-input class="w-200" v-model.trim="noParam.value" :placeholder="$t('请输入订单号、唛头、提单号')" clearable @keyup.enter.native="handleQuery" @input="replaceSpace(noParam, 'value')">
<template slot="prepend"> <template slot="prepend">
<dict-selector :type="DICT_TYPE.ORDER_QUERY_NO_FIELD" defaultable v-model="noParam.key" class="w-50" /> <dict-selector :type="DICT_TYPE.ORDER_QUERY_NO_FIELD" defaultable v-model="noParam.key"/>
</template> </template>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item :label="$t('发货人')" prop="consignorKey"> <el-form-item :label="$t('发货人')" prop="consignorKey">
<el-input v-model.trim="queryParams.consignorKey" :placeholder="$t('发货人')" clearable @keyup.enter.native="handleQuery"/> <el-input v-model.trim="queryParams.consignorKey" :placeholder="$t('发货人')" clearable @keyup.enter.native="handleQuery" class="w-200"/>
</el-form-item> </el-form-item>
<el-form-item :label="$t('收货人')" prop="consigneeKey"> <el-form-item :label="$t('收货人')" prop="consigneeKey">
<el-input v-model.trim="queryParams.consigneeKey" :placeholder="$t('收货人')" clearable @keyup.enter.native="handleQuery"/> <el-input v-model.trim="queryParams.consigneeKey" :placeholder="$t('收货人')" clearable @keyup.enter.native="handleQuery" class="w-200"/>
</el-form-item> </el-form-item>
<el-form-item :label="$t('控货状态')" prop="isCargoControl"> <el-form-item :label="$t('控货状态')" prop="isCargoControl">
<dict-selector v-model="queryParams.cargoControlStatusList" multiple :type="DICT_TYPE.CONTROL_GOODS_STATUS" clearable @change="handleQuery" /> <dict-selector v-model="queryParams.cargoControlStatusList" multiple :type="DICT_TYPE.CONTROL_GOODS_STATUS" clearable @change="handleQuery" class="w-200"/>
</el-form-item> </el-form-item>
<div> <div>
<el-form-item :label="$t('始发仓')" prop="startWarehouseIds"> <el-form-item :label="$t('始发仓')" prop="startWarehouseIds">
<el-select v-model="queryParams.startWarehouseIds" multiple :placeholder="$t('请选择始发仓')" clearable @change="handleQuery"> <el-select v-model="queryParams.startWarehouseIds" multiple :placeholder="$t('请选择始发仓')" clearable @change="handleQuery" class="w-200">
<el-option v-for="item in exportWarehouseList" :label="item.titleZh" :value="item.id" :key="item.id"></el-option> <el-option v-for="item in exportWarehouseList" :label="item.titleZh" :value="item.id" :key="item.id"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<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" class="w-200">
<el-option v-for="item in AddressProvince" :key="item.guojia" :label="item.guojiaName" :value="item.guojia"></el-option> <el-option v-for="item in AddressProvince" :key="item.guojia" :label="item.guojiaName" :value="item.guojia"></el-option>
</el-select> </el-select>
</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" multiple :placeholder="$t('请选择目的城市')" style="width: 200px" clearable @change="handleQuery"> <el-select v-model="objectiveId" multiple :placeholder="$t('请选择目的城市')" style="width: 200px" clearable @change="handleQuery" class="w-200">
<el-option v-for="item in AddressCity" :key="item.shi" :label="item.shiName" :value="item.shi"></el-option> <el-option v-for="item in AddressCity" :key="item.shi" :label="item.shiName" :value="item.shi"></el-option>
</el-select> </el-select>
</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" multiple :placeholder="$t('请选择目的仓')" style="width: 200px" clearable @change="handleQuery"> <el-select v-model="destWarehouseId" multiple :placeholder="$t('请选择目的仓')" style="width: 200px" clearable @change="handleQuery" class="w-200">
<el-option v-for="item in AddressTown" :key="item.id" :label="item.titleZh" :value="item.id"></el-option> <el-option v-for="item in AddressTown" :key="item.id" :label="item.titleZh" :value="item.id"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</div> </div>
<el-form-item :label="$t('客户经理')"> <el-form-item :label="$t('客户经理')">
<user-selector manage v-model="queryParams.salesmanIds" multiple clearable @change="handleQuery" :prepend="{ id: 0, nickname: $t('未分配客户经理') }" /> <user-selector manage v-model="queryParams.salesmanIds" multiple clearable @change="handleQuery" :prepend="{ id: 0, nickname: $t('未分配客户经理') }" class="w-200"/>
</el-form-item> </el-form-item>
<el-form-item :label="$t('运输方式')" prop="transportId" v-show="showSearch"> <el-form-item :label="$t('运输方式')" prop="transportId" v-show="showSearch">
<dict-selector :type="DICT_TYPE.ECW_TRANSPORT_TYPE" v-model.number="queryParams.transportId" clearable @change="handleQuery" /> <dict-selector :type="DICT_TYPE.ECW_TRANSPORT_TYPE" v-model.number="queryParams.transportId" clearable @change="handleQuery" class="w-200"/>
</el-form-item> </el-form-item>
<el-form-item :label="$t('出货渠道')" prop="channelIds"> <el-form-item :label="$t('出货渠道')" prop="channelIds">
<selector clearable :options="channelList" :label-field="$l('name')" value-field="channelId" v-model="queryParams.channelIds" multiple></selector> <selector clearable :options="channelList" :label-field="$l('name')" value-field="channelId" v-model="queryParams.channelIds" multiple class="w-200"></selector>
</el-form-item> </el-form-item>
<!--<el-form-item :label="$t('订单编号')" prop="orderNo"> <!--<el-form-item :label="$t('订单编号')" prop="orderNo">
<el-input v-model="queryParams.orderNo" :placeholder="$t('订单编号')" clearable @keyup.enter.native="handleQuery" onkeyup="this.value=this.value.replace(/\s+/g, '')" /> <el-input v-model="queryParams.orderNo" :placeholder="$t('订单编号')" clearable @keyup.enter.native="handleQuery" onkeyup="this.value=this.value.replace(/\s+/g, '')" />
</el-form-item>--> </el-form-item>-->
<el-form-item :label="$t('商品') + ':'" v-show="showSearch"> <el-form-item :label="$t('商品') + ':'" v-show="showSearch">
<el-input v-model.trim="prodParam.value" :placeholder="$t('请输入商品类型、品名或品牌')" clearable @keyup.enter.native="handleQuery"> <el-input v-model.trim="prodParam.value" :placeholder="$t('请输入商品类型、品名或品牌')" clearable @keyup.enter.native="handleQuery" class="w-200">
<template slot="prepend"> <template slot="prepend">
<dict-selector :type="DICT_TYPE.ORDER_QUERY_PROD_FIELD" defaultable v-model="prodParam.key" class="w-50" /> <dict-selector :type="DICT_TYPE.ORDER_QUERY_PROD_FIELD" defaultable v-model="prodParam.key"/>
</template> </template>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item :label="$t('订单状态')" prop="statusList" v-show="showSearch"> <el-form-item :label="$t('订单状态')" prop="statusList" v-show="showSearch">
<dict-selector :type="DICT_TYPE.ORDER_STATUS" multiple v-model="queryParams.statusList" @keyup.enter.native="handleQuery" clearable @change="handleQuery" /> <dict-selector :type="DICT_TYPE.ORDER_STATUS" multiple v-model="queryParams.statusList" @keyup.enter.native="handleQuery" clearable @change="handleQuery" class="w-200"/>
</el-form-item> </el-form-item>
<!--<el-form-item :label="$t('提单号')" prop="tidanNo"> <!--<el-form-item :label="$t('提单号')" prop="tidanNo">
<el-input v-model.trim="queryParams.tidanNo" :placeholder="$t('提单号')" clearable @keyup.enter.native="handleQuery" /> <el-input v-model.trim="queryParams.tidanNo" :placeholder="$t('提单号')" clearable @keyup.enter.native="handleQuery" />
...@@ -69,73 +69,71 @@ ...@@ -69,73 +69,71 @@
<el-form-item :label="$t('报关方式')" prop="customsTypes"> <el-form-item :label="$t('报关方式')" prop="customsTypes">
<dict-selector :type="DICT_TYPE.ECW_CUSTOMS_TYPE" multiple v-model="queryParams.customsTypes" clearable @change="handleQuery" /> <dict-selector :type="DICT_TYPE.ECW_CUSTOMS_TYPE" multiple v-model="queryParams.customsTypes" clearable @change="handleQuery" class="w-200"/>
</el-form-item> </el-form-item>
<!--<el-form-item :label="$t('唛头')" prop="marks"> <!--<el-form-item :label="$t('唛头')" prop="marks">
<el-input v-model="queryParams.marks" :placeholder="$t('唛头')" clearable @keyup.enter.native="handleQuery" /> <el-input v-model="queryParams.marks" :placeholder="$t('唛头')" clearable @keyup.enter.native="handleQuery" />
</el-form-item>--> </el-form-item>-->
<el-form-item :label="$t('备案属性')" prop="productRecords" v-show="showSearch"> <el-form-item :label="$t('备案属性')" prop="productRecords" v-show="showSearch">
<dict-selector :type="DICT_TYPE.PRODUCT_RECORD_ATTRIBUTE" multiple v-model="queryParams.productRecords" clearable @change="handleQuery" /> <dict-selector :type="DICT_TYPE.PRODUCT_RECORD_ATTRIBUTE" multiple v-model="queryParams.productRecords" clearable @change="handleQuery" class="w-200"/>
</el-form-item> </el-form-item>
<el-form-item :label="$t('外部仓')" prop="isExternalWarehouse" v-show="showSearch"> <el-form-item :label="$t('外部仓')" prop="isExternalWarehouse" v-show="showSearch">
<el-select v-model="queryParams.isExternalWarehouse" :placeholder="$t('请选择')" clearable @change="handleQuery"> <el-select v-model="queryParams.isExternalWarehouse" :placeholder="$t('请选择')" clearable @change="handleQuery" class="w-200">
<el-option :label="$t('外部仓')" :value="1"></el-option> <el-option :label="$t('外部仓')" :value="1"></el-option>
<el-option :label="$t('自有仓')" :value="0"></el-option> <el-option :label="$t('自有仓')" :value="0"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item :label="$t('增值服务')" prop="types" v-show="showSearch"> <el-form-item :label="$t('增值服务')" prop="types" v-show="showSearch">
<el-select v-model="queryParams.types" :placeholder="$t('请选择')" clearable multiple @change="handleQuery"> <el-select v-model="queryParams.types" :placeholder="$t('请选择')" clearable multiple @change="handleQuery" class="w-200">
<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>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item :label="$t('商品类型')" prop="goodsTypes" v-show="showSearch"> <el-form-item :label="$t('商品类型')" prop="goodsTypes" v-show="showSearch">
<selector v-model="queryParams.goodsTypes" multiple :options="productAttrList" label-field="attrName" value-field="id"> </selector> <selector v-model="queryParams.goodsTypes" multiple :options="productAttrList" label-field="attrName" value-field="id" class="w-200"> </selector>
</el-form-item> </el-form-item>
<!--<el-form-item :label="$t('订单放货锁定收货人到期时间')" prop="lockConsigneeTime"> <!--<el-form-item :label="$t('订单放货锁定收货人到期时间')" prop="lockConsigneeTime">
</el-form-item>--> </el-form-item>-->
<el-form-item :label="$t('提货状态')" v-show="showSearch"> <el-form-item :label="$t('提货状态')" v-show="showSearch">
<dict-selector :type="DICT_TYPE.PICK_STATE" multiple v-model="queryParams.pickStateList" clearable @change="handleQuery" /> <dict-selector :type="DICT_TYPE.PICK_STATE" multiple v-model="queryParams.pickStateList" clearable @change="handleQuery" class="w-200"/>
</el-form-item> </el-form-item>
<el-form-item :label="$t('放货率')" v-show="showSearch"> <el-form-item :label="$t('放货率')" v-show="showSearch">
<el-input type="number" v-model.trim="releaseRatio.value" :placeholder="$t('请输入数字')" clearable @keyup.enter.native="handleQuery"> <el-input type="number" v-model.trim="releaseRatio.value" :placeholder="$t('请输入数字')" clearable @keyup.enter.native="handleQuery" class="w-200">
<template slot="prepend"> <template slot="prepend">
<dict-selector :type="DICT_TYPE.RELEASE_RATIO_FIELD" defaultable v-model="releaseRatio.key" class="w-50" /> <dict-selector :type="DICT_TYPE.RELEASE_RATIO_FIELD" defaultable v-model="releaseRatio.key"/>
</template> </template>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item :label="$t('提货率')" v-show="showSearch"> <el-form-item :label="$t('提货率')" v-show="showSearch">
<el-input type="number" v-model.trim="pickRatio.value" :placeholder="$t('请输入数字')" clearable @keyup.enter.native="handleQuery"> <el-input type="number" v-model.trim="pickRatio.value" :placeholder="$t('请输入数字')" clearable @keyup.enter.native="handleQuery" class="w-200">
<template slot="prepend"> <template slot="prepend">
<dict-selector :type="DICT_TYPE.PICK_RATIO_FIELD" defaultable v-model="pickRatio.key" class="w-50" /> <dict-selector :type="DICT_TYPE.PICK_RATIO_FIELD" defaultable v-model="pickRatio.key"/>
</template> </template>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item :label="$t('特需')" prop="packageTypeArr" v-show="showSearch"> <el-form-item :label="$t('特需')" prop="packageTypeArr" v-show="showSearch">
<el-select v-model="queryParams.packageTypeArr" multiple :placeholder="$t('请选择')" clearable> <el-select v-model="queryParams.packageTypeArr" multiple :placeholder="$t('请选择')" clearable class="w-200">
<template v-for="item in getDictDatas(DICT_TYPE.ORDER_SPECIAL_NEEDS)"> <template v-for="item in getDictDatas(DICT_TYPE.ORDER_SPECIAL_NEEDS)">
<el-option :label="$l(item, 'label')" :value="item.value"></el-option> <el-option :label="$l(item, 'label')" :value="item.value"></el-option>
</template> </template>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item :label="$t('订单限制修改收货人')" prop="isLimitUpdateConsignee"> <el-form-item :label="$t('订单限制修改收货人')" prop="isLimitUpdateConsignee">
<el-select v-model="queryParams.isLimitUpdateConsignee" :placeholder="$t('请选择')" clearable @change="handleQuery"> <el-select v-model="queryParams.isLimitUpdateConsignee" :placeholder="$t('请选择')" clearable @change="handleQuery" class="w-200">
<el-option :label="$t('是')" :value="1"></el-option> <el-option :label="$t('是')" :value="1"></el-option>
<el-option :label="$t('否')" :value="0"></el-option> <el-option :label="$t('否')" :value="0"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<div class="flex pb-20">
<el-form-item :label="$t('日期筛选')"> <dict-selector :type="DICT_TYPE.ECW_BEGINTIME_TYPE_ENDTIME" :filter="(item) => item.value != 'PickTime'" v-model="dateFilterType" defaultable class="w-200 mr-5" />
<dict-selector defaultable :type="DICT_TYPE.ECW_BEGINTIME_TYPE_ENDTIME" v-model="dateFilterType" class="w-100 mr-10" /> <el-date-picker v-model="dateFilter" type="datetimerange" range-separator="-" :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')" value-format="yyyy-MM-dd HH:mm:ss" @change="handleQuery"> </el-date-picker>
<el-date-picker v-model="dateFilter" type="datetimerange" range-separator="-" :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')" value-format="yyyy-MM-dd HH:mm:ss" @change="handleQuery"></el-date-picker> <el-button type="primary" icon="el-icon-search" @click="handleQuery" :loading="loading" class="ml-10">{{ $t("搜索") }}</el-button>
</el-form-item> <el-button icon="el-icon-refresh" @click="resetQuery">{{ $t("重置") }}</el-button>
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">{{ $t("搜索") }}</el-button>
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading" v-hasPermi="['ecw:cargo:export:search']">{{ $t("导出") }}</el-button> <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading" v-hasPermi="['ecw:cargo:export:search']">{{ $t("导出") }}</el-button>
</el-form-item> </div>
</el-form> </el-form>
<!-- 操作工具栏 --> <!-- 操作工具栏 -->
...@@ -507,9 +505,23 @@ export default { ...@@ -507,9 +505,23 @@ export default {
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery() { resetQuery() {
this.resetForm("queryForm") this.resetForm("queryForm")
this.prodParam.value = "" this.queryParams = {
this.releaseRatio.value = "" page: 1,
rows: 10,
packageTypeArr: [],
channelId: null,
channelIds: null,
customsTypes: null,
productRecords: null,
goodsTypes: null
}
this.destCountryId = null
this.destWarehouseId = null
this.objectiveId = null
this.pickRatio.value = "" this.pickRatio.value = ""
this.noParam.value = ""
this.prodParam.value = ""
this.dateFilter = []
this.handleQuery() this.handleQuery()
}, },
......
src/views/ecw/order/components/DetailProd.vue
View file @ f3db5918
...@@ -270,12 +270,13 @@ export default { ...@@ -270,12 +270,13 @@ export default {
<template slot-scope="{row}"> <template slot-scope="{row}">
<!--<el-link type="primary" @click.native="showWarehouseLogs(row,1)">{{row.warehouseInInfoVO ? row.warehouseInInfoVO.cartonsNum : 0}}</el-link> <!--<el-link type="primary" @click.native="showWarehouseLogs(row,1)">{{row.warehouseInInfoVO ? row.warehouseInInfoVO.cartonsNum : 0}}</el-link>
<div v-if="row.warehouseInInfoVO && row.warehouseInInfoVO.isMultiSpecification">({{$t('多规格')}})</div>--> <div v-if="row.warehouseInInfoVO && row.warehouseInInfoVO.isMultiSpecification">({{$t('多规格')}})</div>-->
<div v-if="row.warehouseInInfoVO"> <el-link type="primary" @click.native="$emit('showWarehouseLogs', row,1)" v-if="row.warehouseInInfoVO">
{{row.warehouseInInfoVO.cartonsNum}}{{$t('箱')}} {{row.warehouseInInfoVO.cartonsNum}}{{$t('箱')}}
{{row.warehouseInInfoVO.weight}}Kg {{row.warehouseInInfoVO.weight}}Kg
{{row.warehouseInInfoVO.volume}}m³ {{row.warehouseInInfoVO.volume}}m³
{{row.warehouseInInfoVO.quantityAll}}{{$t('个')}} {{row.warehouseInInfoVO.quantityAll}}{{$t('个')}}
</div> </el-link>
<div v-if="row.warehouseInInfoVO && row.warehouseInInfoVO.isMultiSpecification">({{$t('多规格')}})</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="warehouseType" :label="$t('类型')" width="120px"/> <el-table-column prop="warehouseType" :label="$t('类型')" width="120px"/>
......
src/views/ecw/order/components/Release.vue
View file @ f3db5918
<template> <template>
<el-dialog :title="title" visible :before-close="closeDialog" :close-on-click-modal="false" width="1000px"> <el-dialog :title="title" visible :before-close="closeDialog" :close-on-click-modal="false" width="1000px">
<el-form v-if="agreement" ref="form" :model="formData" :rules="rules" size="small" label-width="100px"> <el-form v-if="agreement" ref="form" :model="formData" :rules="rules" size="small" label-width="140px">
<el-row> <el-row>
<el-col :span="6"> <el-col :span="8">
<el-form-item :label="$t('订单号')"> <el-form-item :label="$t('订单号')">
{{ detail.orderNo }} {{ detail.orderNo }}
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="8">
<el-form-item :label="$t('总箱数')">
{{ detail.sumNum }}
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('体积')"> <el-form-item :label="$t('体积')">
{{ detail.sumVolume }}m³ {{ detail.sumVolume }}m³
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="8">
<el-form-item :label="$t('重量')"> <el-form-item :label="$t('重量')">
{{ detail.sumWeight }}kg {{ detail.sumWeight }}kg
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="8">
<el-form-item :label="$t('总箱数')">
{{ detail.sumNum }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :label="$t('总控货箱数')"> <el-form-item :label="$t('总控货箱数')">
{{ detail.sumNum }} {{ detail.sumNum }}
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="8">
<el-form-item :label="$t('剩余放货箱数')"> <el-form-item :label="$t('剩余放货箱数')">
{{ detail.sumNum - detail.releaseNum }} {{ detail.sumNum - detail.releaseNum }}
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> <el-col :span="8">
<el-row> <el-form-item :label="$t('到仓日期/卸柜日期')">
<el-col :span="12"> {{ detail.unloadTime || '-'}}
<el-form-item :label="$t('到仓日期/卸柜日期')" label-width="200px">
{{ detail.unloadTime }}
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="8">
<el-form-item :label="$t('放货锁定收货人到期')" label-width="200px"> <el-form-item :label="$t('放货锁定收货人到期')">
{{ detail.lockConsigneeTime || '-' }} {{ detail.lockConsigneeTime || '-' }}
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8">
<el-form-item :label="$t('订单限制修改收货人')">
{{ detail.isLimitUpdateConsignee ? $t("是") : $t("否") }}
</el-form-item>
</el-col>
</el-row> </el-row>
<div class="title">{{ $t('请填写放货信息') }}</div> <div class="title flex">
<div>
{{ $t('请填写放货信息') }}
</div>
<!--
http://czxy.cpolar.top/task-view-818.html
新增备注信息，逻辑如下：
1. 当订单限制修改收货人=是&&订单已卸柜/到仓&&当前时间<=放货锁定收货人到期时间
备注：订单锁定收货人未到期，不允许修改控货收货人
2. 当订单限制修改收货人=是&&订单已卸柜/到仓&&当前时间>放货锁定收货人到期时间
备注：订单锁定收货人信息已到期，允许修改控货收货人
3. 当订单限制修改收货人=是&&订单未卸柜/到仓
备注：订单未卸柜/到仓，不允许修改控货收货人
4. 当订单限制修改收货人=否
备注： 订单允许修改控货收货人
-->
<div class="ml-20 red" v-if="detail.isLimitUpdateConsignee && detail.unloadTime && Date.now() <= (new Date(detail.lockConsigneeTime)).getTime()">
{{$t('备注：订单锁定收货人未到期，不允许修改控货收货人')}}
</div>
<div class="ml-20 red" v-if="detail.isLimitUpdateConsignee && detail.unloadTime && Date.now() > (new Date(detail.lockConsigneeTime)).getTime()">
{{$t('备注：订单锁定收货人信息已到期，允许修改控货收货人')}}
</div>
<div class="ml-20 red" v-if="detail.isLimitUpdateConsignee && !detail.unloadTime">
{{$t('备注：订单未卸柜/到仓，不允许修改控货收货人')}}
</div>
<div class="ml-20 red" v-if="!detail.isLimitUpdateConsignee">
{{$t('备注：订单允许修改控货收货人')}}
</div>
</div>
<div class="flex"> <div class="flex">
<el-form-item :label="$t('收货人')" prop="consigneeName"> <el-form-item :label="$t('收货人')" prop="consigneeName">
<el-input v-model="formData.consigneeName" :placeholder="$t('请输入收货人')" clearable <el-input v-model="formData.consigneeName" :placeholder="$t('请输入收货人')" clearable :disabled="disableUpdateCongsignee"
class="w-150"></el-input> class="w-150"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="$t('收货人电话')" prop="consigneePhone"> <el-form-item :label="$t('收货人电话')" prop="consigneePhone">
<!-- <el-input v-model="formData.field109" :placeholder="$t('区号')" clearable class="w-150"></el-input> --> <!-- <el-input v-model="formData.field109" :placeholder="$t('区号')" clearable class="w-150"></el-input> -->
<area-code-selector v-model="formData.consigneeCountryCode" class="w-150"/> <div class="flex">
<el-input v-model="formData.consigneePhone" :placeholder="$t('请输入收货人电话')" clearable <area-code-selector v-model="formData.consigneeCountryCode" class="w-80" :disabled="disableUpdateCongsignee"/>
class="w-150 ml-10"></el-input> <el-input v-model="formData.consigneePhone" :placeholder="$t('请输入收货人电话')" clearable :disabled="disableUpdateCongsignee"
class="w-120 flex-1 ml-5"></el-input>
</div>
</el-form-item> </el-form-item>
<el-form-item :label="$t('收货人邮箱')" prop="consigneeEmail"> <el-form-item :label="$t('收货人邮箱')" prop="consigneeEmail">
<el-input v-model="formData.consigneeEmail" :placeholder="$t('请输入收货人邮箱')" clearable <el-input v-model="formData.consigneeEmail" :placeholder="$t('请输入收货人邮箱')" clearable :disabled="disableUpdateCongsignee"
class="w-150"></el-input> class="w-150"></el-input>
</el-form-item> </el-form-item>
</div> </div>
...@@ -168,6 +202,14 @@ export default { ...@@ -168,6 +202,14 @@ export default {
t += '-' + this.detail.orderNo t += '-' + this.detail.orderNo
} }
return t return t
},
disableUpdateCongsignee(){
if(!this.detail?.isLimitUpdateConsignee) return false
// 锁定且过期了返回false，其他情况全部是true
if(this.detail.isLimitUpdateConsignee && this.detail.lockConsigneeTime && new Date(this.detail.lockConsigneeTime).getTime() < Date.now()){
return false
}
return true
} }
}, },
created() { created() {
...@@ -206,6 +248,12 @@ export default { ...@@ -206,6 +248,12 @@ export default {
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.w-80{
width: 80px;
}
.red{
color: red;
}
.title { .title {
font-size: 16px; font-size: 16px;
margin: 20px 0; margin: 20px 0;
......
src/views/ecw/order/detail.vue
View file @ f3db5918
...@@ -187,11 +187,27 @@ ...@@ -187,11 +187,27 @@
<el-card class="card"> <el-card class="card">
<el-tabs v-model="activeName"> <el-tabs v-model="activeName">
<el-tab-pane :label="$t('货物详情')" name="first"> <el-tab-pane :label="$t('货物详情')" name="first">
<detail-prod :list="order.orderItemVOList" :attr-list="attrList" :prod-type-list="prodTypeList" :currency-map="currencyMap" :unit-map="unitMap" :transport-id="order.transportId"></detail-prod> <detail-prod
:list="order.orderItemVOList"
:attr-list="attrList"
:prod-type-list="prodTypeList"
:currency-map="currencyMap"
:unit-map="unitMap"
:transport-id="order.transportId"
@showWarehouseLogs="showWarehouseLogs"
></detail-prod>
</el-tab-pane> </el-tab-pane>
<!--退参品名 退仓/已混箱品名 lanbm 2024-04-16 按客户的要求修改--> <!--退参品名 退仓/已混箱品名 lanbm 2024-04-16 按客户的要求修改-->
<el-tab-pane :label="$t('退仓/已混箱品名')" name="six"> <el-tab-pane :label="$t('退仓/已混箱品名')" name="six">
<detail-prod :list="orderItemDeletedData" :attr-list="attrList" :prod-type-list="prodTypeList" :currency-map="currencyMap" :unit-map="unitMap" :transport-id="order.transportId"></detail-prod> <detail-prod
:list="orderItemDeletedData"
:attr-list="attrList"
:prod-type-list="prodTypeList"
:currency-map="currencyMap"
:unit-map="unitMap"
:transport-id="order.transportId"
@showWarehouseLogs="showWarehouseLogs"
></detail-prod>
</el-tab-pane> </el-tab-pane>
<!--lanbm 2024-06-11 处理订单到仓时间取值问题--> <!--lanbm 2024-06-11 处理订单到仓时间取值问题-->
<el-tab-pane :label="$t('订单动态')" name="second"> <el-tab-pane :label="$t('订单动态')" name="second">
......
src/views/ecw/order/edit.vue
View file @ f3db5918
...@@ -275,7 +275,7 @@ ...@@ -275,7 +275,7 @@
{{ $t('件数') }} <span class="red">*</span> {{ $t('件数') }} <span class="red">*</span>
</template> </template>
<template slot-scope="{row}"> <template slot-scope="{row}">
<el-input-number :min="0" :controls="false" style="width: 65px" v-model.number="row.num" <el-input-number :min="1" :controls="false" style="width: 65px" v-model.number="row.num"
:disabled="!canAddProduct || !productEditable"/> :disabled="!canAddProduct || !productEditable"/>
</template> </template>
</el-table-column> </el-table-column>
...@@ -1359,11 +1359,11 @@ export default { ...@@ -1359,11 +1359,11 @@ export default {
// 默认不允许控货无收货人 // 默认不允许控货无收货人
this.noConsignee = false this.noConsignee = false
} }
// // 如果订单无收货人，但是最新的发货人允许无收货人则重置状态 // 最新的发货人档案不允许无收货人则重置状态
// if (this.noConsignee && !this.hasConsignee) { if (!this.noConsignee) {
// // 最新的发货人允许无收货人，则重置为有收货人 // 最新的发货人不允许无收货人，则重置为有收货人
// this.hasConsignee = true this.hasConsignee = true
// } }
}) })
}, },
async getOrder() { async getOrder() {
...@@ -1396,6 +1396,8 @@ export default { ...@@ -1396,6 +1396,8 @@ export default {
console.log("集运服务类型", this.form.type) console.log("集运服务类型", this.form.type)
this.form.type = this.form.type ? this.form.type.split(',').filter(item => item != '') : [] this.form.type = this.form.type ? this.form.type.split(',').filter(item => item != '') : []
this.form.packageTypeArr = this.form.packageType ? this.form.packageType.split(',').filter(item => item != '') : [] this.form.packageTypeArr = this.form.packageType ? this.form.packageType.split(',').filter(item => item != '') : []
// 是否有收货人
this.hasConsignee = !!res.data.consigneeVO
// 每次编辑订单详情需要实时获取发货人当前信息 // 每次编辑订单详情需要实时获取发货人当前信息
if (res.data.consignorVO) { if (res.data.consignorVO) {
this.$set(this.form, 'consignorCompany', res.data.consignorVO.company) this.$set(this.form, 'consignorCompany', res.data.consignorVO.company)
...@@ -1424,10 +1426,6 @@ export default { ...@@ -1424,10 +1426,6 @@ export default {
// res.data.hasConsignee 订单冗余的发货人是否允许无收货人 // res.data.hasConsignee 订单冗余的发货人是否允许无收货人
// res.data.noConsignee 当前订单发货人是否允许无收货 // res.data.noConsignee 当前订单发货人是否允许无收货
// 是否有收货人
// this.hasConsignee = !!res.data.consigneeVO
if (this.form.channelId == 0) { if (this.form.channelId == 0) {
delete this.form.channelId delete this.form.channelId
} }
...@@ -1626,7 +1624,7 @@ export default { ...@@ -1626,7 +1624,7 @@ export default {
worth: '', worth: '',
volume: '', volume: '',
weight: '', weight: '',
num: '' num: 1
}) })
}, },
// 更新路线并打印来源 // 更新路线并打印来源
......
src/views/ecw/order/exception/index.vue
View file @ f3db5918
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
size="small" size="small"
:inline="true" :inline="true"
label-width="100px" label-width="100px"
class="search-z"
> >
<el-form-item :label="$t('订单号') + ':'"> <el-form-item :label="$t('订单号') + ':'">
<el-input <el-input
...@@ -15,12 +16,12 @@ ...@@ -15,12 +16,12 @@
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
@input="replaceSpace(queryParams, 'orderNo')" @input="replaceSpace(queryParams, 'orderNo')"
class="w-200"
> >
<template slot="prepend"> <template slot="prepend">
<dict-selector <dict-selector
:type="DICT_TYPE.EXCEPTION_SELECT_FILED" :type="DICT_TYPE.EXCEPTION_SELECT_FILED"
v-model="queryParams.orderNoKey" v-model="queryParams.orderNoKey"
class="w-50"
/> />
</template> </template>
</el-input> </el-input>
...@@ -31,6 +32,7 @@ ...@@ -31,6 +32,7 @@
:placeholder="$t('发货人')" :placeholder="$t('发货人')"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
class="w-200"
/> />
</el-form-item> </el-form-item>
<el-form-item :label="$t('收货人')" prop="consigneeText"> <el-form-item :label="$t('收货人')" prop="consigneeText">
...@@ -39,6 +41,7 @@ ...@@ -39,6 +41,7 @@
:placeholder="$t('收货人')" :placeholder="$t('收货人')"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
class="w-200"
/> />
</el-form-item> </el-form-item>
<el-form-item :label="$t('运输方式') + ':'" v-show="showSearch"> <el-form-item :label="$t('运输方式') + ':'" v-show="showSearch">
...@@ -46,77 +49,80 @@ ...@@ -46,77 +49,80 @@
:type="DICT_TYPE.ECW_TRANSPORT_TYPE" :type="DICT_TYPE.ECW_TRANSPORT_TYPE"
:clearable="true" :clearable="true"
v-model="queryParams.transportId" v-model="queryParams.transportId"
class="w-200"
/> />
</el-form-item> </el-form-item>
<div> <el-form-item :label="$t('始发仓')">
<el-form-item :label="$t('始发仓')"> <el-select
<el-select v-model="queryParams.startWarehouseIds"
v-model="queryParams.startWarehouseIds" multiple
multiple :placeholder="$t('请选择始发仓')"
:placeholder="$t('请选择始发仓')" clearable
clearable class="w-200"
> >
<el-option <el-option
v-for="item in exportWarehouseList" v-for="item in exportWarehouseList"
:label="$l(item, 'title')" :label="$l(item, 'title')"
:value="item.id" :value="item.id"
:key="item.id" :key="item.id"
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item :label="$t('目的国')" prop="destCountryId"> <el-form-item :label="$t('目的国')" prop="destCountryId">
<el-select <el-select
v-model="destCountryId" v-model="destCountryId"
multiple multiple
:label="destCountryId" :label="destCountryId"
:placeholder="$t('请选择目的国')" :placeholder="$t('请选择目的国')"
clearable clearable
@change="handleQuery" @change="handleQuery"
> class="w-200"
<el-option >
v-for="item in AddressProvince" <el-option
:key="item.guojia" v-for="item in AddressProvince"
:label="item.guojiaName" :key="item.guojia"
:value="item.guojia" :label="item.guojiaName"
></el-option> :value="item.guojia"
</el-select> ></el-option>
</el-form-item> </el-select>
<el-form-item :label="$t('目的城市')" prop="objectiveId"> </el-form-item>
<el-select <el-form-item :label="$t('目的城市')" prop="objectiveId">
v-model="objectiveId" <el-select
multiple v-model="objectiveId"
:placeholder="$t('请选择目的城市')" multiple
style="width: 200px" :placeholder="$t('请选择目的城市')"
clearable style="width: 200px"
@change="handleQuery" clearable
> @change="handleQuery"
<el-option class="w-200"
v-for="item in AddressCity" >
:key="item.shi" <el-option
:label="item.shiName" v-for="item in AddressCity"
:value="item.shi" :key="item.shi"
></el-option> :label="item.shiName"
</el-select> :value="item.shi"
</el-form-item> ></el-option>
<el-form-item :label="$t('目的仓')" prop="destWarehouseId"> </el-select>
<el-select </el-form-item>
v-model="destWarehouseId" <el-form-item :label="$t('目的仓')" prop="destWarehouseId">
multiple <el-select
:placeholder="$t('请选择目的仓')" v-model="destWarehouseId"
style="width: 200px" multiple
clearable :placeholder="$t('请选择目的仓')"
@change="handleQuery" style="width: 200px"
> clearable
<el-option @change="handleQuery"
v-for="item in AddressTown" class="w-200"
:key="item.id" >
:label="item.titleZh" <el-option
:value="item.id" v-for="item in AddressTown"
></el-option> :key="item.id"
</el-select> :label="item.titleZh"
</el-form-item> :value="item.id"
</div> ></el-option>
</el-select>
</el-form-item>
<!--<el-form-item :label="$t('订单状态')" prop="status"> <!--<el-form-item :label="$t('订单状态')" prop="status">
<dict-selector <dict-selector
...@@ -132,6 +138,7 @@ ...@@ -132,6 +138,7 @@
multiple multiple
:placeholder="$t('请选择')" :placeholder="$t('请选择')"
clearable clearable
class="w-200"
> >
<el-option <el-option
v-for="dict in followUpList" v-for="dict in followUpList"
...@@ -150,6 +157,7 @@ ...@@ -150,6 +157,7 @@
:options="channelList" :options="channelList"
value-field="channelId" value-field="channelId"
:label-field="$l(null, 'name')" :label-field="$l(null, 'name')"
class="w-200"
></selector> ></selector>
</el-form-item> </el-form-item>
<el-form-item :label="$t('控货') + ':'" v-show="showSearch"> <el-form-item :label="$t('控货') + ':'" v-show="showSearch">
...@@ -158,6 +166,7 @@ ...@@ -158,6 +166,7 @@
:clearable="true" :clearable="true"
v-model="queryParams.isCargoControl" v-model="queryParams.isCargoControl"
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
class="w-200"
/> />
</el-form-item> </el-form-item>
<el-form-item :label="$t('异常状态') + ':'"> <el-form-item :label="$t('异常状态') + ':'">
...@@ -167,14 +176,18 @@ ...@@ -167,14 +176,18 @@
v-model="queryParams.orderExceptionStatusList" v-model="queryParams.orderExceptionStatusList"
multiple multiple
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
class="w-200"
/> />
</el-form-item> </el-form-item>
<el-form-item :label="$t('异常类型') + ':'"> <el-form-item :label="$t('异常类型') + ':'">
<dict-selector <dict-selector
:type="DICT_TYPE.ORDER_ERROR_TYPE" :type="DICT_TYPE.ORDER_ERROR_TYPE"
:clearable="true" :clearable="true"
multiple
v-model="queryParams.orderExceptionType" v-model="queryParams.orderExceptionType"
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
multiple
class="w-200"
/> />
</el-form-item> </el-form-item>
<!-- <el-form-item :label="$t('发货人')+':'"> <!-- <el-form-item :label="$t('发货人')+':'">
...@@ -191,6 +204,7 @@ ...@@ -191,6 +204,7 @@
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
@input="replaceSpace(queryParams, 'marks')" @input="replaceSpace(queryParams, 'marks')"
class="w-200"
> >
<template slot="prepend"> <template slot="prepend">
<dict-selector <dict-selector
...@@ -202,17 +216,17 @@ ...@@ -202,17 +216,17 @@
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item :label="$t('商品') + ':'"> <el-form-item :label="$t('商品') + ':'">
<div style="display: flex; width: 100%"> <div class="flex w-200">
<dict-selector <dict-selector
:type="DICT_TYPE.EXCEPTION_SELECT_FILED" :type="DICT_TYPE.EXCEPTION_SELECT_FILED"
style="width: 90px" style="width: 40px"
v-model="queryParams.goodsNameKey" v-model="queryParams.goodsNameKey"
/> />
<product-selector <product-selector
v-model.trim="queryParams.goodsName" v-model.trim="queryParams.goodsName"
style="flex: 1"
:clearable="true" :clearable="true"
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
class="flex-1"
/> />
</div> </div>
</el-form-item> </el-form-item>
...@@ -224,6 +238,7 @@ ...@@ -224,6 +238,7 @@
v-model="queryParams.productRecord" v-model="queryParams.productRecord"
multiple multiple
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
class="w-200"
/> />
</el-form-item> </el-form-item>
<el-form-item :label="$t('客户经理') + ':'"> <el-form-item :label="$t('客户经理') + ':'">
...@@ -232,6 +247,7 @@ ...@@ -232,6 +247,7 @@
multiple multiple
:placeholder="$t('请选择客户经理')" :placeholder="$t('请选择客户经理')"
clearable clearable
class="w-200"
> >
<el-option <el-option
v-for="item in creatorData" v-for="item in creatorData"
...@@ -247,6 +263,7 @@ ...@@ -247,6 +263,7 @@
:placeholder="$t('请选择')" :placeholder="$t('请选择')"
clearable clearable
@change="handleQuery" @change="handleQuery"
class="w-200"
> >
<el-option :label="$t('外部仓')" :value="1"></el-option> <el-option :label="$t('外部仓')" :value="1"></el-option>
<el-option :label="$t('自有仓')" :value="0"></el-option> <el-option :label="$t('自有仓')" :value="0"></el-option>
...@@ -258,6 +275,7 @@ ...@@ -258,6 +275,7 @@
multiple multiple
:placeholder="$t('请选择')" :placeholder="$t('请选择')"
clearable clearable
class="w-200"
> >
<template <template
v-for="item in getDictDatas(DICT_TYPE.ORDER_SPECIAL_NEEDS)" v-for="item in getDictDatas(DICT_TYPE.ORDER_SPECIAL_NEEDS)"
...@@ -270,7 +288,7 @@ ...@@ -270,7 +288,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item :label="$t('商品类型')" prop="goodsTypes" v-show="showSearch"> <el-form-item :label="$t('商品类型')" prop="goodsTypes" v-show="showSearch">
<selector v-model="queryParams.goodsTypes" multiple clearable :options="productAttrList" label-field="attrName" value-field="id"> <selector v-model="queryParams.goodsTypes" multiple clearable :options="productAttrList" label-field="attrName" value-field="id" class="w-200">
</selector> </selector>
</el-form-item> </el-form-item>
<el-form-item :label="$t('增值服务')" prop="types" v-show="showSearch"> <el-form-item :label="$t('增值服务')" prop="types" v-show="showSearch">
...@@ -280,59 +298,57 @@ ...@@ -280,59 +298,57 @@
:placeholder="$t('请选择')" :placeholder="$t('请选择')"
clearable clearable
@change="handleQuery" @change="handleQuery"
class="w-200"
> >
<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>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item> <div class="flex pb-20 items-center">
<el-select <el-select
v-model="queryParams.dateType" v-model="queryParams.dateType"
style="width: 150px" style="width: 150px"
clearable clearable
> >
<el-option :label="$t('入仓时间')" value="1" /> <el-option :label="$t('入仓时间')" value="1" />
<el-option :label="$t('处理时间')" value="2" /> <el-option :label="$t('处理时间')" value="2" />
</el-select> </el-select>
<el-date-picker <el-date-picker
clearable clearable
v-model="queryParams.beginCreateTime" v-model="queryParams.beginCreateTime"
value-format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss"
type="datetime" type="datetime"
:placeholder="$t('请选择开始日期')" :placeholder="$t('请选择开始日期')"
/> />
<span style="margin: 0 8px">{{ $t("到") }}</span> <span style="margin: 0 8px">{{ $t("到") }}</span>
<el-date-picker <el-date-picker
clearable clearable
v-model="queryParams.endCreateTime" v-model="queryParams.endCreateTime"
value-format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss"
type="datetime" type="datetime"
:placeholder="$t('请选择结束日期')" :placeholder="$t('请选择结束日期')"
/> />
</el-form-item> <div class="mr-10">
<el-form-item> <el-checkbox
<el-checkbox style="margin-left: 60px"
style="margin-left: 60px" v-model="queryParams.isHaveCustomer"
v-model="queryParams.isHaveCustomer" @change="handleQuery"
@change="handleQuery" >{{ $t("无归属订单") }}</el-checkbox>
>{{ $t("无归属订单") }}</el-checkbox> </div>
</el-form-item>
<el-button
type="primary"
<el-form-item> icon="el-icon-search"
<el-button @click="handleQuery"
type="primary" >{{ $t("搜索") }}</el-button
icon="el-icon-search" >
@click="handleQuery" <el-button icon="el-icon-refresh" @click="reset">{{
>{{ $t("搜索") }}</el-button $t("重置")
> }}</el-button>
<el-button icon="el-icon-refresh" @click="reset">{{ </div>
$t("重置")
}}</el-button>
</el-form-item>
</el-form> </el-form>
<!-- 操作工具栏 --> <!-- 操作工具栏 -->
......
src/views/ecw/order/index.vue
View file @ f3db5918
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="100px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="100px" class="search-z">
<el-form-item :label="$t('编号')" prop="orderNo"> <el-form-item :label="$t('编号')" prop="orderNo">
<el-input v-model.trim="noParam.value" :placeholder="$t('请输入订单号、唛头、提单号')" clearable @input="replaceSpace(noParam, 'value')" @keyup.enter.native="handleQuery"> <el-input
v-model.trim="noParam.value"
:placeholder="$t('请输入订单号、唛头、提单号')"
clearable
class="w-200"
@input="replaceSpace(noParam, 'value')"
@keyup.enter.native="handleQuery">
<template slot="prepend"> <template slot="prepend">
<dict-selector :type="DICT_TYPE.ORDER_QUERY_NO_FIELD" defaultable v-model="noParam.key" class="w-50" /> <dict-selector :type="DICT_TYPE.ORDER_QUERY_NO_FIELD" defaultable v-model="noParam.key" />
</template> </template>
</el-input> </el-input>
</el-form-item> </el-form-item>
...@@ -13,45 +19,42 @@ ...@@ -13,45 +19,42 @@
</el-form-item> --> </el-form-item> -->
<el-form-item :label="$t('发货人')" prop="consignorKey"> <el-form-item :label="$t('发货人')" prop="consignorKey">
<el-input v-model.trim="queryParams.consignorKey" :placeholder="$t('发货人')" clearable @keyup.enter.native="handleQuery"/> <el-input v-model.trim="queryParams.consignorKey" :placeholder="$t('发货人')" clearable @keyup.enter.native="handleQuery" class="w-200"/>
</el-form-item> </el-form-item>
<el-form-item :label="$t('收货人')" prop="consigneeKey"> <el-form-item :label="$t('收货人')" prop="consigneeKey">
<el-input v-model.trim="queryParams.consigneeKey" :placeholder="$t('收货人')" clearable @keyup.enter.native="handleQuery"/> <el-input v-model.trim="queryParams.consigneeKey" :placeholder="$t('收货人')" clearable @keyup.enter.native="handleQuery" class="w-200"/>
</el-form-item> </el-form-item>
<el-form-item :label="$t('控货')" prop="isCargoControl" v-show="showSearch"> <el-form-item :label="$t('控货')" prop="isCargoControl" v-show="showSearch">
<dict-selector v-model="queryParams.isCargoControl" :type="DICT_TYPE.INFRA_BOOLEAN_STRING" fomatter="bool" clearable @change="handleQuery" /> <dict-selector v-model="queryParams.isCargoControl" :type="DICT_TYPE.INFRA_BOOLEAN_STRING" fomatter="bool" clearable @change="handleQuery" class="w-200"/>
</el-form-item>
<el-form-item :label="$t('始发仓')" prop="startWarehouseIds">
<el-select v-model="queryParams.startWarehouseIds" multiple :placeholder="$t('请选择始发仓')" clearable @change="handleQuery" class="w-200">
<el-option v-for="item in exportWarehouseList" :label="$l(item, 'title')" :value="item.id" :key="item.id"></el-option>
</el-select>
</el-form-item> </el-form-item>
<div>
<el-form-item :label="$t('始发仓')" prop="startWarehouseIds">
<el-select v-model="queryParams.startWarehouseIds" multiple :placeholder="$t('请选择始发仓')" clearable @change="handleQuery">
<el-option v-for="item in exportWarehouseList" :label="$l(item, 'title')" :value="item.id" :key="item.id"></el-option>
</el-select>
</el-form-item>
<el-form-item :label="$t('目的国')" prop="destCountryId">
<el-select v-model="destCountryId" multiple :label="destCountryId" :placeholder="$t('请选择目的国')" clearable @change="handleQuery">
<el-option v-for="item in AddressProvince" :key="item.guojia" :label="item.guojiaName" :value="item.guojia"></el-option>
</el-select>
</el-form-item>
<el-form-item :label="$t('目的城市')" prop="objectiveId">
<el-select v-model="objectiveId" multiple :placeholder="$t('请选择目的城市')" style="width: 200px" clearable @change="handleQuery">
<el-option v-for="item in AddressCity" :key="item.shi" :label="item.shiName" :value="item.shi"></el-option>
</el-select>
</el-form-item>
<el-form-item :label="$t('目的仓')" prop="destWarehouseId">
<el-select v-model="destWarehouseId" multiple :placeholder="$t('请选择目的仓')" style="width: 200px" clearable @change="handleQuery">
<el-option v-for="item in AddressTown" :key="item.id" :label="item.titleZh" :value="item.id"></el-option>
</el-select>
</el-form-item>
</div>
<el-form-item :label="$t('目的国')" prop="destCountryId">
<el-select v-model="destCountryId" multiple :label="destCountryId" :placeholder="$t('请选择目的国')" clearable @change="handleQuery" class="w-200">
<el-option v-for="item in AddressProvince" :key="item.guojia" :label="item.guojiaName" :value="item.guojia"></el-option>
</el-select>
</el-form-item>
<el-form-item :label="$t('目的城市')" prop="objectiveId">
<el-select v-model="objectiveId" multiple :placeholder="$t('请选择目的城市')" style="width: 200px" clearable @change="handleQuery" class="w-200">
<el-option v-for="item in AddressCity" :key="item.shi" :label="item.shiName" :value="item.shi"></el-option>
</el-select>
</el-form-item>
<el-form-item :label="$t('目的仓')" prop="destWarehouseId">
<el-select v-model="destWarehouseId" multiple :placeholder="$t('请选择目的仓')" style="width: 200px" clearable @change="handleQuery" class="w-200">
<el-option v-for="item in AddressTown" :key="item.id" :label="item.titleZh" :value="item.id"></el-option>
</el-select>
</el-form-item>
<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" v-model.number="queryParams.transportId" clearable @change="handleQuery" class="w-200"/>
</el-form-item> </el-form-item>
<el-form-item :label="$t('商品类型')" prop="goodsTypes" v-show="showSearch"> <el-form-item :label="$t('商品类型')" prop="goodsTypes" v-show="showSearch">
<selector v-model="queryParams.goodsTypes" multiple :options="productAttrList" label-field="attrName" value-field="id"> </selector> <selector v-model="queryParams.goodsTypes" multiple :options="productAttrList" label-field="attrName" value-field="id" class="w-200"> </selector>
</el-form-item> </el-form-item>
<!-- <!--
<el-form-item :label="$t('品名')" prop="prodId"> <el-form-item :label="$t('品名')" prop="prodId">
...@@ -63,35 +66,35 @@ ...@@ -63,35 +66,35 @@
</el-form-item> --> </el-form-item> -->
<el-form-item :label="$t('商品')" prop="tidanNo" v-show="showSearch"> <el-form-item :label="$t('商品')" prop="tidanNo" v-show="showSearch">
<el-input v-model.trim="prodParam.value" :placeholder="$t('请输入商品类型、品名或品牌')" clearable @keyup.enter.native="handleQuery"> <el-input v-model.trim="prodParam.value" :placeholder="$t('请输入商品类型、品名或品牌')" clearable @keyup.enter.native="handleQuery" class="w-200">
<template slot="prepend"> <template slot="prepend">
<dict-selector :type="DICT_TYPE.ORDER_QUERY_PROD_FIELD" defaultable v-model="prodParam.key" class="w-50" /> <dict-selector :type="DICT_TYPE.ORDER_QUERY_PROD_FIELD" defaultable v-model="prodParam.key" />
</template> </template>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item :label="$t('入仓类型')" prop="warehouseType" v-show="showSearch"> <el-form-item :label="$t('入仓类型')" prop="warehouseType" v-show="showSearch">
<dict-selector :type="DICT_TYPE.ECW_WAREHOUSING_TYPE" v-model="queryParams.warehouseTypes" multiple clearable @change="handleQuery" /> <dict-selector :type="DICT_TYPE.ECW_WAREHOUSING_TYPE" v-model="queryParams.warehouseTypes" multiple clearable @change="handleQuery" class="w-200" />
</el-form-item> </el-form-item>
<el-form-item :label="$t('客户经理')"> <el-form-item :label="$t('客户经理')">
<user-selector manage v-model="queryParams.salesmanIds" multiple clearable @change="handleQuery" :prepend="{ id: 0, nickname: $t('未分配客户经理') }" /> <user-selector manage v-model="queryParams.salesmanIds" multiple clearable @change="handleQuery" :prepend="{ id: 0, nickname: $t('未分配客户经理') }" class="w-200" />
</el-form-item> </el-form-item>
<el-form-item :label="$t('动态')" prop="statusList"> <el-form-item :label="$t('动态')" prop="statusList">
<dict-selector :type="DICT_TYPE.ORDER_STATUS" multiple v-model="queryParams.statusList" @keyup.enter.native="handleQuery" :filter="statusDictFilter" clearable @change="handleQuery" /> <dict-selector :type="DICT_TYPE.ORDER_STATUS" multiple v-model="queryParams.statusList" @keyup.enter.native="handleQuery" :filter="statusDictFilter" clearable @change="handleQuery" class="w-200" />
</el-form-item> </el-form-item>
<el-form-item :label="$t('收货人')" v-show="showSearch"> <el-form-item :label="$t('收货人')" v-show="showSearch">
<el-select v-model="queryParams.hasConsignee" :placeholder="$t('请选择')" clearable @change="handleQuery"> <el-select v-model="queryParams.hasConsignee" :placeholder="$t('请选择')" clearable @change="handleQuery" class="w-200">
<el-option :label="$t('有')" :value="true"></el-option> <el-option :label="$t('有')" :value="true"></el-option>
<el-option :label="$t('无')" :value="false"></el-option> <el-option :label="$t('无')" :value="false"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item :label="$t('报关方式')" prop="customsTypes" v-show="showSearch"> <el-form-item :label="$t('报关方式')" prop="customsTypes" v-show="showSearch">
<dict-selector :type="DICT_TYPE.ECW_CUSTOMS_TYPE" multiple v-model="queryParams.customsTypes" clearable @change="handleQuery" /> <dict-selector :type="DICT_TYPE.ECW_CUSTOMS_TYPE" multiple v-model="queryParams.customsTypes" clearable @change="handleQuery" class="w-200" />
</el-form-item> </el-form-item>
<el-form-item :label="$t('是否齐货')" v-show="showSearch"> <el-form-item :label="$t('是否齐货')" v-show="showSearch">
<!--//字段存疑--> <!--//字段存疑-->
<dict-selector v-model="queryParams.isNeat" :type="DICT_TYPE.INFRA_BOOLEAN_STRING" fomatter="bool" clearable @change="handleQuery" /> <dict-selector v-model="queryParams.isNeat" :type="DICT_TYPE.INFRA_BOOLEAN_STRING" fomatter="bool" clearable @change="handleQuery" class="w-200" />
</el-form-item> </el-form-item>
<!-- <el-form-item :label="$t('重货比')" prop="weightRatio"> <!-- <el-form-item :label="$t('重货比')" prop="weightRatio">
<el-input style="width: 100px;" v-model="molecule" placeholder="" clearable @change="moleculeChange" <el-input style="width: 100px;" v-model="molecule" placeholder="" clearable @change="moleculeChange"
...@@ -101,26 +104,26 @@ ...@@ -101,26 +104,26 @@
@keyup.enter.native="handleQuery" /> @keyup.enter.native="handleQuery" />
</el-form-item> --> </el-form-item> -->
<el-form-item :label="$t('备案属性')" prop="productRecords" v-show="showSearch"> <el-form-item :label="$t('备案属性')" prop="productRecords" v-show="showSearch">
<dict-selector :type="DICT_TYPE.PRODUCT_RECORD_ATTRIBUTE" multiple v-model="queryParams.productRecords" clearable @change="handleQuery" /> <dict-selector :type="DICT_TYPE.PRODUCT_RECORD_ATTRIBUTE" multiple v-model="queryParams.productRecords" clearable @change="handleQuery" class="w-200" />
</el-form-item> </el-form-item>
<el-form-item :label="$t('快递单号')" prop="number" v-show="showSearch"> <el-form-item :label="$t('快递单号')" prop="number" v-show="showSearch">
<el-input v-model="queryParams.number" :placeholder="$t('快递单号')" clearable @keyup.enter.native="handleQuery" onkeyup="this.value=this.value.replace(/\s+/g, '')" /> <el-input v-model="queryParams.number" :placeholder="$t('快递单号')" clearable @keyup.enter.native="handleQuery" onkeyup="this.value=this.value.replace(/\s+/g, '')" class="w-200" />
</el-form-item> </el-form-item>
<el-form-item :label="$t('外部仓')" prop="isExternalWarehouse" v-show="showSearch"> <el-form-item :label="$t('外部仓')" prop="isExternalWarehouse" v-show="showSearch">
<el-select v-model="queryParams.isExternalWarehouse" :placeholder="$t('请选择')" clearable @change="handleQuery"> <el-select v-model="queryParams.isExternalWarehouse" :placeholder="$t('请选择')" clearable @change="handleQuery" class="w-200">
<el-option :label="$t('外部仓')" value="true"></el-option> <el-option :label="$t('外部仓')" value="true"></el-option>
<el-option :label="$t('自有仓')" value="false"></el-option> <el-option :label="$t('自有仓')" value="false"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item :label="$t('异常状态')" prop="abnormalStateList" v-show="showSearch"> <el-form-item :label="$t('异常状态')" prop="abnormalStateList" v-show="showSearch">
<dict-selector :type="DICT_TYPE.ORDER_ABNORMAL_STATE" multiple v-model="queryParams.abnormalStateList" @keyup.enter.native="handleQuery" clearable @change="handleQuery" /> <dict-selector :type="DICT_TYPE.ORDER_ABNORMAL_STATE" multiple v-model="queryParams.abnormalStateList" @keyup.enter.native="handleQuery" clearable @change="handleQuery" class="w-200" />
</el-form-item> </el-form-item>
<el-form-item :label="$t('审核状态')" prop="auditTypeList" v-show="showSearch"> <el-form-item :label="$t('审核状态')" prop="auditTypeList" v-show="showSearch">
<dict-selector :type="DICT_TYPE.ECW_ORDER_APPROVAL_TYPE" multiple v-model="queryParams.auditTypeList" @keyup.enter.native="handleQuery" clearable @change="handleQuery" /> <dict-selector :type="DICT_TYPE.ECW_ORDER_APPROVAL_TYPE" multiple v-model="queryParams.auditTypeList" @keyup.enter.native="handleQuery" clearable @change="handleQuery" class="w-200" />
</el-form-item> </el-form-item>
<el-form-item :label="$t('增值服务')" prop="types" v-show="showSearch"> <el-form-item :label="$t('增值服务')" prop="types" v-show="showSearch">
<el-select v-model="queryParams.types" multiple :placeholder="$t('请选择')" clearable @change="handleQuery"> <el-select v-model="queryParams.types" multiple :placeholder="$t('请选择')" clearable @change="handleQuery" class="w-200">
<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>
...@@ -128,34 +131,31 @@ ...@@ -128,34 +131,31 @@
</el-form-item> </el-form-item>
<!--空运多一个出货渠道筛选--> <!--空运多一个出货渠道筛选-->
<el-form-item :label="$t('出货渠道')" prop="channelIds" v-if="channelList.length"> <el-form-item :label="$t('出货渠道')" prop="channelIds" v-if="channelList.length">
<selector :clearable="true" :options="channelList" :label-field="$l('name')" value-field="channelId" v-model="queryParams.channelIds" multiple></selector> <selector :clearable="true" :options="channelList" :label-field="$l('name')" value-field="channelId" v-model="queryParams.channelIds" multiple class="w-200"></selector>
</el-form-item> </el-form-item>
<el-form-item :label="$t('特需')" prop="packageType" v-show="showSearch"> <el-form-item :label="$t('特需')" prop="packageType" v-show="showSearch">
<el-select v-model="queryParams.packageTypeArr" multiple :placeholder="$t('请选择')" clearable> <el-select v-model="queryParams.packageTypeArr" multiple :placeholder="$t('请选择')" clearable class="w-200">
<template v-for="item in getDictDatas(DICT_TYPE.ORDER_SPECIAL_NEEDS)"> <template v-for="item in getDictDatas(DICT_TYPE.ORDER_SPECIAL_NEEDS)">
<el-option :label="$l(item, 'label')" :value="item.value"></el-option> <el-option :label="$l(item, 'label')" :value="item.value"></el-option>
</template> </template>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item :label="$t('提货状态')" v-show="showSearch"> <el-form-item :label="$t('提货状态')" v-show="showSearch">
<dict-selector :type="DICT_TYPE.PICK_STATE" multiple v-model="queryParams.pickStateList" clearable @change="handleQuery" /> <dict-selector :type="DICT_TYPE.PICK_STATE" multiple v-model="queryParams.pickStateList" clearable @change="handleQuery" class="w-200" />
</el-form-item> </el-form-item>
<el-form-item :label="$t('提货率')" v-show="showSearch"> <el-form-item :label="$t('提货率')" v-show="showSearch">
<el-input type="number" v-model.trim="pickRatio.value" :placeholder="$t('请输入数字')" clearable @keyup.enter.native="handleQuery"> <el-input type="number" v-model.trim="pickRatio.value" :placeholder="$t('请输入数字')" clearable @keyup.enter.native="handleQuery" class="w-200">
<template slot="prepend"> <template slot="prepend">
<dict-selector :type="DICT_TYPE.PICK_RATIO_FIELD" defaultable v-model="pickRatio.key" class="w-50" /> <dict-selector :type="DICT_TYPE.PICK_RATIO_FIELD" defaultable v-model="pickRatio.key" />
</template> </template>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label=""> <div class="flex pb-20">
<dict-selector :type="DICT_TYPE.ECW_BEGINTIME_TYPE_ENDTIME" :filter="(item) => item.value != 'PickTime'" v-model="dateFilterType" defaultable style="width: 150px; margin-right: 5px" /> <dict-selector :type="DICT_TYPE.ECW_BEGINTIME_TYPE_ENDTIME" :filter="(item) => item.value != 'PickTime'" v-model="dateFilterType" defaultable class="w-200 mr-5" />
<el-date-picker v-model="dateFilter" type="datetimerange" range-separator="-" :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')" value-format="yyyy-MM-dd HH:mm:ss" @change="handleQuery"> </el-date-picker> <el-date-picker v-model="dateFilter" type="datetimerange" range-separator="-" :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')" value-format="yyyy-MM-dd HH:mm:ss" @change="handleQuery"> </el-date-picker>
</el-form-item> <el-button type="primary" icon="el-icon-search" @click="handleQuery" :loading="loading" class="ml-10">{{ $t("搜索") }}</el-button>
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="handleQuery" :loading="loading">{{ $t("搜索") }}</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">{{ $t("重置") }}</el-button> <el-button icon="el-icon-refresh" @click="resetQuery">{{ $t("重置") }}</el-button>
</el-form-item> </div>
</el-form> </el-form>
<!-- 操作工具栏 --> <!-- 操作工具栏 -->
......
src/views/ecw/order/penddingList.vue
View file @ f3db5918
...@@ -2,24 +2,24 @@ ...@@ -2,24 +2,24 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<!-- 搜索工作栏 --> <!-- 搜索工作栏 -->
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="100px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="100px" class="search-z">
<el-form-item :label="$t('编号')" prop="orderNo"> <el-form-item :label="$t('编号')" prop="orderNo">
<el-input v-model="queryParams.numberKey" :placeholder="$t('请输入订单号、唛头、提单号')" clearable @keyup.enter.native="handleQuery" @input="replaceSpace(queryParams, 'numberKey')" /> <el-input v-model="queryParams.numberKey" :placeholder="$t('请输入订单号、唛头、提单号')" clearable @keyup.enter.native="handleQuery" @input="replaceSpace(queryParams, 'numberKey')" class="w-200"/>
</el-form-item> </el-form-item>
<el-form-item :label="$t('发货人')" prop="consignorKey"> <el-form-item :label="$t('发货人')" prop="consignorKey">
<el-input v-model.trim="queryParams.consignorKey" :placeholder="$t('发货人')" clearable @keyup.enter.native="handleQuery" /> <el-input v-model.trim="queryParams.consignorKey" :placeholder="$t('发货人')" clearable @keyup.enter.native="handleQuery" class="w-200"/>
</el-form-item> </el-form-item>
<el-form-item :label="$t('收货人')" prop="consigneeKey"> <el-form-item :label="$t('收货人')" prop="consigneeKey">
<el-input v-model.trim="queryParams.consigneeKey" :placeholder="$t('收货人')" clearable @keyup.enter.native="handleQuery" /> <el-input v-model.trim="queryParams.consigneeKey" :placeholder="$t('收货人')" clearable @keyup.enter.native="handleQuery" class="w-200"/>
</el-form-item> </el-form-item>
<el-form-item :label="$t('客户经理')" > <el-form-item :label="$t('客户经理')" >
<user-selector manage v-model="queryParams.salesmanIds" multiple clearable @change="handleQuery" <user-selector manage v-model="queryParams.salesmanIds" multiple clearable @change="handleQuery" class="w-200"
:prepend="{ id: 0, nickname: $t('未分配客户经理')}"/> :prepend="{ id: 0, nickname: $t('未分配客户经理')}"/>
</el-form-item> </el-form-item>
<div> <div>
<el-form-item :label="$t('始发仓')" prop="startWarehouseIds"> <el-form-item :label="$t('始发仓')" prop="startWarehouseIds">
<el-select v-model="queryParams.startWarehouseIds" :placeholder="$t('请选择始发仓')" clearable multiple @change="handleQuery"> <el-select v-model="queryParams.startWarehouseIds" :placeholder="$t('请选择始发仓')" clearable multiple @change="handleQuery" class="w-200">
<el-option v-for="item in exportWarehouseList" :label="$l(item, 'title')" :value="item.id" :key="item.id"></el-option> <el-option v-for="item in exportWarehouseList" :label="$l(item, 'title')" :value="item.id" :key="item.id"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
<el-select <el-select
v-model="destCountryId" v-model="destCountryId"
multiple multiple
class="w-200"
:label="destCountryId" :label="destCountryId"
:placeholder="$t('请选择目的国')" :placeholder="$t('请选择目的国')"
clearable clearable
...@@ -44,6 +45,7 @@ ...@@ -44,6 +45,7 @@
<el-select <el-select
v-model="objectiveId" v-model="objectiveId"
multiple multiple
class="w-200"
:placeholder="$t('请选择目的城市')" :placeholder="$t('请选择目的城市')"
style="width: 200px" style="width: 200px"
clearable clearable
...@@ -61,6 +63,7 @@ ...@@ -61,6 +63,7 @@
<el-select <el-select
v-model="destWarehouseId" v-model="destWarehouseId"
multiple multiple
class="w-200"
:placeholder="$t('请选择目的仓')" :placeholder="$t('请选择目的仓')"
style="width: 200px" style="width: 200px"
clearable clearable
...@@ -81,44 +84,44 @@ ...@@ -81,44 +84,44 @@
</el-form-item>--> </el-form-item>-->
<!--根据需求文档 lanbm 2024-06-23--> <!--根据需求文档 lanbm 2024-06-23-->
<el-form-item :label="$t('控货')" prop="isCargoControl" v-show="showSearch"> <el-form-item :label="$t('控货')" prop="isCargoControl" v-show="showSearch">
<dict-selector v-model="queryParams.isCargoControl" :type="DICT_TYPE.INFRA_BOOLEAN_STRING" fomatter="bool" clearable /> <dict-selector v-model="queryParams.isCargoControl" :type="DICT_TYPE.INFRA_BOOLEAN_STRING" fomatter="bool" clearable class="w-200"/>
</el-form-item> </el-form-item>
<el-form-item :label="$t('商品类型')" prop="goodsTypes" v-show="showSearch"> <el-form-item :label="$t('商品类型')" prop="goodsTypes" v-show="showSearch">
<selector v-model="queryParams.goodsTypes" multiple :options="productAttrList" label-field="attrName" value-field="id"> <selector v-model="queryParams.goodsTypes" multiple :options="productAttrList" label-field="attrName" value-field="id" class="w-200">
</selector> </selector>
</el-form-item> </el-form-item>
<el-form-item :label="$t('商品')" prop="tidanNo" v-show="showSearch"> <el-form-item :label="$t('商品')" prop="tidanNo" v-show="showSearch">
<el-input v-model.trim="queryParams.prodKey" :placeholder="$t('请输入商品类型、品名或品牌')" clearable @keyup.enter.native="handleQuery" /> <el-input v-model.trim="queryParams.prodKey" :placeholder="$t('请输入商品类型、品名或品牌')" clearable @keyup.enter.native="handleQuery" class="w-200"/>
</el-form-item> </el-form-item>
<!--根据需求文档 lanbm 2024-06-23 隐藏--> <!--根据需求文档 lanbm 2024-06-23 隐藏-->
<el-form-item :label="$t('入仓类型')" prop="warehouseType" v-show="showSearch"> <el-form-item :label="$t('入仓类型')" prop="warehouseType" v-show="showSearch">
<dict-selector :type="DICT_TYPE.ECW_WAREHOUSING_TYPE" v-model="queryParams.warehouseType" clearable/> <dict-selector :type="DICT_TYPE.ECW_WAREHOUSING_TYPE" v-model="queryParams.warehouseType" clearable class="w-200"/>
</el-form-item> </el-form-item>
<!--根据需求文档 lanbm 2024-06-23 隐藏--> <!--根据需求文档 lanbm 2024-06-23 隐藏-->
<el-form-item :label="$t('订单状态')" prop="status" v-show="showSearch"> <el-form-item :label="$t('订单状态')" prop="status" v-show="showSearch">
<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 class="w-200"/>
</el-form-item> </el-form-item>
<el-form-item :label="$t('报关方式')" prop="customsType" v-show="showSearch"> <el-form-item :label="$t('报关方式')" prop="customsType" v-show="showSearch">
<dict-selector :type="DICT_TYPE.ECW_CUSTOMS_TYPE" v-model="queryParams.customsType" clearable @change="handleQuery" /> <dict-selector :type="DICT_TYPE.ECW_CUSTOMS_TYPE" v-model="queryParams.customsType" clearable @change="handleQuery" class="w-200"/>
</el-form-item> </el-form-item>
<el-form-item :label="$t('是否齐货')" v-show="showSearch"> <el-form-item :label="$t('是否齐货')" v-show="showSearch">
<!--// 字段存疑--> <!--// 字段存疑-->
<dict-selector v-model="queryParams.isNeat" :type="DICT_TYPE.INFRA_BOOLEAN_STRING" fomatter="bool" clearable @change="handleQuery"/> <dict-selector v-model="queryParams.isNeat" :type="DICT_TYPE.INFRA_BOOLEAN_STRING" fomatter="bool" clearable @change="handleQuery" class="w-200"/>
</el-form-item> </el-form-item>
<el-form-item :label="$t('备案属性')" prop="productRecords" v-show="showSearch"> <el-form-item :label="$t('备案属性')" prop="productRecords" v-show="showSearch">
<dict-selector :type="DICT_TYPE.PRODUCT_RECORD_ATTRIBUTE" multiple v-model="queryParams.productRecords" clearable @change="handleQuery" /> <dict-selector :type="DICT_TYPE.PRODUCT_RECORD_ATTRIBUTE" multiple v-model="queryParams.productRecords" clearable @change="handleQuery" class="w-200"/>
</el-form-item> </el-form-item>
<!--lanbm 2024-06-23 根据需求文档隐藏--> <!--lanbm 2024-06-23 根据需求文档隐藏-->
<el-form-item :label="$t('快递单号')" prop="number" v-show="showSearch"> <el-form-item :label="$t('快递单号')" prop="number" v-show="showSearch">
<el-input v-model="queryParams.number" :placeholder="$t('快递单号')" clearable @keyup.enter.native="handleQuery" onkeyup="this.value=this.value.replace(/\s+/g, '')" /> <el-input class="w-200" v-model="queryParams.number" :placeholder="$t('快递单号')" clearable @keyup.enter.native="handleQuery" onkeyup="this.value=this.value.replace(/\s+/g, '')" />
</el-form-item> </el-form-item>
<el-form-item :label="$t('外部仓')" prop="number" v-show="showSearch"> <el-form-item :label="$t('外部仓')" prop="number" v-show="showSearch">
<el-select v-model="queryParams.isExternalWarehouse" :placeholder="$t('请选择')" clearable @change="handleQuery"> <el-select v-model="queryParams.isExternalWarehouse" :placeholder="$t('请选择')" clearable @change="handleQuery" class="w-200">
<el-option :label="$t('外部仓')" :value="1"></el-option> <el-option :label="$t('外部仓')" :value="1"></el-option>
<el-option :label="$t('自有仓')" :value="0"></el-option> <el-option :label="$t('自有仓')" :value="0"></el-option>
</el-select> </el-select>
...@@ -126,43 +129,35 @@ ...@@ -126,43 +129,35 @@
<el-form-item :label="$t('异常状态')" prop="status" v-show="showSearch"> <el-form-item :label="$t('异常状态')" prop="status" v-show="showSearch">
<dict-selector :type="DICT_TYPE.ORDER_ABNORMAL_STATE" v-model="queryParams.abnormalState" <dict-selector :type="DICT_TYPE.ORDER_ABNORMAL_STATE" v-model="queryParams.abnormalState"
@keyup.enter.native="handleQuery" clearable /> @keyup.enter.native="handleQuery" clearable class="w-200"/>
</el-form-item> </el-form-item>
<el-form-item :label="$t('审核状态')" prop="status" v-show="showSearch"> <el-form-item :label="$t('审核状态')" prop="status" v-show="showSearch">
<dict-selector :type="DICT_TYPE.ECW_ORDER_APPROVAL_TYPE" v-model="queryParams.auditType" <dict-selector :type="DICT_TYPE.ECW_ORDER_APPROVAL_TYPE" v-model="queryParams.auditType"
@keyup.enter.native="handleQuery" clearable /> @keyup.enter.native="handleQuery" clearable class="w-200"/>
</el-form-item> </el-form-item>
<el-form-item :label="$t('增值服务')" prop="number" v-show="showSearch"> <el-form-item :label="$t('增值服务')" prop="number" v-show="showSearch">
<el-select v-model="queryParams.types" :placeholder="$t('请选择')" multiple clearable> <el-select v-model="queryParams.types" :placeholder="$t('请选择')" multiple clearable class="w-200">
<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>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item :label="$t('出货渠道')" prop="number"> <el-form-item :label="$t('出货渠道')" prop="number">
<selector clearable :options="channelList" :label-field="$l('name')" value-field="channelId" v-model="queryParams.channelIds" multiple></selector> <selector clearable :options="channelList" :label-field="$l('name')" value-field="channelId" v-model="queryParams.channelIds" multiple class="w-200"></selector>
</el-form-item> </el-form-item>
<el-form-item :label="$t('特需')" prop="packageType" v-show="showSearch"> <el-form-item :label="$t('特需')" prop="packageType" v-show="showSearch">
<el-select v-model="queryParams.packageTypeArr" multiple :placeholder="$t('请选择')" clearable > <el-select v-model="queryParams.packageTypeArr" multiple :placeholder="$t('请选择')" clearable class="w-200">
<template v-for="item in getDictDatas(DICT_TYPE.ORDER_SPECIAL_NEEDS)"> <template v-for="item in getDictDatas(DICT_TYPE.ORDER_SPECIAL_NEEDS)">
<el-option :label="$l(item, 'label')" :value="item.value"></el-option> <el-option :label="$l(item, 'label')" :value="item.value"></el-option>
</template> </template>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label=""> <div class="flex pb-20">
<dict-selector :type="DICT_TYPE.ECW_BEGINTIME_TYPE_ENDTIME" :filter="(item) => item.value != 'PickTime'" v-model="dateFilterType" defaultable style="width: 150px; margin-right: 5px" /> <dict-selector :type="DICT_TYPE.ECW_BEGINTIME_TYPE_ENDTIME" :filter="(item) => item.value != 'PickTime'" v-model="dateFilterType" defaultable class="w-200 mr-5" />
<el-date-picker v-model="dateFilter" type="datetimerange" range-separator="-" <el-date-picker v-model="dateFilter" type="datetimerange" range-separator="-" :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')" value-format="yyyy-MM-dd HH:mm:ss" @change="handleQuery"> </el-date-picker>
:start-placeholder="$t('开始日期')" <el-button type="primary" icon="el-icon-search" @click="handleQuery" :loading="loading" class="ml-10">{{ $t("搜索") }}</el-button>
:end-placeholder="$t('结束日期')" <el-button icon="el-icon-refresh" @click="resetQuery">{{ $t("重置") }}</el-button>
value-format="yyyy-MM-dd HH:mm:ss" </div>
@change="handleQuery"
>
</el-date-picker>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">{{$t('搜索')}}</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">{{$t('重置')}}</el-button>
</el-form-item>
</el-form> </el-form>
<!-- 操作工具栏 --> <!-- 操作工具栏 -->
......
src/views/ecw/order/stockingList.vue
View file @ f3db5918
...@@ -2,12 +2,13 @@ ...@@ -2,12 +2,13 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<!-- 搜索工作栏 --> <!-- 搜索工作栏 -->
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="100px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="100px" class="search-z">
<el-form-item :label="$t('编号')" prop="orderNo"> <el-form-item :label="$t('编号')" prop="orderNo">
<el-input <el-input
v-model.trim="queryParams.numberKey" v-model.trim="queryParams.numberKey"
:placeholder="$t('请输入订单号、唛头、提单号')" :placeholder="$t('请输入订单号、唛头、提单号')"
clearable clearable
class="w-200"
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
@input="replaceSpace(queryParams, 'numberKey')" @input="replaceSpace(queryParams, 'numberKey')"
/> />
...@@ -19,6 +20,7 @@ ...@@ -19,6 +20,7 @@
:placeholder="$t('发货人')" :placeholder="$t('发货人')"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
class="w-200"
/> />
</el-form-item> </el-form-item>
<el-form-item :label="$t('收货人')" prop="consigneeKey"> <el-form-item :label="$t('收货人')" prop="consigneeKey">
...@@ -27,6 +29,7 @@ ...@@ -27,6 +29,7 @@
:placeholder="$t('收货人')" :placeholder="$t('收货人')"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
class="w-200"
/> />
</el-form-item> </el-form-item>
<el-form-item :label="$t('客户经理')"> <el-form-item :label="$t('客户经理')">
...@@ -37,11 +40,12 @@ ...@@ -37,11 +40,12 @@
clearable clearable
@change="handleQuery" @change="handleQuery"
:prepend="{ id: 0, nickname: $t('未分配客户经理') }" :prepend="{ id: 0, nickname: $t('未分配客户经理') }"
class="w-200"
/> />
</el-form-item> </el-form-item>
<div> <div>
<el-form-item :label="$t('始发仓')" prop="startWarehouseIds"> <el-form-item :label="$t('始发仓')" prop="startWarehouseIds">
<el-select v-model="queryParams.startWarehouseIds" multiple :placeholder="$t('请选择始发仓')" clearable @change="handleQuery"> <el-select v-model="queryParams.startWarehouseIds" multiple :placeholder="$t('请选择始发仓')" clearable @change="handleQuery" class="w-200">
<el-option v-for="item in exportWarehouseList" :label="$l(item, 'title')" :value="item.id" :key="item.id"></el-option> <el-option v-for="item in exportWarehouseList" :label="$l(item, 'title')" :value="item.id" :key="item.id"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -53,6 +57,7 @@ ...@@ -53,6 +57,7 @@
:placeholder="$t('请选择目的国')" :placeholder="$t('请选择目的国')"
clearable clearable
@change="handleQuery" @change="handleQuery"
class="w-200"
> >
<el-option <el-option
v-for="item in AddressProvince" v-for="item in AddressProvince"
...@@ -67,9 +72,9 @@ ...@@ -67,9 +72,9 @@
v-model="objectiveId" v-model="objectiveId"
multiple multiple
:placeholder="$t('请选择目的城市')" :placeholder="$t('请选择目的城市')"
style="width: 200px"
clearable clearable
@change="handleQuery" @change="handleQuery"
class="w-200"
> >
<el-option <el-option
v-for="item in AddressCity" v-for="item in AddressCity"
...@@ -84,9 +89,9 @@ ...@@ -84,9 +89,9 @@
v-model="destWarehouseId" v-model="destWarehouseId"
multiple multiple
:placeholder="$t('请选择目的仓')" :placeholder="$t('请选择目的仓')"
style="width: 200px"
clearable clearable
@change="handleQuery" @change="handleQuery"
class="w-200"
> >
<el-option <el-option
v-for="item in AddressTown" v-for="item in AddressTown"
...@@ -103,7 +108,7 @@ ...@@ -103,7 +108,7 @@
</el-form-item>--> </el-form-item>-->
<el-form-item :label="$t('商品类型')" prop="goodsTypes" v-show="showSearch"> <el-form-item :label="$t('商品类型')" prop="goodsTypes" v-show="showSearch">
<selector v-model="queryParams.goodsTypes" multiple :options="productAttrList" label-field="attrName" value-field="id"> <selector v-model="queryParams.goodsTypes" multiple :options="productAttrList" label-field="attrName" value-field="id" class="w-200">
</selector> </selector>
</el-form-item> </el-form-item>
...@@ -113,6 +118,7 @@ ...@@ -113,6 +118,7 @@
:placeholder="$t('请输入商品类型、品名或品牌')" :placeholder="$t('请输入商品类型、品名或品牌')"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
class="w-200"
/> />
</el-form-item> </el-form-item>
...@@ -121,6 +127,7 @@ ...@@ -121,6 +127,7 @@
:type="DICT_TYPE.ECW_WAREHOUSING_TYPE" :type="DICT_TYPE.ECW_WAREHOUSING_TYPE"
v-model="queryParams.warehouseType" v-model="queryParams.warehouseType"
clearable clearable
class="w-200"
/> />
</el-form-item> </el-form-item>
...@@ -130,6 +137,7 @@ ...@@ -130,6 +137,7 @@
:type="DICT_TYPE.INFRA_BOOLEAN_STRING" :type="DICT_TYPE.INFRA_BOOLEAN_STRING"
fomatter="bool" fomatter="bool"
clearable clearable
class="w-200"
/> />
</el-form-item> </el-form-item>
...@@ -139,6 +147,7 @@ ...@@ -139,6 +147,7 @@
v-model="queryParams.status" v-model="queryParams.status"
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
clearable clearable
class="w-200"
/> />
</el-form-item> </el-form-item>
<el-form-item :label="$t('报关方式')" prop="customsType" v-show="showSearch"> <el-form-item :label="$t('报关方式')" prop="customsType" v-show="showSearch">
...@@ -147,6 +156,7 @@ ...@@ -147,6 +156,7 @@
v-model="queryParams.customsType" v-model="queryParams.customsType"
clearable clearable
@change="handleQuery" @change="handleQuery"
class="w-200"
/> />
</el-form-item> </el-form-item>
<el-form-item :label="$t('是否齐货')" v-show="showSearch"> <el-form-item :label="$t('是否齐货')" v-show="showSearch">
...@@ -157,6 +167,7 @@ ...@@ -157,6 +167,7 @@
fomatter="bool" fomatter="bool"
clearable clearable
@change="handleQuery" @change="handleQuery"
class="w-200"
/> />
</el-form-item> </el-form-item>
...@@ -167,6 +178,7 @@ ...@@ -167,6 +178,7 @@
multiple multiple
clearable clearable
@change="handleQuery" @change="handleQuery"
class="w-200"
/> />
</el-form-item> </el-form-item>
<el-form-item :label="$t('快递单号')" prop="number" v-show="showSearch"> <el-form-item :label="$t('快递单号')" prop="number" v-show="showSearch">
...@@ -176,6 +188,7 @@ ...@@ -176,6 +188,7 @@
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
onkeyup="this.value=this.value.replace(/\s+/g, '')" onkeyup="this.value=this.value.replace(/\s+/g, '')"
class="w-200"
/> />
</el-form-item> </el-form-item>
<el-form-item :label="$t('外部仓')" prop="isExternalWarehouse" v-show="showSearch"> <el-form-item :label="$t('外部仓')" prop="isExternalWarehouse" v-show="showSearch">
...@@ -184,6 +197,7 @@ ...@@ -184,6 +197,7 @@
:placeholder="$t('请选择')" :placeholder="$t('请选择')"
clearable clearable
@change="handleQuery" @change="handleQuery"
class="w-200"
> >
<el-option :label="$t('外部仓')" :value="1"></el-option> <el-option :label="$t('外部仓')" :value="1"></el-option>
<el-option :label="$t('自有仓')" :value="0"></el-option> <el-option :label="$t('自有仓')" :value="0"></el-option>
...@@ -196,6 +210,7 @@ ...@@ -196,6 +210,7 @@
v-model="queryParams.abnormalState" v-model="queryParams.abnormalState"
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
clearable clearable
class="w-200"
/> />
</el-form-item> </el-form-item>
<el-form-item :label="$t('审核状态')" prop="status" v-show="showSearch"> <el-form-item :label="$t('审核状态')" prop="status" v-show="showSearch">
...@@ -204,6 +219,7 @@ ...@@ -204,6 +219,7 @@
v-model="queryParams.auditType" v-model="queryParams.auditType"
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
clearable clearable
class="w-200"
/> />
</el-form-item> </el-form-item>
<el-form-item :label="$t('增值服务')" prop="types" v-show="showSearch"> <el-form-item :label="$t('增值服务')" prop="types" v-show="showSearch">
...@@ -212,6 +228,7 @@ ...@@ -212,6 +228,7 @@
multiple multiple
:placeholder="$t('请选择')" :placeholder="$t('请选择')"
clearable clearable
class="w-200"
> >
<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>
...@@ -225,6 +242,7 @@ ...@@ -225,6 +242,7 @@
value-field="channelId" value-field="channelId"
v-model="queryParams.channelIds" v-model="queryParams.channelIds"
multiple multiple
class="w-200"
></selector> ></selector>
</el-form-item> </el-form-item>
<el-form-item :label="$t('特需')" prop="packageType" v-show="showSearch"> <el-form-item :label="$t('特需')" prop="packageType" v-show="showSearch">
...@@ -233,6 +251,7 @@ ...@@ -233,6 +251,7 @@
multiple multiple
:placeholder="$t('请选择')" :placeholder="$t('请选择')"
clearable clearable
class="w-200"
> >
<template v-for="item in getDictDatas(DICT_TYPE.ORDER_SPECIAL_NEEDS)"> <template v-for="item in getDictDatas(DICT_TYPE.ORDER_SPECIAL_NEEDS)">
<el-option <el-option
...@@ -242,33 +261,12 @@ ...@@ -242,33 +261,12 @@
</template> </template>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label=""> <div class="flex pb-20">
<dict-selector <dict-selector :type="DICT_TYPE.ECW_BEGINTIME_TYPE_ENDTIME" :filter="(item) => item.value != 'PickTime'" v-model="dateFilterType" defaultable class="w-200 mr-5" />
:type="DICT_TYPE.ECW_BEGINTIME_TYPE_ENDTIME" <el-date-picker v-model="dateFilter" type="datetimerange" range-separator="-" :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')" value-format="yyyy-MM-dd HH:mm:ss" @change="handleQuery"> </el-date-picker>
:filter="(item) => item.value != 'PickTime'" <el-button type="primary" icon="el-icon-search" @click="handleQuery" :loading="loading" class="ml-10">{{ $t("搜索") }}</el-button>
v-model="dateFilterType" <el-button icon="el-icon-refresh" @click="resetQuery">{{ $t("重置") }}</el-button>
defaultable </div>
style="width: 150px; margin-right: 5px"
/>
<el-date-picker
v-model="dateFilter"
type="datetimerange"
range-separator="-"
:start-placeholder="$t('开始日期')"
:end-placeholder="$t('结束日期')"
value-format="yyyy-MM-dd HH:mm:ss"
@change="handleQuery"
>
</el-date-picker>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">{{
$t("搜索")
}}</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">{{
$t("重置")
}}</el-button>
</el-form-item>
</el-form> </el-form>
<!-- 操作工具栏 --> <!-- 操作工具栏 -->
......
src/views/ecw/order/warningCargoControl.vue
View file @ f3db5918
<template> <template>
<div class="app-container"> <div class="app-container">
<!-- 搜索工作栏 --> <!-- 搜索工作栏 -->
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px" class="search-z">
<el-form-item :label="$t('订单编号')" prop="orderNo"> <el-form-item :label="$t('订单编号')" prop="orderNo">
<el-input v-model.trim="queryParams.orderNo" :placeholder="$t('订单编号')" clearable @keyup.enter.native="handleQuery" @input="replaceSpace(queryParams, 'orderNo')" /> <el-input v-model.trim="queryParams.orderNo" :placeholder="$t('订单编号')" clearable @keyup.enter.native="handleQuery" @input="replaceSpace(queryParams, 'orderNo')" class="w-200"/>
</el-form-item> </el-form-item>
<el-form-item :label="$t('发货人')" prop="consignorKey"> <el-form-item :label="$t('发货人')" prop="consignorKey">
<el-input v-model.trim="queryParams.consignorKey" :placeholder="$t('发货人')" clearable @keyup.enter.native="handleQuery" /> <el-input v-model.trim="queryParams.consignorKey" :placeholder="$t('发货人')" clearable @keyup.enter.native="handleQuery" class="w-200"/>
</el-form-item> </el-form-item>
<el-form-item :label="$t('收货人')" prop="consigneeKey"> <el-form-item :label="$t('收货人')" prop="consigneeKey">
<el-input v-model.trim="queryParams.consigneeKey" :placeholder="$t('收货人')" clearable @keyup.enter.native="handleQuery" /> <el-input v-model.trim="queryParams.consigneeKey" :placeholder="$t('收货人')" clearable @keyup.enter.native="handleQuery" class="w-200"/>
</el-form-item> </el-form-item>
<el-form-item :label="$t('控货状态')" prop="isCargoControl"> <el-form-item :label="$t('控货状态')" prop="isCargoControl">
<dict-selector v-model="queryParams.cargoControlStatusList" multiple :type="DICT_TYPE.CONTROL_GOODS_STATUS" clearable @change="handleQuery" /> <dict-selector v-model="queryParams.cargoControlStatusList" multiple :type="DICT_TYPE.CONTROL_GOODS_STATUS" clearable @change="handleQuery" class="w-200"/>
</el-form-item> </el-form-item>
<div> <div>
<el-form-item :label="$t('始发仓')" prop="startWarehouseIds"> <el-form-item :label="$t('始发仓')" prop="startWarehouseIds">
<el-select v-model="queryParams.startWarehouseIds" multiple :placeholder="$t('请选择始发仓')" clearable @change="handleQuery"> <el-select v-model="queryParams.startWarehouseIds" multiple :placeholder="$t('请选择始发仓')" clearable @change="handleQuery" class="w-200">
<el-option v-for="item in exportWarehouseList" :label="item.titleZh" :value="item.id" :key="item.id"></el-option> <el-option v-for="item in exportWarehouseList" :label="item.titleZh" :value="item.id" :key="item.id"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<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" class="w-200">
<el-option v-for="item in AddressProvince" :key="item.guojia" :label="item.guojiaName" :value="item.guojia"></el-option> <el-option v-for="item in AddressProvince" :key="item.guojia" :label="item.guojiaName" :value="item.guojia"></el-option>
</el-select> </el-select>
</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" multiple :placeholder="$t('请选择目的城市')" style="width: 200px" clearable @change="handleQuery"> <el-select v-model="objectiveId" multiple :placeholder="$t('请选择目的城市')" style="width: 200px" clearable @change="handleQuery" class="w-200">
<el-option v-for="item in AddressCity" :key="item.shi" :label="item.shiName" :value="item.shi"></el-option> <el-option v-for="item in AddressCity" :key="item.shi" :label="item.shiName" :value="item.shi"></el-option>
</el-select> </el-select>
</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" multiple :placeholder="$t('请选择目的仓')" style="width: 200px" clearable @change="handleQuery"> <el-select v-model="destWarehouseId" multiple :placeholder="$t('请选择目的仓')" style="width: 200px" clearable @change="handleQuery" class="w-200">
<el-option v-for="item in AddressTown" :key="item.id" :label="item.titleZh" :value="item.id"></el-option> <el-option v-for="item in AddressTown" :key="item.id" :label="item.titleZh" :value="item.id"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</div> </div>
<el-form-item :label="$t('客户经理')"> <el-form-item :label="$t('客户经理')">
<user-selector manage v-model="queryParams.salesmanIds" multiple clearable @change="handleQuery" :prepend="{ id: 0, nickname: $t('未分配客户经理') }" /> <user-selector manage v-model="queryParams.salesmanIds" multiple clearable @change="handleQuery" :prepend="{ id: 0, nickname: $t('未分配客户经理') }" class="w-200"/>
</el-form-item> </el-form-item>
<el-form-item :label="$t('出货渠道')" prop="channelIds"> <el-form-item :label="$t('出货渠道')" prop="channelIds">
<selector clearable :options="channelList" :label-field="$l('name')" value-field="channelId" v-model="queryParams.channelIds" multiple></selector> <selector clearable :options="channelList" :label-field="$l('name')" value-field="channelId" v-model="queryParams.channelIds" multiple class="w-200"></selector>
</el-form-item> </el-form-item>
<el-form-item :label="$t('商品')" prop="prodId" v-show="showSearch"> <el-form-item :label="$t('商品')" prop="prodId" v-show="showSearch">
<product-selector v-model.trim="queryParams.prodId" @keyup.enter.native="handleQuery" clearable @change="handleQuery" /> <product-selector v-model.trim="queryParams.prodId" @keyup.enter.native="handleQuery" clearable @change="handleQuery" class="w-200"/>
</el-form-item> </el-form-item>
<el-form-item :label="$t('订单状态')" prop="statusList" v-show="showSearch"> <el-form-item :label="$t('订单状态')" prop="statusList" v-show="showSearch">
<dict-selector :type="DICT_TYPE.ORDER_STATUS" multiple v-model="queryParams.statusList" @keyup.enter.native="handleQuery" clearable @change="handleQuery" /> <dict-selector :type="DICT_TYPE.ORDER_STATUS" multiple v-model="queryParams.statusList" @keyup.enter.native="handleQuery" clearable @change="handleQuery" class="w-200"/>
</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" onkeyup="this.value=this.value.replace(/\s+/g, '')" /> <el-input v-model="queryParams.tidanNo" :placeholder="$t('提单号')" clearable @keyup.enter.native="handleQuery" onkeyup="this.value=this.value.replace(/\s+/g, '')" class="w-200"/>
</el-form-item> </el-form-item>
<el-form-item :label="$t('报关方式')" prop="customsTypes"> <el-form-item :label="$t('报关方式')" prop="customsTypes">
<dict-selector :type="DICT_TYPE.ECW_CUSTOMS_TYPE" multiple v-model="queryParams.customsTypes" clearable @change="handleQuery" /> <dict-selector :type="DICT_TYPE.ECW_CUSTOMS_TYPE" multiple v-model="queryParams.customsTypes" clearable @change="handleQuery" class="w-200"/>
</el-form-item> </el-form-item>
<el-form-item :label="$t('唛头')" prop="marks"> <el-form-item :label="$t('唛头')" prop="marks">
<el-input v-model="queryParams.marks" :placeholder="$t('唛头')" clearable @keyup.enter.native="handleQuery" onkeyup="this.value=this.value.replace(/\s+/g, '')" /> <el-input v-model="queryParams.marks" :placeholder="$t('唛头')" clearable @keyup.enter.native="handleQuery" onkeyup="this.value=this.value.replace(/\s+/g, '')" class="w-200"/>
</el-form-item> </el-form-item>
<el-form-item :label="$t('备案属性')" prop="productRecords" v-show="showSearch"> <el-form-item :label="$t('备案属性')" prop="productRecords" v-show="showSearch">
<dict-selector :type="DICT_TYPE.PRODUCT_RECORD_ATTRIBUTE" multiple v-model="queryParams.productRecords" clearable @change="handleQuery" /> <dict-selector :type="DICT_TYPE.PRODUCT_RECORD_ATTRIBUTE" multiple v-model="queryParams.productRecords" clearable @change="handleQuery" class="w-200"/>
</el-form-item> </el-form-item>
<el-form-item :label="$t('外部仓')" prop="isExternalWarehouse" v-show="showSearch"> <el-form-item :label="$t('外部仓')" prop="isExternalWarehouse" v-show="showSearch">
<el-select v-model="queryParams.isExternalWarehouse" :placeholder="$t('请选择')" clearable @change="handleQuery"> <el-select v-model="queryParams.isExternalWarehouse" :placeholder="$t('请选择')" clearable @change="handleQuery" class="w-200">
<el-option :label="$t('外部仓')" :value="1"></el-option> <el-option :label="$t('外部仓')" :value="1"></el-option>
<el-option :label="$t('自有仓')" :value="0"></el-option> <el-option :label="$t('自有仓')" :value="0"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item :label="$t('增值服务')" prop="type" v-show="showSearch"> <el-form-item :label="$t('增值服务')" prop="type" v-show="showSearch">
<el-select v-model="queryParams.type" :placeholder="$t('请选择')" clearable @change="handleQuery"> <el-select v-model="queryParams.type" :placeholder="$t('请选择')" clearable @change="handleQuery" class="w-200">
<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>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item :label="$t('日期筛选')"> <div class="flex pb-20">
<dict-selector defaultable :type="DICT_TYPE.ECW_BEGINTIME_TYPE_ENDTIME" v-model="dateFilterType" class="w-100 mr-10" /> <dict-selector :type="DICT_TYPE.ECW_BEGINTIME_TYPE_ENDTIME" :filter="(item) => item.value != 'PickTime'" v-model="dateFilterType" defaultable class="w-200 mr-5" />
<el-date-picker v-model="dateFilter" type="datetimerange" range-separator="-" :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')" value-format="yyyy-MM-dd HH:mm:ss" @change="handleQuery"></el-date-picker> <el-date-picker v-model="dateFilter" type="datetimerange" range-separator="-" :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')" value-format="yyyy-MM-dd HH:mm:ss" @change="handleQuery" class="w-200"> </el-date-picker>
</el-form-item> <el-button type="primary" icon="el-icon-search" @click="handleQuery" :loading="loading" class="ml-10">{{ $t("搜索") }}</el-button>
<el-form-item> <el-button icon="el-icon-refresh" @click="resetQuery">{{ $t("重置") }}</el-button>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">{{ $t("搜索") }}</el-button> </div>
</el-form-item>
</el-form> </el-form>
<!-- 操作工具栏 --> <!-- 操作工具栏 -->
...@@ -363,6 +362,23 @@ export default { ...@@ -363,6 +362,23 @@ export default {
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery() { resetQuery() {
this.resetForm("queryForm") this.resetForm("queryForm")
this.queryParams = {
page: 1,
rows: 10,
packageTypeArr: [],
channelId: null,
channelIds: null,
customsTypes: null,
productRecords: null,
goodsTypes: null
}
this.destCountryId = null
this.destWarehouseId = null
this.objectiveId = null
this.pickRatio.value = ""
this.noParam.value = ""
this.prodParam.value = ""
this.dateFilter = []
this.handleQuery() this.handleQuery()
}, },
......
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