Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
Elements-SY
6fb45477 1 parent 2b9acb98

【IMAC-ET86】配舱设置-新增ET86配舱

Inline Side-by-side
Showing 23 changed files with 83 additions and 84 deletions
......@@ -261,7 +261,7 @@ export default {
size: 100,
allWeight: 0,
allQty: 0,
tableHeight: null,
tableHeight: 300,
dialogVisible: false,
shiftKey: false,
createDate: null,
......@@ -303,7 +303,7 @@ export default {
this.shiftKey = false;
}
});
this.tableHeight = window.innerHeight - this.$refs.form.$el.offsetHeight - 60
// this.tableHeight = window.innerHeight - this.$refs.form.$el.offsetHeight - 60;
},
methods: {
//查询条件
......@@ -589,4 +589,4 @@ export default {
margin-top: 0px;
}
}
</style>
\ No newline at end of file
</style>
......
......@@ -149,7 +149,7 @@
<el-input
v-model.trim="queryForm.minWeight"
clearable
placeholder="请输入最小重量"
placeholder="最小重量"
@blur="inputBlur('minWeight')"
></el-input>
<span ref="minWeight" class="el-form-item__error"></span>
......@@ -159,7 +159,7 @@
<el-input
v-model.trim="queryForm.maxWeight"
clearable
placeholder="请输入最大重量"
placeholder="最大重量"
@blur="inputBlur('maxWeight')"
></el-input>
<span ref="maxWeight" class="el-form-item__error"></span>
......@@ -173,7 +173,7 @@
<el-input
v-model.trim="queryForm.minNumOfPieces"
clearable
placeholder="请输入最少件数"
placeholder="最少件数"
@blur="inputBlur('minNumOfPieces')"
></el-input>
<span ref="minNumOfPieces" class="el-form-item__error"></span>
......@@ -183,7 +183,7 @@
<el-input
v-model.trim="queryForm.maxNumOfPieces"
clearable
placeholder="请输入最多件数"
placeholder="最多件数"
@blur="inputBlur('maxNumOfPieces')"
></el-input>
<span ref="maxNumOfPieces" class="el-form-item__error"></span>
......@@ -242,7 +242,7 @@
<el-col :span="24">
<el-form-item label="类别Class">
<el-card shadow="never" style="width: 95%">
<el-card shadow="never">
<el-checkbox-group
v-model="queryForm.checkboxClsssType"
@change="checkboxSingleName"
......@@ -283,7 +283,7 @@
<el-input
v-model.trim="queryForm.minCustomVal"
clearable
placeholder="请输入最小申报价值"
placeholder="最小申报价值"
@blur="inputBlur('minCustomVal')"
></el-input>
<span ref="minCustomVal" class="el-form-item__error"></span>
......@@ -293,7 +293,7 @@
<el-input
v-model.trim="queryForm.maxCustomVal"
clearable
placeholder="请输入最大申报价值"
placeholder="最大申报价值"
@blur="inputBlur('maxCustomVal')"
></el-input>
<span ref="maxCustomVal" class="el-form-item__error"></span>
......@@ -386,18 +386,8 @@ export default {
this.getAllDictData();
this.getEdit();
this.PostFindDestinationFltRuleByFlightNo();
/*
件数：正整数大于0 且小于1000
重量：正数保留3位小数
申报价值: 正数保留2位小数
航班号: 不能输入纯数字或者纯字母，以字母或者数字开头，不能有空格符或者特殊符号
URSA: 不能输入纯数字或者纯字母，以字母或开头，不能有空格符指定特殊符号
^(([1-9]\d+)|([2-9]))$
*/
},
mounted() {
console.log(this.$refs.ruleForm);
},
mounted() {},
filters: {
isEdit: function (value) {
switch (value) {
......@@ -652,7 +642,7 @@ export default {
</script>
<style lang='scss' scoped>
.rowPadding {
padding: 10px 50px;
padding: 10px 0;
font-size: 12px;
}
.label-title{
......
......@@ -98,7 +98,7 @@ export default {
colData: {},
curPage: 1,
total: 0,
tableHeight: null,
tableHeight: 300,
open: false,
loading: false,
};
......@@ -109,7 +109,7 @@ export default {
}
},
mounted() {
this.tableHeight = window.innerHeight - this.$refs.flightAllocForm.$el.offsetHeight - 200
// this.tableHeight = window.innerHeight - this.$refs.flightAllocForm.$el.offsetHeight - 200;
},
activated() {
this.getList()
......
......@@ -720,7 +720,7 @@ export default {
this.infoForm.fltDate = res.data.list.ruleDate
this.infoForm.route = res.data.list.flightRoute
this.infoForm.list.push(this.dataHandle(res.data.list))
console.log(this.infoForm)
console.log('A：',this.infoForm.list)
} else {
this.isEmpty = true
}
......@@ -760,6 +760,7 @@ export default {
res.data.list.forEach(item => {
this.infoForm.list.push(this.dataHandle(item))
})
console.log('B：',this.infoForm.list)
} else {
//航班类型为Purple Tail则显示所有航线维度
this.routeList.forEach(route => {
......@@ -781,6 +782,7 @@ export default {
})
}
})
console.log('C：',this.infoForm.list)
}
} else {
//航线为空，对应航班或航班+日期下的全部维度（需补全未创建维度）
......@@ -803,6 +805,7 @@ export default {
})
}
})
console.log('D：',this.infoForm.list)
}
} else {
//未请求到数据
......@@ -830,6 +833,7 @@ export default {
})
this.infoForm.list.push(this.dataHandle(item))
})
console.log('E：',this.infoForm.list)
} else {
//航班类型Purple Tail展示全部航线维度
let routesStatus = 1
......@@ -853,6 +857,7 @@ export default {
})
}
})
console.log('F：',this.infoForm.list)
}
} else {
//未查询到,插入占位基础数据使用户新建
......@@ -868,6 +873,7 @@ export default {
})
}
})
console.log('G：',this.infoForm.list)
} else {
//航班类型Purple Tail展示全部航线维度
// this.isEmpty = true
......@@ -879,6 +885,7 @@ export default {
routePriority: route.routePriority,
})
})
console.log('H：',this.infoForm.list)
}
}
}).catch(err => {
......@@ -921,6 +928,7 @@ export default {
})
}
})
console.log('I：',this.infoForm.list)
} else {
this.routeList.forEach((route) => {
this.infoForm.list.push({
......@@ -930,6 +938,7 @@ export default {
routePriority: route.routePriority,
})
})
console.log('J：',this.infoForm.list)
}
}).catch(err => {
this.isEmpty = true
......@@ -944,6 +953,7 @@ export default {
routePriority: route.routePriority,
})
})
console.log('K：',this.infoForm.list)
}
}
}
......@@ -975,6 +985,7 @@ export default {
routePriority: item.ordinal
})
})
console.log('L：',this.infoForm.list)
} else {
this.msgWarning('未查询到航线信息！')
this.routeList = []
......
......@@ -187,7 +187,7 @@ export default {
// 总条数
total: 0,
//table高度
tableHeight: null,
tableHeight: 300,
// 原航班规则数据
sourceFlightRulesList: [],
//目的航班数据
......@@ -249,7 +249,7 @@ export default {
}
},
mounted() {
this.tableHeight = window.innerHeight - this.$refs.queryForm.$el.offsetHeight - 200
// this.tableHeight = window.innerHeight - this.$refs.queryForm.$el.offsetHeight - 200;
},
activated() {
this.findSourceFlightRules();
......
......@@ -99,7 +99,7 @@ export default {
},//表单规则
dialogVisible: false,
total: 0,
tableHeight: null,
tableHeight: 300,
loading: false,
tableLoading: false,
};
......@@ -113,7 +113,7 @@ export default {
}
},
mounted() {
this.tableHeight = window.innerHeight - this.$refs.preReviewOptions.offsetHeight - 300
// this.tableHeight = window.innerHeight - this.$refs.preReviewOptions.offsetHeight - 300;
},
methods: {
//搜索
......
......@@ -53,7 +53,7 @@
}}</el-button>
</div>
</el-form>
<el-table max-height="500" highlight-current-row border stripe v-loading="loading" :data="tableData">
<el-table max-height="300" 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: null,
tableHeight: 250,
//新增修改查看规则弹出层
open: false,
//是否显示查看目的航班弹出层
......@@ -502,8 +502,7 @@ export default {
this.shiftKey = false;
}
});
this.tableHeight =
window.innerHeight - this.$refs.queryForm.$el.offsetHeight - 120;
// this.tableHeight = window.innerHeight - this.$refs.queryForm.$el.offsetHeight - 120;
},
methods: {
//输入航班号后
......
......@@ -81,7 +81,7 @@ export default {
checkData: [],
fileList: [],
errorData: [],
tableHeight: null,
tableHeight: 300,
totalCount: 0,
openStatus: '',
loading: false,
......@@ -92,7 +92,7 @@ export default {
},
mounted() {
this.tableHeight = window.innerHeight - this.$refs.goodsStation.$el.offsetHeight - 200
// this.tableHeight = window.innerHeight - this.$refs.goodsStation.$el.offsetHeight - 200;
this.selection(1)
},
watch: {
......@@ -244,4 +244,4 @@ export default {
<style lang="scss" scoped>
</style>
\ No newline at end of file
</style>
......
......@@ -81,7 +81,7 @@ export default {
checkData: [],
fileList: [],
errorData: [],
tableHeight: null,
tableHeight: 300,
totalCount: 0,
openStatus: '',
loading: false,
......@@ -92,7 +92,7 @@ export default {
},
mounted() {
this.tableHeight = window.innerHeight - this.$refs.goodsStation.$el.offsetHeight - 200
// this.tableHeight = window.innerHeight - this.$refs.goodsStation.$el.offsetHeight - 200;
this.selection(1)
},
watch: {
......@@ -244,4 +244,4 @@ export default {
<style lang="scss" scoped>
</style>
\ No newline at end of file
</style>
......
......@@ -64,7 +64,7 @@ export default {
tableData: [],
tableHeader: this.tableHeaders['goodsStationFlight'],
checkData: [],
tableHeight: null,
tableHeight: 300,
totalCount: 0,
loading: false,
open: false,
......@@ -73,7 +73,7 @@ export default {
created() {
},
mounted() {
this.tableHeight = window.innerHeight - this.$refs.goodsStationFlight.$el.offsetHeight - 200
// this.tableHeight = window.innerHeight - this.$refs.goodsStationFlight.$el.offsetHeight - 200;
this.selection(1)
},
watch: {
......
......@@ -53,7 +53,7 @@ export default {
size: 100
},
tableHeader: this.tableHeaders['cargoLog'],
tableHeight: 600,
tableHeight: 300,
loading: false
}
},
......@@ -94,4 +94,4 @@ export default {
<style scoped>
</style>
\ No newline at end of file
</style>
......
......@@ -353,7 +353,7 @@ export default {
limitSize: 100, //无限制-1
page: 1,
progress: 0,
tableHeight: null,
tableHeight: 250,
dialogVisible: false,
openView: false,
openTransfer: false,
......@@ -367,7 +367,7 @@ export default {
} else {
this.tableHeader = this.tableHeaders['cargo']
}
// this.select(0,'create')
this.select(0,'create')
},
activated() {
......@@ -441,7 +441,7 @@ export default {
this.shiftKey = false;
}
});
this.tableHeight = window.innerHeight - this.$refs.cargoForm.$el.offsetHeight - 50
// this.tableHeight = window.innerHeight - this.$refs.cargoForm.$el.offsetHeight - 50
},
watch: {
$route: {
......@@ -489,7 +489,7 @@ export default {
}
},
formShow(val, oldVal) {
this.tableHeight = window.innerHeight - this.$refs.cargoForm.$el.offsetHeight - 120
// this.tableHeight = window.innerHeight - this.$refs.cargoForm.$el.offsetHeight - 120
},
},
methods: {
......
......@@ -34,7 +34,7 @@
</el-form-item>
<el-form-item label="航班种类">
<el-select v-model="selectData.kindId" placeholder="不限" @change="getFlight" clearable>
<el-option v-for="item in fltKindIdList" :label="item.englishName" :value="item.id"></el-option>
<el-option v-for="item in fltKindIdList" :label="item.englishName" :value="item.id" :key="item.id"></el-option>
</el-select>
</el-form-item>
<el-form-item>
......@@ -42,7 +42,7 @@
</el-form-item>
</el-form>
<el-row class="card2">
<el-col :span="1" v-for="item in fltBox">
<el-col :span="1" v-for="item in fltBox" :key="item">
<div class="fltBox" @click="rowClick({ fltNo: item.fltNo, fltDate: item.fltDate, route: '' })"
:style="{ backgroundColor: (item.percentage * 100).toFixed(2) >= 90 ? '#13ce66' : (item.percentage * 100).toFixed(2) >= 75 ? '#ffba00' : '#ff4949' }">
<div class="fltName">{{ item.fltNo }}</div>
......@@ -60,7 +60,7 @@
<template v-slot:percentage="scope">
<el-progress stroke-width="100"
:color="(scope.row.percentage * 100).toFixed(2) >= 90 ? '#13ce66' : (scope.row.percentage * 100).toFixed(2) >= 75 ? '#ffba00' : '#ff4949'"
:stroke-width="18"
:strokeWidth="18"
:percentage="scope.row.percentage == 0 ? 0 : Number((scope.row.percentage * 100).toFixed(2))">
</el-progress>
</template>
......@@ -96,7 +96,7 @@ export default {
totalWeight: 0,//航班总重量
allocationWeight: 0,//航班已配重量
type: "",
tableHeight: null,
tableHeight: 300,
total: 0,
loading: false,
};
......@@ -109,7 +109,7 @@ export default {
// this.getFlight()
// },
mounted() {
this.tableHeight = window.innerHeight - this.$refs.card1.$el.offsetHeight - this.$refs.indexForm.$el.offsetHeight - 350
// this.tableHeight = window.innerHeight - this.$refs.card1.$el.offsetHeight - this.$refs.indexForm.$el.offsetHeight - 350
this.getFlight()
},
methods: {
......
......@@ -56,7 +56,7 @@
</Tables>
</div>
</template>
<script>
import {
downLoadTemplate,
......@@ -78,7 +78,7 @@ export default {
tableData: [],
errorData: [],
tableHeaders: this.tableHeaders['flightToArea'],
tableHeight: null,
tableHeight: 300,
total: 0,
flightType: [],
form: {
......@@ -100,7 +100,7 @@ export default {
created() {
},
mounted() {
this.tableHeight = window.innerHeight - this.$refs.selectForm.$el.offsetHeight - 170
// this.tableHeight = window.innerHeight - this.$refs.selectForm.$el.offsetHeight - 170;
this.selection(1)
},
activated() {
......@@ -210,4 +210,4 @@ export default {
margin-left: 10px;
vertical-align: top;
}
</style>
\ No newline at end of file
</style>
......
......@@ -131,7 +131,7 @@ export default {
tableHeader: this.tableHeaders['preMdeSelect'],
accsDate: [],
valueFormat: "yyyy-MM-dd",
tableHeight: null,
tableHeight: 250,
tableLoading: false,
downloading: false,
totalCount: 0,
......@@ -141,7 +141,7 @@ export default {
this.selectOptionData()
},
mounted() {
this.tableHeight = window.innerHeight - this.$refs.preMdeSelectForm.$el.offsetHeight - 150
// this.tableHeight = window.innerHeight - this.$refs.preMdeSelectForm.$el.offsetHeight - 150;
this.select(0)
},
watch: {
......@@ -243,4 +243,4 @@ export default {
<style>
</style>
\ No newline at end of file
</style>
......
......@@ -58,7 +58,7 @@
</Tables>
</div>
</template>
<script>
import {
downLoadTemplate,
......@@ -79,7 +79,7 @@ export default {
tableData: [],
errorData: [],
tableHeaders: this.tableHeaders['ursaToArea'],
tableHeight: null,
tableHeight: 300,
total: 0,
flightType: [],
form: {
......@@ -101,7 +101,7 @@ export default {
created() {
},
mounted() {
this.tableHeight = window.innerHeight - this.$refs.selectForm.$el.offsetHeight - 170
// this.tableHeight = window.innerHeight - this.$refs.selectForm.$el.offsetHeight - 170;
this.selection(1)
},
activated() {
......@@ -217,4 +217,4 @@ export default {
margin-left: 10px;
vertical-align: top;
}
</style>
\ No newline at end of file
</style>
......
......@@ -199,7 +199,7 @@ export default {
addDictionary: {},//选择数据
nowSelect: [],
tableName: '',
tableHeight: null,
tableHeight: 300,
total: 0,
status: null,
loading: false,
......@@ -215,7 +215,7 @@ export default {
// }
},
mounted() {
this.tableHeight = window.innerHeight - this.$refs.dictForm.$el.offsetHeight - 270
// this.tableHeight = window.innerHeight - this.$refs.dictForm.$el.offsetHeight - 270
},
watch: {
tableName(val, oldVal) {
......@@ -497,4 +497,4 @@ export default {
font-size: 14px;
font-weight: 600;
}
</style>
\ No newline at end of file
</style>
......
......@@ -34,7 +34,7 @@
:limitSize="formData.size" :page="formData.page" :pageSizes="[20, 30, 40, 50]" :loading="tableLoading"
:height="tableHeight" @sizeChange="sizeChange" @currentChange="currentChange">
<template slot="optionColumn">
<el-table-column header-align="center" align="center" label="操作">
<el-table-column header-align="center" align="left" label="操作" min-width="210px">
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="buttonClick(scope, 0)">查看</el-button>
<el-button type="primary" size="mini" @click="buttonClick(scope, 1)" v-hasPermi="['system:role:update']">修改
......@@ -42,7 +42,7 @@
<el-button :type="scope.row.valid == 1 ? 'warning' : 'primary'" size="mini"
v-hasPermi="['system:role:openClose']" @click="roleStatus(scope)">{{ scope.row.valid == 1 ? "停用" : "启用" }}
</el-button>
<el-button type="danger" size="mini" @click="removeRole(scope)" v-hasPermi="['system:role:delete']">删除角色
<el-button type="danger" size="mini" @click="removeRole(scope)" v-hasPermi="['system:role:delete']" style="margin-top: 5px;margin-left: 0;">删除角色
</el-button>
</template>
</el-table-column>
......@@ -247,4 +247,4 @@ export default {
</script>
<style>
</style>
\ No newline at end of file
</style>
......
......@@ -32,7 +32,7 @@
:loading="loading" :page="formData.page" :pageSizes="[20, 30, 40, 50]" :height="tableHeight"
@sizeChange="sizeChange" @currentChange="currentChange">
<template slot="optionColumn">
<el-table-column header-align="center" align="center" width="auto" label="操作">
<el-table-column header-align="center" align="left" min-width="210px" label="操作">
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="buttonClick(scope, 0)">查看</el-button>
<el-button type="primary" size="mini" @click="buttonClick(scope, 1)" v-hasPermi="['system:user:update']">修改
......@@ -44,7 +44,7 @@
v-hasPermi="['system:user:openClose']" @click="userStatus(scope)">{{
scope.row.isValid == 1 ? "停用" : "启用"
}}</el-button>
<el-button type="danger" size="mini" @click="removeUser(scope)" v-hasPermi="['system:user:delete']">删除用户
<el-button type="danger" size="mini" @click="removeUser(scope)" v-hasPermi="['system:user:delete']" style="margin-top: 5px;margin-left: 0;">删除用户
</el-button>
</template>
</el-table-column>
......@@ -112,7 +112,7 @@ export default {
drawerTitle: "",
total: 0,
loading: false,
tableHeight: null
tableHeight: 300
};
},
created() {
......@@ -121,7 +121,7 @@ export default {
}
},
mounted() {
this.tableHeight = window.innerHeight - this.$refs.selectionUserForm.$el.offsetHeight - 250
// this.tableHeight = window.innerHeight - this.$refs.selectionUserForm.$el.offsetHeight - 250;
},
activated() {
this.selectUser();
......@@ -255,4 +255,4 @@ export default {
<style>
</style>
\ No newline at end of file
</style>
......
......@@ -55,7 +55,7 @@ export default {
},
data: [],
tableHeader: this.tableHeaders['archiveData'],
tableHeight: null,
tableHeight: 300,
total: 0,
loading: false,
}
......@@ -64,7 +64,7 @@ export default {
this.selectLog()
},
mounted() {
this.tableHeight = window.innerHeight - this.$refs.archiveDataForm.$el.offsetHeight - 200
// this.tableHeight = window.innerHeight - this.$refs.archiveDataForm.$el.offsetHeight - 200
},
methods: {
selectLog(val) {
......@@ -117,4 +117,4 @@ export default {
<style lang="scss" scoped>
</style>
\ No newline at end of file
</style>
......
......@@ -115,7 +115,7 @@ export default {
selectDate: null,
createTimes: [],
total: 0,
tableHeight: null,
tableHeight: 300,
loading: false,
valueFormat: "yyyy-MM-dd",
};
......@@ -130,8 +130,7 @@ export default {
this.data = [];
},
mounted() {
this.tableHeight =
window.innerHeight - this.$refs.dmLogForm.$el.offsetHeight - 130;
// this.tableHeight = window.innerHeight - this.$refs.dmLogForm.$el.offsetHeight - 130;
},
methods: {
//数据查询
......@@ -222,4 +221,4 @@ export default {
.tagTip {
margin: 0 5px;
}
</style>
\ No newline at end of file
</style>
......
......@@ -96,7 +96,7 @@ export default {
children: 'children',
label: 'label'
},
tableHeight: null,
tableHeight: 300,
total: 0,
loading: false
}
......@@ -109,7 +109,7 @@ export default {
this.selectLog();
},
mounted() {
this.tableHeight = window.innerHeight - this.$refs.operationLogForm.$el.offsetHeight - 240
// this.tableHeight = window.innerHeight - this.$refs.operationLogForm.$el.offsetHeight - 240
},
methods: {
getModule() {
......@@ -166,4 +166,4 @@ export default {
<style lang="scss" scoped>
</style>
\ No newline at end of file
</style>
......