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 { ...@@ -89,7 +89,6 @@ export default {
89 .then((res) => { 89 .then((res) => {
90 if (res.code === 200) { 90 if (res.code === 200) {
91 this.$store.dispatch('tagsView/delAllCachedViews') 91 this.$store.dispatch('tagsView/delAllCachedViews')
92 - this.$store.dispatch('tagsView/delAllVisitedViews')
93 // location.reload(); 92 // location.reload();
94 if (this.$route.path != '/index') { 93 if (this.$route.path != '/index') {
95 this.$router.push('/index') 94 this.$router.push('/index')
......
...@@ -3,6 +3,7 @@ import { getTableHeader } from '@/api/menu' ...@@ -3,6 +3,7 @@ import { getTableHeader } from '@/api/menu'
3 import { changeCurrentPort } from "@/api/system/user.js"; 3 import { changeCurrentPort } from "@/api/system/user.js";
4 import { getToken, setToken, removeToken } from '@/utils/auth' 4 import { getToken, setToken, removeToken } from '@/utils/auth'
5 import { Message } from 'element-ui' 5 import { Message } from 'element-ui'
6 +import settings from "@/settings"
6 7
7 const user = { 8 const user = {
8 state: { 9 state: {
...@@ -101,7 +102,7 @@ const user = { ...@@ -101,7 +102,7 @@ const user = {
101 type: 'error' 102 type: 'error'
102 }) 103 })
103 this.LogOut().then(() => { 104 this.LogOut().then(() => {
104 - window.location.href = "https://test-myapps.secure.fedex.com/purpleid/signout/";//wsso系统跳转 105 + window.location.href = settings.loginURL;//wsso系统跳转
105 }) 106 })
106 } 107 }
107 if (res.data.roles && res.data.roles.length > 0) { // 验证返回的roles是否是一个非空数组 108 if (res.data.roles && res.data.roles.length > 0) { // 验证返回的roles是否是一个非空数组
......
...@@ -20,16 +20,14 @@ ...@@ -20,16 +20,14 @@
20 <el-form-item label="货站名称" prop="goodsStation"> 20 <el-form-item label="货站名称" prop="goodsStation">
21 <el-select class="selectWidth100" v-model.lazy="formData.goodsStation" filterable 21 <el-select class="selectWidth100" v-model.lazy="formData.goodsStation" filterable
22 :loading="goodsStationLoading" placeholder="不限"> 22 :loading="goodsStationLoading" placeholder="不限">
23 - <el-option v-for="(item, index) in goodsStationList" :label="item" :value="item" 23 + <el-option v-for="(item, index) in goodsStationList" :label="item" :value="item" :key="item">
24 - :key="item">
25 </el-option> 24 </el-option>
26 </el-select> 25 </el-select>
27 </el-form-item> 26 </el-form-item>
28 </div> 27 </div>
29 <div v-else> 28 <div v-else>
30 <el-form-item label="货站名称" prop="uploadGoodsStation"> 29 <el-form-item label="货站名称" prop="uploadGoodsStation">
31 - <el-input type="text" v-model="formData.uploadGoodsStation" maxlength="25" 30 + <el-input type="text" v-model="formData.uploadGoodsStation" maxlength="25" placeholder="请输入货站名称">
32 - placeholder="请输入货站名称">
33 </el-input> 31 </el-input>
34 </el-form-item> 32 </el-form-item>
35 <el-form-item prop="file" label-width="0px"> 33 <el-form-item prop="file" label-width="0px">
...@@ -195,7 +193,7 @@ export default { ...@@ -195,7 +193,7 @@ export default {
195 this.$message.warning(res.msg); 193 this.$message.warning(res.msg);
196 if (res.data) { 194 if (res.data) {
197 this.errorData = res.data; 195 this.errorData = res.data;
198 - this.$router.push({ name: 'UpDateResult', params: { data: this.errorData, from: 'FlightInformationImport' } }) 196 + this.$router.push({ name: 'UpDateResult', query: { data: this.errorData, from: 'FlightInformationImport' } })
199 } 197 }
200 } else { 198 } else {
201 this.$message.warning(res.msg); 199 this.$message.warning(res.msg);
......
...@@ -20,16 +20,14 @@ ...@@ -20,16 +20,14 @@
20 <el-form-item label="货站名称" prop="goodsStation"> 20 <el-form-item label="货站名称" prop="goodsStation">
21 <el-select class="selectWidth100" v-model.lazy="formData.goodsStation" filterable 21 <el-select class="selectWidth100" v-model.lazy="formData.goodsStation" filterable
22 :loading="goodsStationLoading" placeholder="不限"> 22 :loading="goodsStationLoading" placeholder="不限">
23 - <el-option v-for="(item, index) in goodsStationList" :label="item" :value="item" 23 + <el-option v-for="(item, index) in goodsStationList" :label="item" :value="item" :key="item">
24 - :key="item">
25 </el-option> 24 </el-option>
26 </el-select> 25 </el-select>
27 </el-form-item> 26 </el-form-item>
28 </div> 27 </div>
29 <div v-else> 28 <div v-else>
30 <el-form-item label="货站名称" prop="uploadGoodsStation"> 29 <el-form-item label="货站名称" prop="uploadGoodsStation">
31 - <el-input type="text" v-model="formData.uploadGoodsStation" maxlength="25" 30 + <el-input type="text" v-model="formData.uploadGoodsStation" maxlength="25" placeholder="请输入货站名称">
32 - placeholder="请输入货站名称">
33 </el-input> 31 </el-input>
34 </el-form-item> 32 </el-form-item>
35 <el-form-item prop="file" label-width="0px"> 33 <el-form-item prop="file" label-width="0px">
...@@ -195,7 +193,7 @@ export default { ...@@ -195,7 +193,7 @@ export default {
195 this.$message.warning(res.msg); 193 this.$message.warning(res.msg);
196 if (res.data) { 194 if (res.data) {
197 this.errorData = res.data; 195 this.errorData = res.data;
198 - this.$router.push({ name: 'UpDateResult', params: { data: this.errorData, from: 'FlightInformationImport' } }) 196 + this.$router.push({ name: 'UpDateResult', query: { data: this.errorData, from: 'FlightInformationImport' } })
199 } 197 }
200 } else { 198 } else {
201 this.$message.warning(res.msg); 199 this.$message.warning(res.msg);
......
1 <template> 1 <template>
2 <div class="cargoPage"> 2 <div class="cargoPage">
3 - <el-form ref="cargoForm" class="form-header" label-position="right" label-width="auto" size="small" 3 + <el-form ref="cargoForm" class="form-header" label-position="right" label-width="auto" size="small" :model="formData">
4 - :model="formData">
5 <el-row type="flex" style="flexWrap: wrap !important"> 4 <el-row type="flex" style="flexWrap: wrap !important">
6 <el-col :span="6"> 5 <el-col :span="6">
7 <el-form-item label="配舱航班日期"> 6 <el-form-item label="配舱航班日期">
...@@ -139,8 +138,7 @@ ...@@ -139,8 +138,7 @@
139 </div> 138 </div>
140 </template> 139 </template>
141 <el-select class="formItem" v-model="formData.cargoPlaneRoute" placeholder="不限" 140 <el-select class="formItem" v-model="formData.cargoPlaneRoute" placeholder="不限"
142 - :disabled="routeList.length == 0" clearable @change="routeSelectChange" 141 + :disabled="routeList.length == 0" clearable @change="routeSelectChange" :key="formData.cargoPlaneRoute">
143 - :key="formData.cargoPlaneRoute">
144 <el-option v-for="(item, index) in routeList" :label="item" :value="item" :key="item"> 142 <el-option v-for="(item, index) in routeList" :label="item" :value="item" :key="item">
145 <Tooltips :content="item" :refName="item"></Tooltips> 143 <Tooltips :content="item" :refName="item"></Tooltips>
146 </el-option> 144 </el-option>
...@@ -199,8 +197,8 @@ ...@@ -199,8 +197,8 @@
199 <el-button class="mr20" icon="el-icon-search" size="mini" @click="formShow = !formShow" circle></el-button> 197 <el-button class="mr20" icon="el-icon-search" size="mini" @click="formShow = !formShow" circle></el-button>
200 </el-tooltip> 198 </el-tooltip>
201 <el-tooltip content="表格设置" placement="top"> 199 <el-tooltip content="表格设置" placement="top">
202 - <HeaderSetting tableName="cargo" class="mr20" style="float:right;line-height: 48px;" 200 + <HeaderSetting tableName="cargo" class="mr20" style="float:right;line-height: 48px;" @close="headerSetClose">
203 - @close="headerSetClose"></HeaderSetting> 201 + </HeaderSetting>
204 </el-tooltip> 202 </el-tooltip>
205 </div> 203 </div>
206 </div> 204 </div>
...@@ -216,8 +214,8 @@ ...@@ -216,8 +214,8 @@
216 }}<i class="el-icon-link"></i> </el-link> 214 }}<i class="el-icon-link"></i> </el-link>
217 </template> 215 </template>
218 </Tables> 216 </Tables>
219 - <el-dialog title="舱位释放结果" width="80%" :visible.sync="dialogVisible" :close-on-click-modal="false" 217 + <el-dialog title="舱位释放结果" width="80%" :visible.sync="dialogVisible" :close-on-click-modal="false" :show-close="false"
220 - :show-close="false" :append-to-body="true" @close="close"> 218 + :append-to-body="true" @close="close">
221 <el-table :data="selectTable" size="mini" border stripe highlight-current-row style="width: 100%"> 219 <el-table :data="selectTable" size="mini" border stripe highlight-current-row style="width: 100%">
222 <el-table-column type="index" label="序号" align="center"> 220 <el-table-column type="index" label="序号" align="center">
223 </el-table-column> 221 </el-table-column>
...@@ -696,7 +694,8 @@ export default { ...@@ -696,7 +694,8 @@ export default {
696 }, 694 },
697 //配载航班号获取航线 695 //配载航班号获取航线
698 planeNoChange(val) { 696 planeNoChange(val) {
699 - getFlightsRoutes(val).then(res => { 697 + if (val != '' && val != null) {
698 + getFlightsRoutes(val.split(';')).then(res => {
700 if (res.code === 200) { 699 if (res.code === 200) {
701 this.routeList = res.data 700 this.routeList = res.data
702 } else { 701 } else {
...@@ -705,6 +704,7 @@ export default { ...@@ -705,6 +704,7 @@ export default {
705 }).catch(err => { 704 }).catch(err => {
706 console.log(err) 705 console.log(err)
707 }) 706 })
707 + }
708 }, 708 },
709 routeSelectChange(val) { 709 routeSelectChange(val) {
710 this.$forceUpdate() 710 this.$forceUpdate()
......
...@@ -159,7 +159,7 @@ export default { ...@@ -159,7 +159,7 @@ export default {
159 } 159 }
160 arr.push(obj) 160 arr.push(obj)
161 }) 161 })
162 - this.$router.push({ name: 'UpDateResult', params: { data: arr, from: 'queryCargo' } }) 162 + this.$router.push({ name: 'UpDateResult', query: { data: arr, from: 'queryCargo' } })
163 this.dialogBeforeClose() 163 this.dialogBeforeClose()
164 } else if (res.code === 202) { 164 } else if (res.code === 202) {
165 this.reBatchMoveCargoToOtherFlight(res.msg, 'overweight') 165 this.reBatchMoveCargoToOtherFlight(res.msg, 'overweight')
...@@ -207,7 +207,7 @@ export default { ...@@ -207,7 +207,7 @@ export default {
207 } 207 }
208 arr.push(obj) 208 arr.push(obj)
209 }) 209 })
210 - this.$router.push({ name: 'UpDateResult', params: { data: arr, from: 'queryCargo' } }) 210 + this.$router.push({ name: 'UpDateResult', query: { data: arr, from: 'queryCargo' } })
211 this.dialogBeforeClose() 211 this.dialogBeforeClose()
212 } else if (res.code === 203) { 212 } else if (res.code === 203) {
213 this.reBatchMoveCargoToOtherFlight(res.msg, 'notInWhite') 213 this.reBatchMoveCargoToOtherFlight(res.msg, 'notInWhite')
...@@ -286,6 +286,4 @@ export default { ...@@ -286,6 +286,4 @@ export default {
286 }; 286 };
287 </script> 287 </script>
288 288
289 -<style>
290 -
291 -</style>
...\ No newline at end of file ...\ No newline at end of file
289 +<style></style>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -164,18 +164,7 @@ export default { ...@@ -164,18 +164,7 @@ export default {
164 } else if (res.code === 201) { 164 } else if (res.code === 201) {
165 this.msgWarning(res.msg); 165 this.msgWarning(res.msg);
166 this.errorData = res.data; 166 this.errorData = res.data;
167 - this.$router.push({ name: 'UpDateResult', params: { data: this.errorData, from: 'FlightToArea' } }) 167 + this.$router.push({ name: 'UpDateResult', query: { data: this.errorData, from: 'FlightToArea' } })
168 - } else if (res.code === 301) {
169 - this.$confirm('登录状态已过期，需重新登录', '系统提示', {
170 - closeOnClickModal: false,
171 - showCancelButton: false,
172 - confirmButtonText: '重新登录',
173 - type: 'warning'
174 - }).then(
175 - this.$store.dispatch('LogOut').then(() => {
176 - window.location.href = settings.loginURL;//wsso系统跳转
177 - })
178 - )
179 } else { 168 } else {
180 this.msgWarning(res.msg); 169 this.msgWarning(res.msg);
181 } 170 }
......
...@@ -33,14 +33,12 @@ export default { ...@@ -33,14 +33,12 @@ export default {
33 } 33 }
34 }, 34 },
35 created() { 35 created() {
36 - this.tableData = this.$route.params.data 36 + this.tableData = this.$route.query.data
37 - this.fromRoute = this.$route.params.from 37 + this.fromRoute = this.$route.query.from
38 }, 38 },
39 - wactch: { 39 + activated() {
40 - dialogVisible(val) { 40 + this.tableData = this.$route.query.data
41 - if (val) { 41 + this.fromRoute = this.$route.query.from
42 - }
43 - }
44 }, 42 },
45 methods: { 43 methods: {
46 close() { 44 close() {
...@@ -56,6 +54,4 @@ export default { ...@@ -56,6 +54,4 @@ export default {
56 } 54 }
57 </script> 55 </script>
58 56
59 -<style lang="scss" scoped>
60 -
61 -</style>
...\ No newline at end of file ...\ No newline at end of file
57 +<style lang="scss" scoped></style>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -25,8 +25,8 @@ ...@@ -25,8 +25,8 @@
25 <el-row> 25 <el-row>
26 <el-col :span="6"> 26 <el-col :span="6">
27 <el-form-item label="生效日期" prop="beginDate" :rules="rules"> 27 <el-form-item label="生效日期" prop="beginDate" :rules="rules">
28 - <el-date-picker class="formItem" v-model="formData.beginDate" type="date" 28 + <el-date-picker class="formItem" v-model="formData.beginDate" type="date" placeholder="选择日期"
29 - placeholder="选择日期" value-format="yyyy-MM-dd" clearable> 29 + value-format="yyyy-MM-dd" clearable>
30 </el-date-picker> 30 </el-date-picker>
31 </el-form-item> 31 </el-form-item>
32 </el-col> 32 </el-col>
...@@ -171,18 +171,7 @@ export default { ...@@ -171,18 +171,7 @@ export default {
171 } else if (res.code === 201) { 171 } else if (res.code === 201) {
172 this.msgWarning(res.msg); 172 this.msgWarning(res.msg);
173 this.errorData = res.data; 173 this.errorData = res.data;
174 - this.$router.push({ name: 'UpDateResult', params: { data: this.errorData, from: 'FlightInformationImport' } }) 174 + this.$router.push({ name: 'UpDateResult', query: { data: this.errorData, from: 'FlightInformationImport' } })
175 - } else if (res.code === 301) {
176 - this.$confirm('登录状态已过期，需重新登录', '系统提示', {
177 - closeOnClickModal: false,
178 - showCancelButton: false,
179 - confirmButtonText: '重新登录',
180 - type: 'warning'
181 - }).then(
182 - this.$store.dispatch('LogOut').then(() => {
183 - window.location.href = settings.loginURL;//wsso系统跳转
184 - })
185 - )
186 } else { 175 } else {
187 this.msgWarning(res.msg); 176 this.msgWarning(res.msg);
188 } 177 }
......