Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
jinhui.wang
7d266b65 1 parent 8350e270

文本修正，航班维护跳转维度修改，目的地页面条件空状态修正

Inline Side-by-side
Showing 8 changed files with 72 additions and 19 deletions
......@@ -427,7 +427,7 @@ let tableHeaders = {
status: 1
},
{
columnChineseName: "航线",
columnChineseName: "当前配载航线",
columnName: "flightRoute",
columnWidth: "140",
status: 1
......
......@@ -30,7 +30,7 @@
</el-tooltip>
</div>
</template>
<el-select class="formItem" v-model="formData.route" placeholder="不限" :disabled="routeList.length == 0">
<el-select class="formItem" v-model="formData.route" placeholder="请选择航线" :disabled="routeList.length == 0">
<el-option v-for="(item, index) in routeList" :label="item.route" :value="item.route" :key="index">
<Tooltips :content="item.route" :refName="item.route"></Tooltips>
</el-option>
......
......@@ -543,12 +543,30 @@ export default {
this.fltNoDisabled = true
this.infoForm.fltNo = this.$route.params.fltNo
this.infoForm.fltDate = this.$route.params.fltDate
this.infoForm.route = this.$route.params.route
if (this.$route.params.status) {
if (this.routeSatus == 'dmLog') {
this.infoForm.route = this.$route.params.route
this.getIdDimension(this.$route.params.id)
} else {
this.getRouteDimension({ fltNo: this.$route.params.fltNo, fltDate: this.$route.params.fltDate, route: this.$route.params.route ? this.$route.params.route : '', status: this.$route.params.status ? this.$route.params.status : '' })
let obj = {
fltNo: this.$route.params.fltNo,
fltDate: this.$route.params.fltDate,
status: this.$route.params.status ? this.$route.params.status : ''
}
if (this.routeSatus == 'flightInformationMaintenanceWhite Tail') {
this.infoForm.route = this.$route.params.route
obj.route = this.$route.params.route
obj.flightRouteListStr = this.$route.params.route
} else if (this.routeSatus == 'flightInformationMaintenancePurple Tail') {
this.infoForm.route = ''
obj.route = ''
obj.flightRouteListStr = this.$route.params.route
} else {
obj.route = this.$route.params.route ? this.$route.params.route : ''
}
this.getRouteDimension(obj)
}
}
} else {
......@@ -572,7 +590,23 @@ export default {
if (this.routeSatus == 'dmLog') {
this.getIdDimension(this.$route.params.id)
} else {
this.getRouteDimension({ fltNo: this.$route.params.fltNo, fltDate: this.$route.params.fltDate, route: this.$route.params.route ? this.$route.params.route : '', status: '' })
let obj = {
fltNo: this.$route.params.fltNo,
fltDate: this.$route.params.fltDate,
status: this.$route.params.status ? this.$route.params.status : ''
}
if (this.routeSatus == 'flightInformationMaintenanceWhite Tail') {
obj.route = this.$route.params.route
obj.flightRouteListStr = this.$route.params.route
} else if (this.routeSatus == 'flightInformationMaintenancePurple Tail') {
obj.route = ''
obj.flightRouteListStr = this.$route.params.route
} else {
obj.route = this.$route.params.route ? this.$route.params.route : ''
}
this.getRouteDimension(obj)
}
}
},
......@@ -614,6 +648,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)
} else {
this.isEmpty = true
}
......@@ -634,6 +669,7 @@ export default {
purposeOfFlightNo: val.fltNo,
flightDate: val.fltDate,
flightRoute: val.route,
flightRouteListStr: val.flightRouteListStr,
status: val.status ? val.status : ''
}
if (this.$route.params.handle != 'add') {
......@@ -703,8 +739,10 @@ export default {
findDestinationFltRuleByFlightNo({
purposeOfFlightNo: this.infoForm.fltNo,
flightRoute: this.infoForm.route,
flightRouteListStr: this.$route.params.route,
status: this.$route.params.status
}).then(response => {
this.routeList = response.data.routeList
if (response.data.list.length > 0) {
//查询到通用维度，去除id status，航线赋值，航线优先级赋值
if (this.routeSatus == 'flightInformationMaintenanceWhite Tail') {
......@@ -776,16 +814,18 @@ export default {
console.log(err)
})
} else {
//航线为空，提示未找到维度数据
if (this.routeSatus == 'flightInformationMaintenancePurple Tail' || this.routeSatus == 'FlightRandConfig') {
//航线为空
if (this.routeSatus == 'FlightRandConfig') {
if (this.routeSatus == 'FlightRandConfig') {
this.infoForm.fltDate = ''
}
findDestinationFltRuleByFlightNo({
purposeOfFlightNo: this.infoForm.fltNo,
flightRoute: this.infoForm.route,
flightRouteListStr: this.$route.params.route,
status: this.$route.params.status
}).then(response => {
this.routeList = response.data.routeList
if (response.data.list.length > 0) {
this.routeList.forEach(route => {
let routeStatus = 1
......@@ -823,6 +863,15 @@ export default {
this.isEmpty = true
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,
})
})
}
}
}
......
......@@ -315,7 +315,7 @@ export default {
fltNo: [
{
required: true,
message: "ACCS原航班号不能为空",
message: "航班号不能为空",
trigger: "blur",
},
],
......@@ -343,7 +343,7 @@ export default {
route: [
{
required: true,
message: "航班线路不能为空",
message: "航班路线不能为空",
trigger: "blur",
},
// {
......@@ -828,7 +828,7 @@ export default {
handle: 'update',
fltNo: val.fltNo,
fltDate: val.fltDate ? val.fltDate : null,
route: val.flightKindName != 'Purple Tail' ? val.route : ' ',
route: val.route,
routeStatus: 'flightInformationMaintenance' + val.flightKindName,
status: ' ',
createStatus: 1,
......
......@@ -30,7 +30,7 @@
</el-tooltip>
</div>
</template>
<el-select class="formItem" v-model="formData.route" placeholder="不限" :disabled="routeList.length == 0">
<el-select class="formItem" v-model="formData.route" placeholder="请选择航线" :disabled="routeList.length == 0">
<el-option v-for="(item, index) in routeList" :label="item.route" :value="item.route" :key="index">
<Tooltips :content="item.route" :refName="item.route"></Tooltips>
</el-option>
......
......@@ -47,8 +47,7 @@
</div>
<Tables ref="flightToArea" ductName="flightToArea" :selection="false" :selectFixed="false" :order='true'
:height="tableHeight" :data="tableData" :headerData="tableHeaders" :page="formData.page" :pageSizes="[20]"
:totalCount="total" :loading="tableLoading" @currentChange="currentChange"
layout="total,prev, pager, next, jumper, ->">
:totalCount="total" :loading="tableLoading" @currentChange="currentChange">">
</Tables>
</div>
</template>
......@@ -113,6 +112,9 @@ export default {
page: this.formData.page,
size: 20
}
if (obj.area == '') {
obj.area = null
}
searchFlightDestination(obj).then(res => {
this.tableLoading = false
if (res.code === 200) {
......@@ -185,7 +187,7 @@ export default {
this.selection()
},
upload() {
this.$refs.selectForm.validateField('beginDate')
ield('beginDate')
}
},
};
......
......@@ -48,8 +48,7 @@
</div>
<Tables ref="flightToArea" ductName="flightToArea" :selection="false" :selectFixed="false" :order='true'
:height="tableHeight" :data="tableData" :headerData="tableHeaders" :page="formData.page" :pageSizes="[20]"
:totalCount="total" :loading="tableLoading" @currentChange="currentChange"
layout="total,prev, pager, next, jumper, ->">
:totalCount="total" :loading="tableLoading" @currentChange="currentChange" ->">
</Tables>
</div>
</template>
......@@ -117,6 +116,9 @@ export default {
} else {
obj.ursa = null
}
if (obj.area == '') {
obj.area = null
}
searchUrsaDestination(obj).then(res => {
this.tableLoading = false
if (res.code === 200) {
......@@ -191,7 +193,7 @@ export default {
this.selection()
},
upload() {
this.$refs.selectForm.validateField('beginDate')
Field('beginDate')
}
},
};
......
......@@ -178,7 +178,7 @@ export default {
cancelButtonText: '取消',
type: "warning",
}).then(() => {
this.statusChange({ id: val.id, status: status, tip: tip })
this.statusChange({ id: val.id, status: status })
}).catch(() => { })
} else {
this.msgWarning(res.msg)
......@@ -192,7 +192,7 @@ export default {
cancelButtonText: '取消',
type: "warning",
}).then(() => {
this.statusChange({ id: val.id, status: status, tip: tip })
this.statusChange({ id: val.id, status: status })
}).catch(() => { })
}
},
......