Skip to content

J
jiedao-app-operator-master
Commit 81be4b1e authored by 332784038@qq.com's avatar 332784038@qq.com
Browse files
Options

feature: 查询条件联调&查看代理商详情显示修改

parent a513489c
Hide whitespace changes
Inline Side-by-side
Showing with 158 additions and 102 deletions
src/main.js
View file @ 81be4b1e
......@@ -15,7 +15,7 @@ import './permission' // permission control
import './tongji' // 百度统计
import { getDicts } from "@/api/system/dict/data";
import { getConfigKey } from "@/api/infra/config";
import { parseTime, resetForm, addDateRange, addBeginAndEndTime, handleTree} from "@/utils/ruoyi";
import { parseTime, resetForm, addDateRange, addBeginAndEndTime, addBeginAndEndTimeNew, handleTree} from "@/utils/ruoyi";
import Pagination from "@/components/Pagination";
// 自定义表格工具扩展
import RightToolbar from "@/components/RightToolbar"
......@@ -33,6 +33,7 @@ Vue.prototype.parseTime = parseTime
Vue.prototype.resetForm = resetForm
Vue.prototype.addDateRange = addDateRange
Vue.prototype.addBeginAndEndTime = addBeginAndEndTime
Vue.prototype.addBeginAndEndTimeNew = addBeginAndEndTimeNew
Vue.prototype.getDictDatas = getDictDatas
Vue.prototype.getDictDatas2 = getDictDatas2
Vue.prototype.getDictDataLabel = getDictDataLabel
......
src/utils/ruoyi.js
View file @ 81be4b1e
......@@ -105,6 +105,31 @@ export function addBeginAndEndTime(params, dateRange, propName,isTime = true) {
return params;
}
export function addBeginAndEndTimeNew(params, dateRange, prefixName, propName, isTime = true) {
// 必须传入参数
if (!dateRange) {
return params;
}
// 如果未传递 propName 属性，默认为 time
if (!propName) {
propName = 'Time';
} else {
propName = propName.charAt(0).toUpperCase() + propName.slice(1);
}
if (!prefixName) {
prefixName = ''
}
console.log('dateRange', dateRange)
// 设置参数
if (dateRange[0]) {
params[prefixName + 'Begin' + propName] = dateRange[0] + (isTime ? ' 00:00:00':'');
}
if (dateRange[1]) {
params[prefixName + 'End' + propName] = dateRange[1] + (isTime ? ' 23:59:59' : '');
}
return params;
}
// 字符串格式化(%s )
export function sprintf(str) {
var args = arguments, flag = true, i = 1;
......
src/views/ecw/box/indexAir.vue
View file @ 81be4b1e
......@@ -11,24 +11,24 @@
</el-select>
</el-form-item>
<el-form-item :label="$t('始发仓')" prop="startWarehouseIds">
<el-select v-model="queryParams.startWarehouseIds" multiple :placeholder="$t('请选择始发仓')" clearable collapse-tags>
<el-form-item :label="$t('始发仓')" prop="startWarehouseIdList">
<el-select v-model="queryParams.startWarehouseIdList" multiple :placeholder="$t('请选择始发仓')" clearable collapse-tags>
<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 collapse-tags>
<el-form-item :label="$t('目的国')" prop="countryIdList">
<el-select v-model="countryIdList" multiple :label="countryIdList" :placeholder="$t('请选择目的国')" clearable collapse-tags>
<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 collapse-tags>
<el-form-item :label="$t('目的城市')" prop="destCityIdList">
<el-select v-model="destCityIdList" multiple :placeholder="$t('请选择目的城市')" style="width: 200px" clearable collapse-tags>
<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 collapse-tags>
<el-form-item :label="$t('目的仓')" prop="destWarehouseIdList">
<el-select v-model="destWarehouseIdList" multiple :placeholder="$t('请选择目的仓')" style="width: 200px" clearable collapse-tags>
<el-option v-for="item in AddressTown" :key="item.id" :label="item.titleZh" :value="item.id"></el-option>
</el-select>
</el-form-item>
......@@ -45,7 +45,7 @@
</el-select>
</el-form-item>
<el-form-item label="">
<el-date-picker v-model="queryParams.dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="datetimerange" range-separator="-" start-:placeholder="$t('开始日期')" end-:placeholder="$t('结束日期')" />
<el-date-picker v-model="queryParams.dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="datetimerange" range-separator="-" :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')" />
</el-form-item>
<el-form-item :label="$t('提单制作')" prop="ladingBillStatus">
<el-select v-model="queryParams.ladingBillStatus" :placeholder="$t('请选择提单制作状态')" clearable size="small">
......@@ -54,10 +54,10 @@
</el-select>
</el-form-item>
<el-form-item :label="$t('起运港')" v-show="showSearch">
<dockSelect v-model="queryParams.departurePortId" :placeholder="$t('请选择起运港')" portType="2" :allDocks="allDocks" clearable multiple collapse-tags />
<dockSelect v-model="queryParams.bigPortIdList" :placeholder="$t('请选择起运港')" portType="2" :allDocks="allDocks" clearable multiple collapse-tags />
</el-form-item>
<el-form-item :label="$t('目的港')" v-show="showSearch">
<dockSelect v-model="queryParams.destPortId" :placeholder="$t('请选择目的港')" portType="2" :allDocks="allDocks" clearable multiple collapse-tags />
<dockSelect v-model="queryParams.destPortIdList" :placeholder="$t('请选择目的港')" portType="2" :allDocks="allDocks" clearable multiple collapse-tags />
</el-form-item>
<el-form-item :label="$t('目的港清关')" prop="destinationClearance" v-show="showSearch">
<el-select v-model="queryParams.destinationClearance" :placeholder="$t('请选择目的港清关')" clearable size="small">
......@@ -83,16 +83,16 @@
</el-select>
</el-form-item>
<el-form-item :label="$t('订舱代理')" v-show="showSearch">
<supplierSelect v-model="queryParams.shipperId" :companyType="'5'" :placeholder="$t('请选择订舱代理')" :allSupplier="allSupplier" />
<supplierSelect v-model="queryParams.shipperId" :companyType="'5'" :placeholder="$t('请选择订舱代理')" :allSupplier="allSupplier" clearable multiple collapse-tags />
</el-form-item>
<el-form-item :label="$t('航空公司')" v-show="showSearch">
<supplierSelect v-model="queryParams.airlineCompanyId" :placeholder="$t('请选择航空公司')" company-type="7" :allSupplier="allSupplier" />
<supplierSelect v-model="queryParams.airlineCompanyId" :placeholder="$t('请选择航空公司')" company-type="10" :allSupplier="allSupplier" clearable multiple collapse-tags />
</el-form-item>
<el-form-item :label="$t('代理公司Agent')" v-show="showSearch">
<supplierSelect v-model="queryParams.airlineCompanyId1" :placeholder="$t('请选择代理公司')" company-type="7" :allSupplier="allSupplier" />
<supplierSelect v-model="queryParams.agentIdList" :placeholder="$t('请选择代理公司')" company-type="1" :allSupplier="allSupplier" clearable multiple collapse-tags />
</el-form-item>
<el-form-item :label="$t('预计起飞时间')" prop="flyTime" v-show="showSearch">
<el-date-picker type="datetime" :placeholder="$t('请选择日期')" value-format="yyyy-MM-dd HH:mm:ss" v-model="queryParams.flyTime"></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.flyBeginTime"></el-date-picker>
</el-form-item>
<el-form-item :label="$t('报关方式')" prop="dcCustomsType" v-show="showSearch">
<el-select v-model="queryParams.dcCustomsType" :placeholder="$t('请选择报关方式')" clearable multiple collapse-tags>
......@@ -321,9 +321,9 @@ export default {
AddressCity: [],
AddressProvince: [],
AddressTown: [],
destCountryId: null,
objectiveId: null,
destWarehouseId: null,
countryIdList: null,
destCityIdList: null,
destWarehouseIdList: null,
// 选中数组
ids: [],
//目的国
......@@ -376,7 +376,7 @@ export default {
cabinetId: null,
shipmentStatusAir: null,
startWarehouseId: null,
destWarehouseId: null,
destWarehouseIdList: null,
transportType: null
},
channelList: [],
......@@ -404,7 +404,7 @@ export default {
trigger: 'blur'
}
],
destWarehouseId: [
destWarehouseIdList: [
{
required: true,
message: this.$t('目的地不能为空'),
......@@ -462,17 +462,17 @@ export default {
}
},
watch: {
destCountryId: {
countryIdList: {
//监听当前地区值的变化，于与上方地区值进行了双向绑定
deep: true, //深度监听
handler() {
//每当值省份值改变时其下地区值进行清空
this.AddressCity = []
this.AddressTown = []
this.objectiveId = ""
this.destWarehouseId = ""
this.destCityIdList = ""
this.destWarehouseIdList = ""
this.findByprovinceCode()
if (this.destCountryId == "") {
if (this.countryIdList == "") {
getRegionList(4, 4)
.then(({ data }) => {
this.AddressCity = data
......@@ -488,8 +488,8 @@ export default {
.catch((error) => {
console.log(error)
})
} else if (this.destCountryId != "" && this.objectiveId == "" && this.destWarehouseId == "") {
getRegionList(2, this.destCountryId)
} else if (this.countryIdList != "" && this.destCityIdList == "" && this.destWarehouseIdList == "") {
getRegionList(2, this.countryIdList)
.then(({ data }) => {
this.AddressCity = data
})
......@@ -522,23 +522,23 @@ export default {
// });
}
},
objectiveId: {
destCityIdList: {
deep: true, //深度监听
handler() {
this.AddressTown = []
this.destWarehouseId = ""
this.destWarehouseIdList = ""
this.findBycityCode()
if (this.objectiveId != "" && this.destCountryId != "" && this.destWarehouseId == "") {
if (this.destCityIdList != "" && this.countryIdList != "" && this.destWarehouseIdList == "") {
//获取当前城市值id，获取该城市下区域
getRegionList(3, this.objectiveId)
getRegionList(3, this.destCityIdList)
.then(({ data }) => {
this.AddressTown = data
})
.catch((error) => {
console.log(error)
})
} else if (this.destCountryId == "" && this.objectiveId == "" && this.destWarehouseId == "") {
} else if (this.countryIdList == "" && this.destCityIdList == "" && this.destWarehouseIdList == "") {
getRegionList(5, 5)
.then(({ data }) => {
this.AddressTown = data
......@@ -546,8 +546,8 @@ export default {
.catch((error) => {
console.log(error)
})
} else if (this.destCountryId != "" && this.objectiveId == "" && this.destWarehouseId == "") {
getRegionList(2, this.destCountryId)
} else if (this.countryIdList != "" && this.destCityIdList == "" && this.destWarehouseIdList == "") {
getRegionList(2, this.countryIdList)
.then(({ data }) => {
this.AddressCity = data
})
......@@ -562,7 +562,7 @@ export default {
console.log(error)
})
}
// else if(this.objectiveId!="" && this.objectiveId=="" ){
// else if(this.destCityIdList!="" && this.destCityIdList=="" ){
// getRegionList(5, 5).then(({data}) => {
// this.AddressTown = data;
......@@ -572,19 +572,19 @@ export default {
// }
}
},
destWarehouseId: {
destWarehouseIdList: {
deep: true, //深度监听
handler() {
if (this.objectiveId != "" && this.destCountryId != "" && this.destWarehouseId == "") {
if (this.destCityIdList != "" && this.countryIdList != "" && this.destWarehouseIdList == "") {
//获取当前城市值id，获取该城市下区域
getRegionList(3, this.objectiveId)
getRegionList(3, this.destCityIdList)
.then(({ data }) => {
this.AddressTown = data
})
.catch((error) => {
console.log(error)
})
} else if (this.destCountryId != "" && this.objectiveId == "" && this.destWarehouseId == "") {
} else if (this.countryIdList != "" && this.destCityIdList == "" && this.destWarehouseIdList == "") {
getRegionList(5, 5)
.then(({ data }) => {
this.AddressTown = data
......@@ -593,7 +593,7 @@ export default {
console.log(error)
})
}
// else if(this.objectiveId=="" && this.destWarehouseId==""){
// else if(this.destCityIdList=="" && this.destWarehouseIdList==""){
// getRegionList(5, 5).then(({data}) => {
// this.AddressTown = data;
// })
......@@ -690,13 +690,18 @@ export default {
// 供应商
getSupplierPage({ pageNo: "1", pageSize: "10000" }).then((res) => {
const { data } = res;
this.allSupplier = data.list;
this.allSupplier = data.list.map((item) => {
if (item.companyType) {
item.companyTypes = item.companyType.split(",");
}
return item;
});
});
},
findByprovinceCode() {
//获取当前省份值id，获取该省份下城市 destCountryId provinceCode
//获取当前省份值id，获取该省份下城市 countryIdList provinceCode
getRegionList(2, this.destCountryId)
getRegionList(2, this.countryIdList)
.then(({ data }) => {
this.AddressCity = data
})
......@@ -706,7 +711,7 @@ export default {
},
findBycityCode() {
//获取当前城市值id，获取该城市下区域
getRegionList(3, this.objectiveId)
getRegionList(3, this.destCityIdList)
.then(({ data }) => {
this.AddressTown = data
......@@ -750,15 +755,16 @@ export default {
let params = { ...this.queryParams }
params.transportType = 3
this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime')
this.addBeginAndEndTimeNew(params, params.flyBeginTime, 'fly');// 预计起飞时间
// 执行查询
getboxPage(params).then((response) => {
this.list = response.data.list
this.total = response.data.total
// var lineParams = []
// this.list.forEach(item=>{
// let line = lineParams.findIndex(li=>li.startWarehouseId==item.startWarehouseId&&li.destWarehouseId==item.destWarehouseId&&li.transportType==item.transportType)
// let line = lineParams.findIndex(li=>li.startWarehouseId==item.startWarehouseId&&li.destWarehouseIdList==item.destWarehouseIdList&&li.transportType==item.transportType)
// if(line == -1){
// lineParams.push({startWarehouseId:item.startWarehouseId,destWarehouseId:item.destWarehouseId,transportType:item.transportType})
// lineParams.push({startWarehouseId:item.startWarehouseId,destWarehouseIdList:item.destWarehouseIdList,transportType:item.transportType})
// }
// })
// getLineInfoList(lineParams)
......@@ -783,7 +789,7 @@ export default {
id: undefined,
cabinetId: undefined,
startWarehouseId: undefined,
destWarehouseId: undefined,
destWarehouseIdList: undefined,
transportType: undefined
}
this.resetForm('form')
......@@ -847,6 +853,7 @@ export default {
params.pageNo = undefined
params.pageSize = undefined
this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime')
this.addBeginAndEndTimeNew(params, params.flyBeginTime, 'fly');// 预计起飞时间
// 执行导出
this.$modal
.confirm(this.$t('是否确认导出所有出货数据项?'))
......@@ -879,7 +886,7 @@ export default {
this.handleDelete(row);
break;
case "editLadingBill":
let line = await getLineInfo({startWarehouseId: row.startWarehouseId,destWarehouseId: row.destWarehouseId,transportType:row.transportType})
let line = await getLineInfo({startWarehouseId: row.startWarehouseId,destWarehouseIdList: row.destWarehouseIdList,transportType:row.transportType})
let makeBillNode = line.data.makeBillNode
console.log(row,this.makeBillNodeStatus[makeBillNode])
if(row.shipmentStatusAir<this.makeBillNodeStatus[makeBillNode]){
......
src/views/ecw/box/indexSea.vue
View file @ 81be4b1e
......@@ -55,24 +55,24 @@
</el-select>
</el-form-item>
<el-form-item :label="$t('始发仓')" prop="startWarehouseIds">
<el-select v-model="queryParams.startWarehouseIds" multiple :placeholder="$t('请选择始发仓')" clearable collapse-tags>
<el-form-item :label="$t('始发仓')" prop="startWarehouseIdList">
<el-select v-model="queryParams.startWarehouseIdList" multiple :placeholder="$t('请选择始发仓')" clearable collapse-tags>
<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 collapse-tags>
<el-form-item :label="$t('目的国')" prop="countryIdList">
<el-select v-model="countryIdList" multiple :label="countryIdList" :placeholder="$t('请选择目的国')" clearable collapse-tags>
<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 collapse-tags>
<el-form-item :label="$t('目的城市')" prop="destCityIdList">
<el-select v-model="destCityIdList" multiple :placeholder="$t('请选择目的城市')" style="width: 200px" clearable collapse-tags>
<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 collapse-tags>
<el-form-item :label="$t('目的仓')" prop="destWarehouseIdList">
<el-select v-model="destWarehouseIdList" multiple :placeholder="$t('请选择目的仓')" style="width: 200px" clearable collapse-tags>
<el-option v-for="item in AddressTown" :key="item.id" :label="item.titleZh" :value="item.id"></el-option>
</el-select>
</el-form-item>
......@@ -106,11 +106,12 @@
/>
</el-form-item>
<el-form-item :label="$t('状态')" prop="boxStatus">
<el-form-item :label="$t('状态')" prop="boxStatusList">
<el-select
v-model="queryParams.boxStatus"
v-model="queryParams.boxStatusList"
:placeholder="$t('请选择状态')"
clearable
multiple
size="small"
>
<el-option
......@@ -124,7 +125,7 @@
</el-select>
</el-form-item>
<!-- <el-form-item :label="$t('国家')" prop="countryId">
<el-form-item :label="$t('国家')" prop="countryId">
<el-select
v-model="queryParams.countryId"
:placeholder="$t('请选择国家')"
......@@ -139,7 +140,7 @@
>
</el-option>
</el-select>
</el-form-item> -->
</el-form-item>
<el-form-item :label="$t('提单制作')" prop="ladingBillStatus">
<el-select
......@@ -159,31 +160,31 @@
</el-form-item>
<el-form-item :label="$t('起运港')" v-show="showSearch">
<dockSelect v-model="queryParams.bigPortId" :placeholder="$t('请选择起运港')" portType="2" :allDocks="allDocks" clearable multiple collapse-tags />
<dockSelect v-model="queryParams.bigPortIdList" :placeholder="$t('请选择起运港')" portType="2" :allDocks="allDocks" clearable multiple collapse-tags />
</el-form-item>
<el-form-item :label="$t('目的港')" v-show="showSearch">
<dockSelect v-model="queryParams.destPortId" :placeholder="$t('请选择目的港')" portType="2" :allDocks="allDocks" clearable multiple collapse-tags />
<dockSelect v-model="queryParams.destPortIdList" :placeholder="$t('请选择目的港')" portType="2" :allDocks="allDocks" clearable multiple collapse-tags />
</el-form-item>
<el-form-item :label="$t('驳船港')" v-show="showSearch">
<dockSelect v-model="queryParams.bargePortId" :placeholder="$t('请选择驳船港')" portType="2" :allDocks="allDocks" clearable multiple collapse-tags />
<dockSelect v-model="queryParams.bargePortIdList" :placeholder="$t('请选择驳船港')" portType="2" :allDocks="allDocks" clearable multiple collapse-tags />
</el-form-item>
<el-form-item :label="$t('订舱公司')" v-show="showSearch">
<supplierSelect v-model="queryParams.spaceCompanyId" :companyType="'1'" :placeholder="$t('请选择订舱公司')" :allSupplier="allSupplier" />
<supplierSelect v-model="queryParams.spaceCompanyIdList" :companyType="'1'" :placeholder="$t('请选择订舱公司')" :allSupplier="allSupplier" clearable multiple collapse-tags />
</el-form-item>
<el-form-item :label="$t('预计驳船时间')" v-show="showSearch">
<el-date-picker type="datetime" :placeholder="$t('请选择日期')" value-format="yyyy-MM-dd HH:mm:ss" v-model="queryParams.bargeTime"></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>
</el-form-item>
<el-form-item :label="$t('预计开船时间')" v-show="showSearch">
<el-date-picker type="datetime" :placeholder="$t('请选择日期')" value-format="yyyy-MM-dd HH:mm:ss" v-model="queryParams.sailTime"></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.sailBeginTime"></el-date-picker>
</el-form-item>
<el-form-item :label="$t('截补料时间')" v-show="showSearch">
<el-date-picker type="datetime" :placeholder="$t('请选择日期')" value-format="yyyy-MM-dd HH:mm:ss" v-model="queryParams.ladingBillTime"></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.ladingBillBeginTime"></el-date-picker>
</el-form-item>
<el-form-item :label="$t('VGM提交时间')" v-show="showSearch">
<el-date-picker type="datetime" :placeholder="$t('请选择日期')" value-format="yyyy-MM-dd HH:mm:ss" v-model="queryParams.customsTime"></el-date-picker>
<el-date-picker type="datetimerange" :start-placeholder="$t('VGM提交开始日期')" :end-placeholder="$t('VGM提交结束日期')" value-format="yyyy-MM-dd HH:mm:ss" v-model="queryParams.customsBeginTime"></el-date-picker>
</el-form-item>
<el-form-item :label="$t('截关时间')" v-show="showSearch">
<el-date-picker type="datetime" :placeholder="$t('请选择日期')" value-format="yyyy-MM-dd HH:mm:ss" v-model="queryParams.cutOffTime"></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.cutOffBeginTime"></el-date-picker>
</el-form-item>
<el-form-item :label="$t('报关方式')" prop="dcCustomsType" v-show="showSearch">
<el-select v-model="queryParams.dcCustomsType" :placeholder="$t('请选择报关方式')" clearable multiple collapse-tags>
......@@ -197,10 +198,10 @@
<el-date-picker type="datetime" :placeholder="$t('请选择日期')" v-model="queryParams.dcPassTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
</el-form-item>
<el-form-item :label="$t('实际开船时间')" v-show="showSearch">
<el-date-picker type="datetime" :placeholder="$t('请选择日期')" v-model="queryParams.bgRealShipTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
<el-date-picker type="datetimerange" :start-placeholder="$t('实际开船开始日期')" :end-placeholder="$t('实际开船结束日期')" v-model="queryParams.bgRealShipBeginTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
</el-form-item>
<el-form-item :label="$t('预计到港时间')" v-show="showSearch">
<el-date-picker type="datetime" :placeholder="$t('请选择日期')" v-model="queryParams.estTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
<el-date-picker type="datetimerange" :start-placeholder="$t('预计到港开始日期')" :end-placeholder="$t('预计到港结束日期')" v-model="queryParams.estBeginTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
</el-form-item>
<el-form-item :label="$t('出单方式')" v-show="showSearch">
<el-select v-model="queryParams.cdOutBillType" :placeholder="$t('请选择出单方式')" clearable multiple collapse-tags>
......@@ -228,7 +229,7 @@
</el-select>
</el-form-item>
<el-form-item :label="$t('预计清关时间')" v-show="showSearch">
<el-date-picker type="datetime" :placeholder="$t('请选择日期')" v-model="queryParams.clEstTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
<el-date-picker type="datetimerange" :start-placeholder="$t('预计清关开始日期')" :end-placeholder="$t('预计清关结束日期')" v-model="queryParams.clEstBeginTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
</el-form-item>
<el-form-item>
......@@ -596,6 +597,7 @@ import regError from "./regError.vue";
import editForm from "./editForm.vue";
import ladingBill from "./ladingBill/index.vue";
import { listUser } from "@/api/system/user";
import { set } from "nprogress";
export default {
name: "EcwBoxIndexsea",
......@@ -612,9 +614,9 @@ export default {
AddressCity: [],
AddressProvince: [],
AddressTown: [],
destCountryId: null,
objectiveId: null,
destWarehouseId: null,
countryIdList: null,
destCityIdList: null,
destWarehouseIdList: null,
// 选中数组
ids: [],
//目的国
......@@ -683,17 +685,17 @@ export default {
};
},
watch: {
destCountryId: {
countryIdList: {
//监听当前地区值的变化，于与上方地区值进行了双向绑定
deep: true, //深度监听
handler() {
//每当值省份值改变时其下地区值进行清空
this.AddressCity = []
this.AddressTown = []
this.objectiveId = ""
this.destWarehouseId = ""
this.destCityIdList = ""
this.destWarehouseIdList = ""
this.findByprovinceCode()
if (this.destCountryId == "") {
if (this.countryIdList == "") {
getRegionList(4, 4)
.then(({ data }) => {
this.AddressCity = data
......@@ -709,8 +711,8 @@ export default {
.catch((error) => {
console.log(error)
})
} else if (this.destCountryId != "" && this.objectiveId == "" && this.destWarehouseId == "") {
getRegionList(2, this.destCountryId)
} else if (this.countryIdList != "" && this.destCityIdList == "" && this.destWarehouseIdList == "") {
getRegionList(2, this.countryIdList)
.then(({ data }) => {
this.AddressCity = data
})
......@@ -743,23 +745,23 @@ export default {
// });
}
},
objectiveId: {
destCityIdList: {
deep: true, //深度监听
handler() {
this.AddressTown = []
this.destWarehouseId = ""
this.destWarehouseIdList = ""
this.findBycityCode()
if (this.objectiveId != "" && this.destCountryId != "" && this.destWarehouseId == "") {
if (this.destCityIdList != "" && this.countryIdList != "" && this.destWarehouseIdList == "") {
//获取当前城市值id，获取该城市下区域
getRegionList(3, this.objectiveId)
getRegionList(3, this.destCityIdList)
.then(({ data }) => {
this.AddressTown = data
})
.catch((error) => {
console.log(error)
})
} else if (this.destCountryId == "" && this.objectiveId == "" && this.destWarehouseId == "") {
} else if (this.countryIdList == "" && this.destCityIdList == "" && this.destWarehouseIdList == "") {
getRegionList(5, 5)
.then(({ data }) => {
this.AddressTown = data
......@@ -767,8 +769,8 @@ export default {
.catch((error) => {
console.log(error)
})
} else if (this.destCountryId != "" && this.objectiveId == "" && this.destWarehouseId == "") {
getRegionList(2, this.destCountryId)
} else if (this.countryIdList != "" && this.destCityIdList == "" && this.destWarehouseIdList == "") {
getRegionList(2, this.countryIdList)
.then(({ data }) => {
this.AddressCity = data
})
......@@ -783,7 +785,7 @@ export default {
console.log(error)
})
}
// else if(this.objectiveId!="" && this.objectiveId=="" ){
// else if(this.destCityIdList!="" && this.destCityIdList=="" ){
// getRegionList(5, 5).then(({data}) => {
// this.AddressTown = data;
......@@ -793,19 +795,19 @@ export default {
// }
}
},
destWarehouseId: {
destWarehouseIdList: {
deep: true, //深度监听
handler() {
if (this.objectiveId != "" && this.destCountryId != "" && this.destWarehouseId == "") {
if (this.destCityIdList != "" && this.countryIdList != "" && this.destWarehouseIdList == "") {
//获取当前城市值id，获取该城市下区域
getRegionList(3, this.objectiveId)
getRegionList(3, this.destCityIdList)
.then(({ data }) => {
this.AddressTown = data
})
.catch((error) => {
console.log(error)
})
} else if (this.destCountryId != "" && this.objectiveId == "" && this.destWarehouseId == "") {
} else if (this.countryIdList != "" && this.destCityIdList == "" && this.destWarehouseIdList == "") {
getRegionList(5, 5)
.then(({ data }) => {
this.AddressTown = data
......@@ -814,7 +816,7 @@ export default {
console.log(error)
})
}
// else if(this.objectiveId=="" && this.destWarehouseId==""){
// else if(this.destCityIdList=="" && this.destWarehouseIdList==""){
// getRegionList(5, 5).then(({data}) => {
// this.AddressTown = data;
// })
......@@ -900,13 +902,18 @@ export default {
// 供应商
getSupplierPage({ pageNo: "1", pageSize: "10000" }).then((res) => {
const { data } = res;
this.allSupplier = data.list;
this.allSupplier = data.list.map((item) => {
if (item.companyType) {
item.companyTypes = item.companyType.split(",");
}
return item;
});
});
},
findByprovinceCode() {
//获取当前省份值id，获取该省份下城市 destCountryId provinceCode
//获取当前省份值id，获取该省份下城市 countryIdList provinceCode
getRegionList(2, this.destCountryId)
getRegionList(2, this.countryIdList)
.then(({ data }) => {
this.AddressCity = data
})
......@@ -916,7 +923,7 @@ export default {
},
findBycityCode() {
//获取当前城市值id，获取该城市下区域
getRegionList(3, this.objectiveId)
getRegionList(3, this.destCityIdList)
.then(({ data }) => {
this.AddressTown = data
......@@ -963,6 +970,14 @@ export default {
let params = { ...this.queryParams };
params.transportTypeList = ["1", "2"];
this.addBeginAndEndTime(params, this.dateRangeCreateTime, "createTime");
this.addBeginAndEndTimeNew(params, params.bargeBeginTime, 'barge');// 预计驳船时间
this.addBeginAndEndTimeNew(params, params.sailBeginTime, 'sail');// 预计开船时间
this.addBeginAndEndTimeNew(params, params.ladingBillBeginTime, 'ladingBill');// 截补料时间
this.addBeginAndEndTimeNew(params, params.customsBeginTime, 'customs');// VGM提交时间
this.addBeginAndEndTimeNew(params, params.cutOffBeginTime, 'cutOff');// 截关时间
this.addBeginAndEndTimeNew(params, params.clEstBeginTime, 'clEst');// 预计清关时间
this.addBeginAndEndTimeNew(params, params.bgRealShipBeginTime, 'bgRealShip');// 实际开船时间
this.addBeginAndEndTimeNew(params, params.estBeginTime, 'est');// 预计到港时间
// 执行查询
getboxPage(params).then((response) => {
this.list = response.data.list;
......@@ -1030,6 +1045,14 @@ export default {
params.pageSize = undefined;
params.transportTypeList = ["1", "2"];
this.addBeginAndEndTime(params, this.dateRangeCreateTime, "createTime");
this.addBeginAndEndTimeNew(params, params.bargeBeginTime, 'barge');// 预计驳船时间
this.addBeginAndEndTimeNew(params, params.sailBeginTime, 'sail');// 预计开船时间
this.addBeginAndEndTimeNew(params, params.ladingBillBeginTime, 'ladingBill');// 截补料时间
this.addBeginAndEndTimeNew(params, params.customsBeginTime, 'customs');// VGM提交时间
this.addBeginAndEndTimeNew(params, params.cutOffBeginTime, 'cutOff');// 截关时间
this.addBeginAndEndTimeNew(params, params.clEstBeginTime, 'clEst');// 预计清关时间
this.addBeginAndEndTimeNew(params, params.bgRealShipBeginTime, 'bgRealShip');// 实际开船时间
this.addBeginAndEndTimeNew(params, params.estBeginTime, 'est');// 预计到港时间
// 执行导出
this.$modal
.confirm(this.$t("是否确认导出所有出货数据项?"))
......
src/views/ecw/box/shippingAir/nodePage/agent.vue
View file @ 81be4b1e
......@@ -3,7 +3,7 @@
<el-form ref="agentForm" :model="agentObj" :rules="rules" label-width="120px">
<el-form-item :label="$t('代理商Agent')" prop="agentId">
<supplierOutSelect v-model="agentObj.agentId" :companyType="'1'" :areaType="1" :placeholder="$t('请选择代理商')" :allSupplier="this.$attrs.allSupplier" />
<el-button v-hasPermi="['ecw:supplier:query']" type="text" style="font-size: 13px; margin-left: 240px;" @click="SupplierDetail">{{$t('查看代理商详情')}}</el-button>
<el-button v-if="agentObj.agentId" v-hasPermi="['ecw:supplier:query']" type="text" style="font-size: 13px; margin-left: 240px;" @click="SupplierDetail">{{$t('查看代理商详情')}}</el-button>
</el-form-item>
</el-form>
<el-row class="operate-button">
......
src/views/ecw/box/shippingSea/nodePage/agent.vue
View file @ 81be4b1e
......@@ -3,7 +3,7 @@
<el-form ref="agentForm" :model="agentObj" :rules="rules" label-width="120px">
<el-form-item :label="$t('代理商Agent')" prop="agentId">
<supplierOutSelect v-model="agentObj.agentId" :companyType="'1'" :areaType="1" :placeholder="$t('请选择代理商')" :allSupplier="this.$attrs.allSupplier" />
<el-button v-hasPermi="['ecw:supplier:query']" type="text" style="font-size: 13px; margin-left: 240px;" @click="SupplierDetail">{{$t('查看代理商详情')}}</el-button>
<el-button v-hasPermi="['ecw:supplier:query']" v-if="agentObj.agentId" type="text" style="font-size: 13px; margin-left: 240px;" @click="SupplierDetail">{{$t('查看代理商详情')}}</el-button>
</el-form-item>
</el-form>
<el-row class="operate-button">
......
src/views/ecw/box/shippingSea/nodePage/common/supplierSelect.vue
View file @ 81be4b1e
......@@ -43,8 +43,8 @@ export default {
(item) => item.areaType == this.areaType
);
if(this.areaType == 1 || !this.companyType) return allSupplier;
return allSupplier.filter((item) =>
item.companyTypes.includes(this.companyType)
return allSupplier?.filter((item) =>
item.companyTypes?.includes(this.companyType)
);
},
},
......
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