Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
jinhui.wang
443a350d 1 parent 022c3526

路由参数修改，请求参数修正

Inline Side-by-side
Showing 9 changed files with 30 additions and 62 deletions
......@@ -89,7 +89,6 @@ export default {
.then((res) => {
if (res.code === 200) {
this.$store.dispatch('tagsView/delAllCachedViews')
this.$store.dispatch('tagsView/delAllVisitedViews')
// location.reload();
if (this.$route.path != '/index') {
this.$router.push('/index')
......
......@@ -3,6 +3,7 @@ import { getTableHeader } from '@/api/menu'
import { changeCurrentPort } from "@/api/system/user.js";
import { getToken, setToken, removeToken } from '@/utils/auth'
import { Message } from 'element-ui'
import settings from "@/settings"
const user = {
state: {
......@@ -101,7 +102,7 @@ const user = {
type: 'error'
})
this.LogOut().then(() => {
window.location.href = "https://test-myapps.secure.fedex.com/purpleid/signout/";//wsso系统跳转
window.location.href = settings.loginURL;//wsso系统跳转
})
}
if (res.data.roles && res.data.roles.length > 0) { // 验证返回的roles是否是一个非空数组
......
......@@ -20,16 +20,14 @@
<el-form-item label="货站名称" prop="goodsStation">
<el-select class="selectWidth100" v-model.lazy="formData.goodsStation" filterable
:loading="goodsStationLoading" placeholder="不限">
<el-option v-for="(item, index) in goodsStationList" :label="item" :value="item"
:key="item">
<el-option v-for="(item, index) in goodsStationList" :label="item" :value="item" :key="item">
</el-option>
</el-select>
</el-form-item>
</div>
<div v-else>
<el-form-item label="货站名称" prop="uploadGoodsStation">
<el-input type="text" v-model="formData.uploadGoodsStation" maxlength="25"
placeholder="请输入货站名称">
<el-input type="text" v-model="formData.uploadGoodsStation" maxlength="25" placeholder="请输入货站名称">
</el-input>
</el-form-item>
<el-form-item prop="file" label-width="0px">
......@@ -195,7 +193,7 @@ export default {
this.$message.warning(res.msg);
if (res.data) {
this.errorData = res.data;
this.$router.push({ name: 'UpDateResult', params: { data: this.errorData, from: 'FlightInformationImport' } })
this.$router.push({ name: 'UpDateResult', query: { data: this.errorData, from: 'FlightInformationImport' } })
}
} else {
this.$message.warning(res.msg);
......
......@@ -20,16 +20,14 @@
<el-form-item label="货站名称" prop="goodsStation">
<el-select class="selectWidth100" v-model.lazy="formData.goodsStation" filterable
:loading="goodsStationLoading" placeholder="不限">
<el-option v-for="(item, index) in goodsStationList" :label="item" :value="item"
:key="item">
<el-option v-for="(item, index) in goodsStationList" :label="item" :value="item" :key="item">
</el-option>
</el-select>
</el-form-item>
</div>
<div v-else>
<el-form-item label="货站名称" prop="uploadGoodsStation">
<el-input type="text" v-model="formData.uploadGoodsStation" maxlength="25"
placeholder="请输入货站名称">
<el-input type="text" v-model="formData.uploadGoodsStation" maxlength="25" placeholder="请输入货站名称">
</el-input>
</el-form-item>
<el-form-item prop="file" label-width="0px">
......@@ -195,7 +193,7 @@ export default {
this.$message.warning(res.msg);
if (res.data) {
this.errorData = res.data;
this.$router.push({ name: 'UpDateResult', params: { data: this.errorData, from: 'FlightInformationImport' } })
this.$router.push({ name: 'UpDateResult', query: { data: this.errorData, from: 'FlightInformationImport' } })
}
} else {
this.$message.warning(res.msg);
......
<template>
<div class="cargoPage">
<el-form ref="cargoForm" class="form-header" label-position="right" label-width="auto" size="small"
:model="formData">
<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="6">
<el-form-item label="配舱航班日期">
......@@ -139,8 +138,7 @@
</div>
</template>
<el-select class="formItem" v-model="formData.cargoPlaneRoute" placeholder="不限"
:disabled="routeList.length == 0" clearable @change="routeSelectChange"
:key="formData.cargoPlaneRoute">
:disabled="routeList.length == 0" clearable @change="routeSelectChange" :key="formData.cargoPlaneRoute">
<el-option v-for="(item, index) in routeList" :label="item" :value="item" :key="item">
<Tooltips :content="item" :refName="item"></Tooltips>
</el-option>
......@@ -199,8 +197,8 @@
<el-button class="mr20" icon="el-icon-search" size="mini" @click="formShow = !formShow" circle></el-button>
</el-tooltip>
<el-tooltip content="表格设置" placement="top">
<HeaderSetting tableName="cargo" class="mr20" style="float:right;line-height: 48px;"
@close="headerSetClose"></HeaderSetting>
<HeaderSetting tableName="cargo" class="mr20" style="float:right;line-height: 48px;" @close="headerSetClose">
</HeaderSetting>
</el-tooltip>
</div>
</div>
......@@ -216,8 +214,8 @@
}}<i class="el-icon-link"></i> </el-link>
</template>
</Tables>
<el-dialog title="舱位释放结果" width="80%" :visible.sync="dialogVisible" :close-on-click-modal="false"
:show-close="false" :append-to-body="true" @close="close">
<el-dialog title="舱位释放结果" width="80%" :visible.sync="dialogVisible" :close-on-click-modal="false" :show-close="false"
:append-to-body="true" @close="close">
<el-table :data="selectTable" size="mini" border stripe highlight-current-row style="width: 100%">
<el-table-column type="index" label="序号" align="center">
</el-table-column>
......@@ -696,7 +694,8 @@ export default {
},
//配载航班号获取航线
planeNoChange(val) {
getFlightsRoutes(val).then(res => {
if (val != '' && val != null) {
getFlightsRoutes(val.split(';')).then(res => {
if (res.code === 200) {
this.routeList = res.data
} else {
......@@ -705,6 +704,7 @@ export default {
}).catch(err => {
console.log(err)
})
}
},
routeSelectChange(val) {
this.$forceUpdate()
......
......@@ -159,7 +159,7 @@ export default {
}
arr.push(obj)
})
this.$router.push({ name: 'UpDateResult', params: { data: arr, from: 'queryCargo' } })
this.$router.push({ name: 'UpDateResult', query: { data: arr, from: 'queryCargo' } })
this.dialogBeforeClose()
} else if (res.code === 202) {
this.reBatchMoveCargoToOtherFlight(res.msg, 'overweight')
......@@ -207,7 +207,7 @@ export default {
}
arr.push(obj)
})
this.$router.push({ name: 'UpDateResult', params: { data: arr, from: 'queryCargo' } })
this.$router.push({ name: 'UpDateResult', query: { data: arr, from: 'queryCargo' } })
this.dialogBeforeClose()
} else if (res.code === 203) {
this.reBatchMoveCargoToOtherFlight(res.msg, 'notInWhite')
......@@ -286,6 +286,4 @@ export default {
};
</script>
<style>
</style>
\ No newline at end of file
<style></style>
\ No newline at end of file
......
......@@ -164,18 +164,7 @@ export default {
} else if (res.code === 201) {
this.msgWarning(res.msg);
this.errorData = res.data;
this.$router.push({ name: 'UpDateResult', params: { data: this.errorData, from: 'FlightToArea' } })
} else if (res.code === 301) {
this.$confirm('登录状态已过期，需重新登录', '系统提示', {
closeOnClickModal: false,
showCancelButton: false,
confirmButtonText: '重新登录',
type: 'warning'
}).then(
this.$store.dispatch('LogOut').then(() => {
window.location.href = settings.loginURL;//wsso系统跳转
})
)
this.$router.push({ name: 'UpDateResult', query: { data: this.errorData, from: 'FlightToArea' } })
} else {
this.msgWarning(res.msg);
}
......
......@@ -33,14 +33,12 @@ export default {
}
},
created() {
this.tableData = this.$route.params.data
this.fromRoute = this.$route.params.from
this.tableData = this.$route.query.data
this.fromRoute = this.$route.query.from
},
wactch: {
dialogVisible(val) {
if (val) {
}
}
activated() {
this.tableData = this.$route.query.data
this.fromRoute = this.$route.query.from
},
methods: {
close() {
......@@ -56,6 +54,4 @@ export default {
}
</script>
<style lang="scss" scoped>
</style>
\ No newline at end of file
<style lang="scss" scoped></style>
\ No newline at end of file
......
......@@ -25,8 +25,8 @@
<el-row>
<el-col :span="6">
<el-form-item label="生效日期" prop="beginDate" :rules="rules">
<el-date-picker class="formItem" v-model="formData.beginDate" type="date"
placeholder="选择日期" value-format="yyyy-MM-dd" clearable>
<el-date-picker class="formItem" v-model="formData.beginDate" type="date" placeholder="选择日期"
value-format="yyyy-MM-dd" clearable>
</el-date-picker>
</el-form-item>
</el-col>
......@@ -171,18 +171,7 @@ export default {
} else if (res.code === 201) {
this.msgWarning(res.msg);
this.errorData = res.data;
this.$router.push({ name: 'UpDateResult', params: { data: this.errorData, from: 'FlightInformationImport' } })
} else if (res.code === 301) {
this.$confirm('登录状态已过期，需重新登录', '系统提示', {
closeOnClickModal: false,
showCancelButton: false,
confirmButtonText: '重新登录',
type: 'warning'
}).then(
this.$store.dispatch('LogOut').then(() => {
window.location.href = settings.loginURL;//wsso系统跳转
})
)
this.$router.push({ name: 'UpDateResult', query: { data: this.errorData, from: 'FlightInformationImport' } })
} else {
this.msgWarning(res.msg);
}
......