Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
Elements-SY
896a7cd3 2 parents ab7af560 82ad6c52

Merge branch 'et86-black' into test

Inline Side-by-side
Showing 6 changed files with 66 additions and 29 deletions
......@@ -206,13 +206,10 @@ export function checkFlightRoute(data) {
}
//更新航线
/**
* @param id *
*/
export function updateRoute(id) {
export function updateRoute(data) {
return request({
url: `/dictionary/updateRoute/${id}`,
url: `/dictionary/updateRoute`,
method: "post",
data: {},
data: data,
});
}
......
......@@ -418,8 +418,11 @@ export default {
<style lang="scss">
.tablePagination {
margin-top: 10px;
text-align: right;
text-align: right;
height: 25px;
margin-bottom: 10px;
margin-top: 15px;
padding: 10px 20px !important;
}
.w-table {
......
......@@ -416,7 +416,8 @@ function getPropertyValue(el) {
);
}
// 获取页面内除了table其他模块所占的高
// 获取页面内除了table其他模块所占的高,
// 以及margin-top margin-bottom padding-top padding-bottom
export function restTableHeight($refs) {
let heigth = 0;
Object.keys($refs).map((key) => {
......@@ -448,7 +449,7 @@ export function restTableHeight($refs) {
heigth += getPropertyValue($refs[key]);
}
});
let topHeaderClientHeight =
document.querySelector(".headerRef").clientHeight;
// 右边栏top-header全局组件的高
let topHeaderClientHeight = document.querySelector(".headerRef").clientHeight;
return heigth + topHeaderClientHeight;
}
......
......@@ -674,7 +674,6 @@ export default {
} else {
obj.route = this.$route.params.route ? this.$route.params.route : ''
}
this.getRouteDimension(obj)
}
}
......@@ -691,7 +690,7 @@ export default {
},
activated() {
this.routeSatus = this.$route.params.routeStatus
if (!this.$route.params.createStatus) {
if (!this.$route.params.createStatus && this.$route.params.createStatus !== undefined) {
if (this.$route.params.handle == 'add') {
if (this.infoForm.fltNo && this.infoForm.fltNo != null && this.infoForm.fltNo != '') {
this.getRoutes(this.infoForm.fltNo)
......@@ -715,7 +714,6 @@ export default {
} else {
obj.route = this.$route.params.route ? this.$route.params.route : ''
}
this.getRouteDimension(obj)
}
}
......@@ -776,11 +774,14 @@ export default {
this.infoForm.list = []
let obj = {
purposeOfFlightNo: val.fltNo,
flightDate: val.fltDate,
flightDate: val.fltDate, //
flightRoute: val.route,
flightRouteListStr: val.flightRouteListStr,
status: val.status ? val.status : ''
}
if(this.$route.params.handle == "updated"){
delete obj.flightRoute
}
if (this.$route.params.handle != 'add') {
findDestinationFltRuleByFlightNo(obj).then(res => {
if (res.code === 200) {
......@@ -841,7 +842,8 @@ export default {
}
})
}
} else {
}
else {
//未请求到数据
if (this.infoForm.route != null && this.infoForm.route != '' && this.infoForm.route != ' ') {
let params = {
......@@ -977,13 +979,41 @@ export default {
console.log(err)
})
} else if (this.routeSatus == 'flightInformationMaintenancePurple Tail') {
this.routeList.forEach((route) => {
this.infoForm.list.push({
purposeOfFlightNo: this.infoForm.fltNo,
ruleDate: this.infoForm.fltDate,
flightRoute: route.route,
routePriority: route.routePriority,
})
let query = {
purposeOfFlightNo: val.fltNo,
flightRoute: val.route,
flightRouteListStr: val.flightRouteListStr,
status: val.status ? val.status : ''
}
//航班类型Purple Tail展示全部航线维度
findDestinationFltRuleByFlightNo(query).then(result => {
const { code, data } = result;
if(code == 200){
this.routeList = data.routeList;
let routesStatus = 1
if(data.routeList.length){
this.routeList.forEach(route => {
data.list.forEach(item => {
if (route.route === item.flightRoute) {
routesStatus = 2
// item.id = undefined
// item.status = undefined
// item.flightRoute = this.infoForm.route
// item.routePriority = route.routePriority
this.infoForm.list.push(this.dataHandle(item))
}
})
if (routesStatus == 1) {
this.infoForm.list.push({
purposeOfFlightNo: this.infoForm.fltNo,
ruleDate: this.infoForm.fltDate,
flightRoute: route.route,
routePriority: route.routePriority,
})
}
})
}
}
})
}
}
......
......@@ -42,24 +42,24 @@
<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>
placeholder="请输入运单号（回车间隔）" :rows="1" :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"
<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="6">
<el-form-item label="URSA">
<el-input type="textarea" v-model="ursa" class="formItem" placeholder="S_;P_;E2" :rows="4" clearable>
<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="6">
<el-form-item label="始发站">
<el-input type="textarea" v-model="siteName" class="formItem" placeholder="PVG;PEK" :rows="4" clearable>
<el-input type="textarea" v-model="siteName" class="formItem" placeholder="PVG;PEK" :rows="1" clearable>
</el-input>
</el-form-item>
</el-col>
......@@ -156,7 +156,7 @@
<el-col :span="6">
<el-form-item label="发件人账号">
<el-input ref='userInfo' type="textarea" v-model="formData.shipperAccount" class="formItem"
placeholder="请输入发件人账号（;间隔）" :rows="4" :maxlength="12000" clearable></el-input>
placeholder="请输入发件人账号（;间隔）" :rows="1" :maxlength="12000" clearable></el-input>
</el-form-item>
</el-col>
</el-row>
......
......@@ -562,7 +562,13 @@ export default {
center: true,
})
.then(() => {
this.updateRouteSubmit(row.id);
let params = {
id: row.id,
fltNo: row.fltNo,
route: row.route,
isEtesRoute: row.isEtesRoute ? "Y" : "N"
}
this.updateRouteSubmit(params);
})
.catch(() => {
this.tableData[$index].isEtesRoute = !this.tableData[$index].isEtesRoute;
......