Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
Elements-SY
114be4f6 1 parent 72bcfea7

UI fixed

Inline Side-by-side
Showing 22 changed files with 209 additions and 191 deletions
......@@ -261,7 +261,7 @@ export default {
size: 100,
allWeight: 0,
allQty: 0,
tableHeight: 300,
tableHeight: null,
dialogVisible: false,
shiftKey: false,
createDate: null,
......@@ -282,14 +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;
}
})
// 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 = []
......@@ -311,6 +311,7 @@ export default {
this.shiftKey = false;
}
});
this.tableHeight = window.innerHeight - this.$refs.form.$el.offsetHeight - 60
},
methods: {
//查询条件
......
......@@ -95,7 +95,7 @@ export default {
colData: {},
curPage: 1,
total: 0,
tableHeight: 300,
tableHeight: null,
open: false,
loading: false,
};
......@@ -104,17 +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;
}
})
// 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()
......
......@@ -187,7 +187,7 @@ export default {
// 总条数
total: 0,
//table高度
tableHeight: 300,
tableHeight: null,
// 原航班规则数据
sourceFlightRulesList: [],
//目的航班数据
......@@ -247,16 +247,17 @@ 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;
}
})
// 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();
......
......@@ -99,21 +99,21 @@ export default {
},//表单规则
dialogVisible: false,
total: 0,
tableHeight: 300,
tableHeight: null,
loading: false,
tableLoading: false,
};
},
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;
}
})
// 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) {
......@@ -121,6 +121,7 @@ export default {
}
},
mounted() {
this.tableHeight = window.innerHeight - this.$refs.preReviewOptions.offsetHeight - 300
},
methods: {
//搜索
......
......@@ -53,7 +53,7 @@
</el-switch>
</div>
</el-form>
<el-table height="300" highlight-current-row border stripe v-loading="loading" :data="tableData">
<el-table max-height="500" highlight-current-row border stripe v-loading="loading" :data="tableData">
<el-table-column label="运单号" align="center" prop="waybillNo" />
<el-table-column label="申报类别" align="center" prop="typeName" />
<el-table-column label="件数" align="center" prop="qty" width="70" />
......
......@@ -466,7 +466,7 @@ export default {
//总条数
total: 0,
//表格高度
tableHeight: 250,
tableHeight: null,
//新增修改查看规则弹出层
open: false,
//是否显示查看目的航班弹出层
......@@ -482,14 +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;
}
})
// 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 = []
......@@ -510,6 +510,7 @@ export default {
this.shiftKey = false;
}
});
this.tableHeight = window.innerHeight - this.$refs.queryForm.$el.offsetHeight - 120;
},
methods: {
//输入航班号后
......
......@@ -81,7 +81,7 @@ export default {
checkData: [],
fileList: [],
errorData: [],
tableHeight: 300,
tableHeight: null,
totalCount: 0,
openStatus: '',
loading: false,
......@@ -89,16 +89,17 @@ 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;
}
})
// 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: {
......
......@@ -81,7 +81,7 @@ export default {
checkData: [],
fileList: [],
errorData: [],
tableHeight: 300,
tableHeight: null,
totalCount: 0,
openStatus: '',
loading: false,
......@@ -89,16 +89,17 @@ 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;
}
})
// 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: {
......
......@@ -64,23 +64,24 @@ export default {
tableData: [],
tableHeader: this.tableHeaders['goodsStationFlight'],
checkData: [],
tableHeight: 300,
tableHeight: null,
totalCount: 0,
loading: false,
open: false,
}
},
created() {
this.$nextTick(()=>{
let height = window.innerHeight - this.$refs.goodsStationFlight.$el.offsetHeight - 200;
if(height < 300){
this.tableHeight = 300;
}else{
this.tableHeight = height;
}
})
// 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: {
......
......@@ -353,7 +353,7 @@ export default {
limitSize: 100, //无限制-1
page: 1,
progress: 0,
tableHeight: 250,
tableHeight: null,
dialogVisible: false,
openView: false,
openTransfer: false,
......@@ -368,14 +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;
}
})
// this.$nextTick(()=>{
// let height = window.innerHeight - this.$refs.cargoForm.$el.offsetHeight - 50;
// if(height < 300){
// this.tableHeight = 300;
// }else{
// this.tableHeight = height;
// }
// })
},
activated() {
......@@ -449,6 +449,7 @@ export default {
this.shiftKey = false;
}
});
this.tableHeight = window.innerHeight - this.$refs.cargoForm.$el.offsetHeight - 50
},
watch: {
$route: {
......
......@@ -96,7 +96,7 @@ export default {
totalWeight: 0,//航班总重量
allocationWeight: 0,//航班已配重量
type: "",
tableHeight: 300,
tableHeight: null,
total: 0,
loading: false,
};
......@@ -104,19 +104,20 @@ 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;
}
})
// 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: {
......
......@@ -78,7 +78,7 @@ export default {
tableData: [],
errorData: [],
tableHeaders: this.tableHeaders['flightToArea'],
tableHeight: 300,
tableHeight: null,
total: 0,
flightType: [],
form: {
......@@ -98,16 +98,17 @@ 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;
}
})
// 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() {
......
......@@ -129,7 +129,7 @@ export default {
tableHeader: this.tableHeaders['preMdeSelect'],
accsDate: [],
valueFormat: "yyyy-MM-dd",
tableHeight: 250,
tableHeight: null,
tableLoading: false,
downloading: false,
totalCount: 0,
......@@ -137,16 +137,17 @@ 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;
}
})
// 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: {
......
......@@ -107,16 +107,17 @@ 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;
}
})
// this.$nextTick(()=>{
// let height = window.innerHeight - this.$refs.reportForm.$el.offsetHeight - 240;
// if(height < 300){
// this.tableHeight = 300;
// }else{
// this.tableHeight = height;
// }
// })
},
activated() {
this.tableHeight = window.innerHeight - this.$refs.reportForm.$el.offsetHeight - 240
this.select()
},
mounted() {
......
......@@ -79,7 +79,7 @@ export default {
tableData: [],
errorData: [],
tableHeaders: this.tableHeaders['ursaToArea'],
tableHeight: 300,
tableHeight: null,
total: 0,
flightType: [],
form: {
......@@ -99,16 +99,17 @@ 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;
}
})
// 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() {
......
......@@ -204,7 +204,7 @@ export default {
addDictionary: {},//选择数据
nowSelect: [],
tableName: '',
tableHeight: 300,
tableHeight: null,
total: 0,
status: null,
loading: false,
......@@ -213,14 +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;
}
})
// 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) {
......@@ -228,7 +228,7 @@ export default {
// }
},
mounted() {
this.tableHeight = window.innerHeight - this.$refs.dictForm.$el.offsetHeight - 270
},
filters: {
// 是否为ET86航线
......
......@@ -77,23 +77,24 @@ export default {
roleFormDisabled: false,
tableLoading: false,
total: 0,
tableHeight: 300
tableHeight: null
};
},
created() {
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;
}
})
// 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();
......
......@@ -71,23 +71,24 @@ export default {
serviceCodeList: []
},
dialogStatus: 'add',
tableHeight: 300,
tableHeight: null,
totalCount: 0,
dialogVisible: false,
loading: false,
}
},
created() {
this.$nextTick(()=>{
let height = window.innerHeight - this.$refs.supserAllocation.$el.offsetHeight - 250;
if(height < 300){
this.tableHeight = 300;
}else{
this.tableHeight = height;
}
})
// 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: {
......
......@@ -104,23 +104,24 @@ export default {
drawerTitle: "",
total: 0,
loading: false,
tableHeight: 300
tableHeight: null
};
},
created() {
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;
}
})
// 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();
......
......@@ -55,23 +55,24 @@ export default {
},
data: [],
tableHeader: this.tableHeaders['archiveData'],
tableHeight: 300,
tableHeight: null,
total: 0,
loading: false,
}
},
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;
}
})
// 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) {
......
......@@ -115,21 +115,21 @@ export default {
selectDate: null,
createTimes: [],
total: 0,
tableHeight: 300,
tableHeight: null,
loading: false,
valueFormat: "yyyy-MM-dd",
};
},
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;
}
})
// 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();
......
......@@ -96,7 +96,7 @@ export default {
children: 'children',
label: 'label'
},
tableHeight: 300,
tableHeight: null,
total: 0,
loading: false
}
......@@ -104,19 +104,20 @@ 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;
}
})
// 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() {
......