Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
Elements-SY
714a2354 2 parents 79c21da6 724475bc

Merge branch 'test' into uat

Inline Side-by-side
Showing 22 changed files with 233 additions and 83 deletions
......@@ -3,20 +3,20 @@
<el-form ref="form" v-model="formData" class="form-header" label-position="right" label-width="auto" size="small"
@submit.native.prevent>
<el-row type="flex" style="flexWrap: wrap !important">
<el-col :span="8">
<el-col :span="6">
<el-form-item label="ACCS原航班日期">
<el-date-picker class="formItem" type="daterange" range-separator="至" start-placeholder="开始日期"
end-placeholder="结束日期" v-model="fltDate" :value-format="valueFormat" clearable>
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="6">
<el-form-item label="ACCS原航班号">
<el-input v-model="fltNo" placeholder="请输入ACCS原航班号" class="formItem" clearable @change="fltNoChange">
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="6">
<el-form-item label="海关回执状态">
<el-select placeholder="不限" v-model="formData.customsReceiptStatusId" class="formItem" multiple clearable>
<el-option v-for="item in selectData.findConditionData
......@@ -26,7 +26,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="6">
<el-form-item label="货物状态">
<el-select placeholder="不限" v-model="formData.statusId" class="formItem" clearable>
<el-option v-for="item in selectData.findConditionData.cargoStatus" :label="item.chineseName"
......@@ -35,7 +35,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="6">
<el-form-item label="ACCSpool">
<el-select placeholder="不限" v-model="formData.accsPool" class="formItem" clearable>
<el-option value="Pre-MDE" key="Pre-MDE">
......@@ -47,7 +47,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="6">
<el-form-item label="申报类别">
<el-select placeholder="不限" v-model="formData.typeId" class="formItem" clearable>
<el-option v-for="item in selectData.findConditionData.cargoType" :label="item.chineseName"
......@@ -56,7 +56,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="6">
<el-form-item label="服务类型">
<el-select placeholder="不限" v-model="formData.serviceTypeId" class="formItem" clearable>
<el-option v-for="item in selectData.findConditionData.cargoServiceType" :label="item.chineseName"
......@@ -66,7 +66,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="6">
<el-form-item label="重量区间">
<el-row>
<el-col :span="10">
......@@ -82,7 +82,7 @@
</el-row>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="6">
<el-form-item label="件数区间">
<el-row>
<el-col :span="10">
......@@ -98,26 +98,26 @@
</el-row>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="6">
<el-form-item label="取件日期">
<el-date-picker class="formItem" v-model="formData.pickUpDate" type="date" placeholder="选择日期"
:value-format="valueFormat" clearable>
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="6">
<el-form-item label="URSA">
<el-input class="formItem" type="textarea" placeholder="S_;P_;E2" v-model="ursa" :rows="1" clearable>
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="6">
<el-form-item label="始发站">
<el-input class="formItem" type="textarea" placeholder="PVG;PEK" v-model="siteName" :rows="1" clearable>
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="6">
<el-form-item>
<template slot="label">
<div style="display:inline-block">ACCS航线
......@@ -134,9 +134,9 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="6">
<el-form-item label="运单号">
<el-input class="formItem" type="textarea" :rows="1" placeholder="例: xxx;xxx;" :maxlength="12000"
<el-input class="formItem" type="textarea" :rows="4" placeholder="请输入运单号（回车分割）" :maxlength="12000"
v-model="formData.waybillNo" clearable></el-input>
</el-form-item>
</el-col>
......@@ -282,6 +282,14 @@ export default {
if (this.$store.state.tagsView.cachedViews.length == 0) {
this.select();
}
this.$nextTick(()=>{
let height = window.innerHeight - this.$refs.form.$el.offsetHeight - 60;
if(height < 300){
this.tableHeight = 300;
}else{
this.tableHeight = height;
}
})
},
activated() {
this.tableSelection = []
......@@ -303,7 +311,6 @@ export default {
this.shiftKey = false;
}
});
this.tableHeight = window.innerHeight - this.$refs.form.$el.offsetHeight - 60;
},
methods: {
//查询条件
......
......@@ -188,12 +188,15 @@ export default {
this.msgSuccess('货物配舱成功')
this.cleaerForm();
this.$emit("dialogBeforeClose", { close: false, reload: true });
} else if (res.code === 203) {
}
else if (res.code === 203) {
this.reallocationFlight(res.msg, 'notInWhite')
} else {
}else {
this.msgWarning(res.msg)
this.loading = false
}
}).catch(() => {
this.loading = false;
});
}).catch(() => {
this.msgSuccess('配舱已取消')
......
......@@ -104,9 +104,17 @@ export default {
if (this.$store.state.tagsView.cachedViews.length == 0) {
this.getList();
}
this.$nextTick(()=>{
let height = window.innerHeight - this.$refs.flightAllocForm.$el.offsetHeight - 200;
if(height < 300){
this.tableHeight = 300;
}else{
this.tableHeight = height;
}
})
},
mounted() {
this.tableHeight = window.innerHeight - this.$refs.flightAllocForm.$el.offsetHeight - 200;
},
activated() {
this.getList()
......
......@@ -247,9 +247,16 @@ export default {
if (this.$store.state.tagsView.cachedViews.length == 0) {
this.findSourceFlightRules();
}
this.$nextTick(()=>{
let height = window.innerHeight - this.$refs.queryForm.$el.offsetHeight - 200;
if(height < 300){
this.tableHeight = 300;
}else{
this.tableHeight = height;
}
})
},
mounted() {
this.tableHeight = window.innerHeight - this.$refs.queryForm.$el.offsetHeight - 200;
},
activated() {
this.findSourceFlightRules();
......
......@@ -106,6 +106,14 @@ export default {
},
created() {
this.preQuery(1)
this.$nextTick(()=>{
let height = window.innerHeight - this.$refs.preReviewOptions.offsetHeight - 300;
if(height < 300){
this.tableHeight = 300;
}else{
this.tableHeight = height;
}
})
},
activated() {
if (this.flightData.length > 0) {
......@@ -113,7 +121,6 @@ export default {
}
},
mounted() {
this.tableHeight = window.innerHeight - this.$refs.preReviewOptions.offsetHeight - 300;
},
methods: {
//搜索
......
......@@ -482,6 +482,14 @@ export default {
this.findFltConditionData();
this.findAllFltData();
}
this.$nextTick(()=>{
let height = window.innerHeight - this.$refs.queryForm.$el.offsetHeight - 120;
if(height < 300){
this.tableHeight = 300;
}else{
this.tableHeight = height;
}
})
},
activated() {
this.ids = []
......@@ -502,7 +510,6 @@ export default {
this.shiftKey = false;
}
});
this.tableHeight = window.innerHeight - this.$refs.queryForm.$el.offsetHeight - 120;
},
methods: {
//输入航班号后
......
......@@ -89,10 +89,16 @@ export default {
}
},
created() {
this.$nextTick(()=>{
let height = window.innerHeight - this.$refs.goodsStation.$el.offsetHeight - 200;
if(height < 300){
this.tableHeight = 300;
}else{
this.tableHeight = height;
}
})
},
mounted() {
this.tableHeight = window.innerHeight - this.$refs.goodsStation.$el.offsetHeight - 200;
this.selection(1)
},
watch: {
......
......@@ -89,10 +89,16 @@ export default {
}
},
created() {
this.$nextTick(()=>{
let height = window.innerHeight - this.$refs.goodsStation.$el.offsetHeight - 200;
if(height < 300){
this.tableHeight = 300;
}else{
this.tableHeight = height;
}
})
},
mounted() {
this.tableHeight = window.innerHeight - this.$refs.goodsStation.$el.offsetHeight - 200;
this.selection(1)
},
watch: {
......
......@@ -71,9 +71,16 @@ export default {
}
},
created() {
this.$nextTick(()=>{
let height = window.innerHeight - this.$refs.goodsStationFlight.$el.offsetHeight - 200;
if(height < 300){
this.tableHeight = 300;
}else{
this.tableHeight = height;
}
})
},
mounted() {
this.tableHeight = window.innerHeight - this.$refs.goodsStationFlight.$el.offsetHeight - 200;
this.selection(1)
},
watch: {
......
......@@ -2,38 +2,14 @@
<div class="cargoPage">
<el-form ref="cargoForm" class="form-header" label-position="right" label-width="auto" size="small" :model="formData">
<el-row type="flex" style="flexWrap: wrap !important">
<el-col :span="8">
<el-col :span="6">
<el-form-item label="配舱航班日期">
<el-date-picker class="formItem" v-model="cargoPlaneTime" type="daterange" range-separator="至"
start-placeholder="开始日期" end-placeholder="结束日期" :value-format="valueFormat" clearable>
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="运单号">
<el-input ref='userInfo' type="textarea" v-model="formData.waybillNo" class="formItem"
placeholder="例: xxx;xxx;" :rows="1" :maxlength="12000" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="配载航班号">
<el-input type="textarea" v-model="cargoPlaneNo" class="formItem" placeholder="AC001;AC002" :rows="1"
clearable @change="planeNoChange"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="URSA">
<el-input type="textarea" v-model="ursa" class="formItem" placeholder="S_;P_;E2" :rows="1" clearable>
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="始发站">
<el-input type="textarea" v-model="siteName" class="formItem" placeholder="PVG;PEK" :rows="1" clearable>
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="6">
<el-form-item label="海关回执状态">
<el-select v-model="formData.customsReceiptStatusId" class="formItem" filterable multiple clearable
placeholder="不限">
......@@ -44,7 +20,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="6">
<el-form-item label="申报类别">
<el-select placeholder="不限" v-model="formData.typeId" class="formItem" clearable>
<el-option v-for="item in findConditionData.cargoType" :label="item.chineseName" :value="item.id"
......@@ -53,7 +29,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="6">
<el-form-item label="服务类型">
<el-select v-model="formData.serviceTypeId" class="formItem" filterable multiple clearable placeholder="不限">
<el-option v-for="item in findConditionData.cargoServiceType" :label="item.chineseName" :value="item.id"
......@@ -63,35 +39,59 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="运单号">
<el-input ref='userInfo' type="textarea" v-model="formData.waybillNo" class="formItem"
placeholder="请输入运单号（回车间隔）" :rows="4" :maxlength="12000" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="配载航班号">
<el-input type="textarea" v-model="cargoPlaneNo" class="formItem" placeholder="AC001;AC002" :rows="4"
clearable @change="planeNoChange"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="URSA">
<el-input type="textarea" v-model="ursa" class="formItem" placeholder="S_;P_;E2" :rows="4" clearable>
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="始发站">
<el-input type="textarea" v-model="siteName" class="formItem" placeholder="PVG;PEK" :rows="4" clearable>
</el-input>
</el-form-item>
</el-col>
<el-col v-show="formShow">
<el-row type="flex" style="flexWrap: wrap !important">
<el-col :span="8">
<el-col :span="6">
<el-form-item label="ACCS原航班日期">
<el-date-picker class="formItem" v-model="flightTime" type="daterange" range-separator="至"
start-placeholder="开始日期" end-placeholder="结束日期" :value-format="valueFormat" clearable>
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="6">
<el-form-item label="ACCS原航班号">
<el-input type="text" v-model="fltNo" class="formItem" placeholder="请输入ACCS航班号" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="6">
<el-form-item label="取件日期">
<el-date-picker class="formItem" v-model="formData.pickUpDate" type="date" placeholder="选择日期"
:value-format="valueFormat" clearable>
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="6">
<el-form-item label="创建日期">
<el-date-picker class="formItem" v-model="createDate" type="daterange" range-separator="至"
start-placeholder="开始日期" end-placeholder="结束日期" :value-format="valueFormat" clearable>
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="6">
<el-form-item label="ACCSpool">
<el-select placeholder="不限" v-model="formData.accsPool" class="formItem" clearable>
<el-option value="Pre-MDE" key="Pre-MDE">
......@@ -103,7 +103,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="6">
<el-form-item label="货物状态">
<el-select placeholder="不限" v-model="formData.statusId" class="formItem" filterable clearable>
<el-option v-for="item in findConditionData.cargoStatus" :label="item.chineseName" :value="item.id"
......@@ -112,7 +112,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="6">
<el-form-item label="是否自动">
<el-select placeholder="不限" v-model="formData.allocationTypeId" class="formItem" clearable>
<el-option label="手动" value="1"> </el-option>
......@@ -120,7 +120,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="6">
<el-form-item label="配舱状态">
<el-select placeholder="不限" v-model="formData.hasFlight" class="formItem" clearable>
<el-option label="已配" value="1"> </el-option>
......@@ -128,7 +128,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="6">
<el-form-item>
<template slot="label">
<div style="display:inline-block">配载航线
......@@ -145,7 +145,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="6">
<el-form-item label="预审状态">
<el-select v-model="formData.preStatus" placeholder="不限" class="formItem" clearable multiple>
<el-option v-for="item in findConditionData.preQualificationStatus" :label="item == '' ? '非预审' : item"
......@@ -153,10 +153,10 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="6">
<el-form-item label="发件人账号">
<el-input ref='userInfo' type="textarea" v-model="formData.shipperAccount" class="formItem"
placeholder="请输入发件人账号（;间隔）" :rows="1" :maxlength="12000" clearable></el-input>
placeholder="请输入发件人账号（;间隔）" :rows="4" :maxlength="12000" clearable></el-input>
</el-form-item>
</el-col>
</el-row>
......@@ -368,6 +368,14 @@ export default {
this.tableHeader = this.tableHeaders['cargo']
}
this.select(0,'create')
this.$nextTick(()=>{
let height = window.innerHeight - this.$refs.cargoForm.$el.offsetHeight - 50;
if(height < 300){
this.tableHeight = 300;
}else{
this.tableHeight = height;
}
})
},
activated() {
......@@ -441,7 +449,6 @@ export default {
this.shiftKey = false;
}
});
this.tableHeight = window.innerHeight - this.$refs.cargoForm.$el.offsetHeight - 50
},
watch: {
$route: {
......
......@@ -104,12 +104,19 @@ export default {
created() {
this.selectData.fltDate = this.nowDate();
this.getFltKindId()
this.$nextTick(()=>{
let height = window.innerHeight - this.$refs.card1.$el.offsetHeight - this.$refs.indexForm.$el.offsetHeight - 350;
if(height < 300){
this.tableHeight = 300;
}else{
this.tableHeight = height;
}
})
},
// activated() {
// this.getFlight()
// },
mounted() {
this.tableHeight = window.innerHeight - this.$refs.card1.$el.offsetHeight - this.$refs.indexForm.$el.offsetHeight - 350
this.getFlight()
},
methods: {
......
......@@ -97,9 +97,16 @@ export default {
};
},
created() {
this.$nextTick(()=>{
let height = window.innerHeight - this.$refs.selectForm.$el.offsetHeight - 170;
if(height < 300){
this.tableHeight = 300;
}else{
this.tableHeight = height;
}
})
},
mounted() {
this.tableHeight = window.innerHeight - this.$refs.selectForm.$el.offsetHeight - 170;
this.selection(1)
},
activated() {
......
......@@ -137,9 +137,16 @@ export default {
},
created() {
this.selectOptionData()
this.$nextTick(()=>{
let height = window.innerHeight - this.$refs.preMdeSelectForm.$el.offsetHeight - 150;
if(height < 300){
this.tableHeight = 300;
}else{
this.tableHeight = height;
}
})
},
mounted() {
this.tableHeight = window.innerHeight - this.$refs.preMdeSelectForm.$el.offsetHeight - 150;
this.select(0)
},
watch: {
......
......@@ -3,7 +3,7 @@
<el-form ref="reportForm" class="form-header" :model="formData" label-position="right" label-width="auto"
size="small">
<el-row>
<el-col :span="6">
<el-col :span="5">
<el-form-item label="取件日期">
<el-date-picker class="formItem" v-model="formData.pickUpDate" type="date" placeholder="选择日期"
value-format="yyyy-MM-dd" clearable>
......@@ -106,12 +106,19 @@ export default {
this.formData.pickUpDate = this.nowDate()
this.getOption()
this.select()
this.$nextTick(()=>{
let height = window.innerHeight - this.$refs.reportForm.$el.offsetHeight - 240;
if(height < 300){
this.tableHeight = 300;
}else{
this.tableHeight = height;
}
})
},
activated() {
this.select()
},
mounted() {
this.tableHeight = window.innerHeight - this.$refs.reportForm.$el.offsetHeight - 240
},
methods: {
getOption() {
......
......@@ -98,9 +98,16 @@ export default {
};
},
created() {
this.$nextTick(()=>{
let height = window.innerHeight - this.$refs.selectForm.$el.offsetHeight - 170;
if(height < 300){
this.tableHeight = 300;
}else{
this.tableHeight = height;
}
})
},
mounted() {
this.tableHeight = window.innerHeight - this.$refs.selectForm.$el.offsetHeight - 170;
this.selection(1)
},
activated() {
......
......@@ -213,6 +213,14 @@ export default {
},
created() {
this.dictNameSelect()
this.$nextTick(()=>{
let height = window.innerHeight - this.$refs.dictForm.$el.offsetHeight - 270;
if(height < 300){
this.tableHeight = 300;
}else{
this.tableHeight = height;
}
})
},
activated() {
// if (this.$store.state.tagsView.cachedViews.length > 0) {
......@@ -220,7 +228,7 @@ export default {
// }
},
mounted() {
this.tableHeight = window.innerHeight - this.$refs.dictForm.$el.offsetHeight - 270
},
filters: {
// 是否为ET86航线
......
......@@ -84,9 +84,16 @@ export default {
if (this.$store.state.tagsView.cachedViews.length == 0) {
this.selectRoleList();
}
this.$nextTick(()=>{
let height = window.innerHeight - this.$refs.selectionRoleForm.$el.offsetHeight - 250;
if(height < 300){
this.tableHeight = 300;
}else{
this.tableHeight = height;
}
})
},
mounted() {
this.tableHeight = window.innerHeight - this.$refs.selectionRoleForm.$el.offsetHeight - 250
},
activated() {
this.selectRoleList();
......
......@@ -3,10 +3,10 @@
<el-form class="form-header" ref="dictForm" label-width="auto" label-position="left" style="margin-bottom:10px"
@submit.native.prevent size="small">
<el-row>
<el-col :span="8">
<el-col :span="6">
<el-form-item label="发件人账号">
<el-input type="textarea" v-model="selectionData.shipperAccount" placeholder="请输入发件人账号，多个以“;”分割"
maxlength="3000" rows="1" />
maxlength="3000" rows="4" />
</el-form-item>
</el-col>
</el-row>
......@@ -78,9 +78,16 @@ export default {
}
},
created() {
this.$nextTick(()=>{
let height = window.innerHeight - this.$refs.supserAllocation.$el.offsetHeight - 250;
if(height < 300){
this.tableHeight = 300;
}else{
this.tableHeight = height;
}
})
},
mounted() {
this.tableHeight = window.innerHeight - this.$refs.supserAllocation.$el.offsetHeight - 250
this.selection(1)
},
methods: {
......
......@@ -111,9 +111,16 @@ export default {
if (this.$store.state.tagsView.cachedViews.length == 0) {
this.selectUser();
}
this.$nextTick(()=>{
let height = window.innerHeight - this.$refs.selectionUserForm.$el.offsetHeight - 250;
if(height < 300){
this.tableHeight = 300;
}else{
this.tableHeight = height;
}
})
},
mounted() {
this.tableHeight = window.innerHeight - this.$refs.selectionUserForm.$el.offsetHeight - 250;
},
activated() {
this.selectUser();
......
......@@ -62,9 +62,16 @@ export default {
},
created() {
this.selectLog()
this.$nextTick(()=>{
let height = window.innerHeight - this.$refs.archiveDataForm.$el.offsetHeight - 200;
if(height < 300){
this.tableHeight = 300;
}else{
this.tableHeight = height;
}
})
},
mounted() {
this.tableHeight = window.innerHeight - this.$refs.archiveDataForm.$el.offsetHeight - 200
},
methods: {
selectLog(val) {
......
......@@ -122,6 +122,14 @@ export default {
},
created() {
this.selectForm.createTime = this.nowDate();
this.$nextTick(()=>{
let height = window.innerHeight - this.$refs.dmLogForm.$el.offsetHeight - 130;
if(height < 300){
this.tableHeight = 300;
}else{
this.tableHeight = height;
}
})
},
activated() {
this.selectDMData();
......@@ -130,7 +138,6 @@ export default {
this.data = [];
},
mounted() {
this.tableHeight = window.innerHeight - this.$refs.dmLogForm.$el.offsetHeight - 130;
},
methods: {
//数据查询
......
......@@ -104,12 +104,19 @@ export default {
created() {
this.getModule()
this.selectLog(1)
this.$nextTick(()=>{
let height = window.innerHeight - this.$refs.operationLogForm.$el.offsetHeight - 240;
if(height < 300){
this.tableHeight = 300;
}else{
this.tableHeight = height;
}
})
},
activated() {
this.selectLog();
},
mounted() {
this.tableHeight = window.innerHeight - this.$refs.operationLogForm.$el.offsetHeight - 240
},
methods: {
getModule() {
......