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

jinhui.wang
Commit 69dc0f77f8d795a99d46b8d7711dd7339e8392dc 69dc0f77 1 parent a5597526
Showing 8 changed files with 26 additions and 40 deletions
src/router/index.js
src/views/basicInformation/goodsBlackStation/dialog.vue
src/views/basicInformation/goodsStation/dialog.vue
src/views/basicInformation/queryCargo/index.vue
src/views/basicInformation/queryCargo/info.vue
src/views/preMdeConfig/flightToArea/index.vue
src/views/preMdeConfig/upDateResult.vue
src/views/preMdeConfig/ursaToArea/index.vue
--- a/src/router/index.js
View file @69dc0f7
+++ b/src/router/index.js
View file @69dc0f7
@@ -85,7 +85,7 @@ export const constantRoutes = [
         meta: { title: '流水表', icon: 'user' }
       },
       {
-        path: '/upDateResult->:from',
+        path: '/upDateResult',
         component: (resolve) => require(['@/views/preMdeConfig/upDateResult'], resolve),
         name: 'UpDateResult',
         meta: { title: '错误信息提示', icon: 'user' }
--- a/src/views/basicInformation/goodsBlackStation/dialog.vue
View file @69dc0f7
+++ b/src/views/basicInformation/goodsBlackStation/dialog.vue
View file @69dc0f7
@@ -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"
+                            <el-option v-for="(item, index) in goodsStationList" :label="item" :value="item" :key="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"
+                        <el-input type="text" v-model="formData.uploadGoodsStation" maxlength="25" placeholder="请输入货站名称">
-                            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);
--- a/src/views/basicInformation/goodsStation/dialog.vue
View file @69dc0f7
+++ b/src/views/basicInformation/goodsStation/dialog.vue
View file @69dc0f7
@@ -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"
+                            <el-option v-for="(item, index) in goodsStationList" :label="item" :value="item" :key="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"
+                        <el-input type="text" v-model="formData.uploadGoodsStation" maxlength="25" placeholder="请输入货站名称">
-                            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);
--- a/src/views/basicInformation/queryCargo/index.vue
View file @69dc0f7
+++ b/src/views/basicInformation/queryCargo/index.vue
View file @69dc0f7
 <template>
   <div class="cargoPage">
-    <el-form ref="cargoForm" class="form-header" label-position="right" label-width="auto" size="small"
+    <el-form ref="cargoForm" class="form-header" label-position="right" label-width="auto" size="small" :model="formData">
-      :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"
+                  :disabled="routeList.length == 0" clearable @change="routeSelectChange" :key="formData.cargoPlaneRoute">
-                  :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;"
+            <HeaderSetting tableName="cargo" class="mr20" style="float:right;line-height: 48px;" @close="headerSetClose">
-              @close="headerSetClose"></HeaderSetting>
+            </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"
+    <el-dialog title="舱位释放结果" width="80%" :visible.sync="dialogVisible" :close-on-click-modal="false" :show-close="false"
-      :show-close="false" :append-to-body="true" @close="close">
+      :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>
@@ -376,7 +374,6 @@ export default {
     this.selectTable = []
     this.cargoTotal()
     if (this.$route.params.fltNo) {
-      console.log(1)
       //判断进入页面是否带参，确定是否是index跳转
       this.formData = {
         fltDateStart: "",
@@ -409,7 +406,6 @@ export default {
         limitStart: 1,
         limitSize: 100,
       }
-      console.log(this.$route)
       this.cargoPlaneTime = [this.$route.params.fltDate, this.$route.params.fltDate]
       this.formData.cargoPlaneStart = this.$route.params.fltDate
       this.formData.cargoPlaneEnd = this.$route.params.fltDate
@@ -696,7 +692,7 @@ export default {
     },
     //配载航班号获取航线
     planeNoChange(val) {
-      getFlightsRoutes(val).then(res => {
+      getFlightsRoutes(val.split(';')).then(res => {
         if (res.code === 200) {
           this.routeList = res.data
         } else {
--- a/src/views/basicInformation/queryCargo/info.vue
View file @69dc0f7
+++ b/src/views/basicInformation/queryCargo/info.vue
View file @69dc0f7
@@ -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
--- a/src/views/preMdeConfig/flightToArea/index.vue
View file @69dc0f7
+++ b/src/views/preMdeConfig/flightToArea/index.vue
View file @69dc0f7
@@ -164,7 +164,7 @@ export default {
                     } else if (res.code === 201) {
                         this.msgWarning(res.msg);
                         this.errorData = res.data.data;
-                        this.$router.push({ name: 'UpDateResult', params: { data: this.errorData, from: 'FlightToArea' } })
+                        this.$router.push({ name: 'UpDateResult', query: { data: this.errorData, from: 'FlightToArea' } })
                     } else {
                         this.msgWarning(res.msg);
                     }
--- a/src/views/preMdeConfig/upDateResult.vue
View file @69dc0f7
+++ b/src/views/preMdeConfig/upDateResult.vue
View file @69dc0f7
@@ -33,14 +33,13 @@ export default {
         }
     },
     created() {
-        this.tableData = this.$route.params.data
+        console.log(this.$route)
-        this.fromRoute = this.$route.params.from
+        this.tableData = this.$route.query.data
+        this.fromRoute = this.$route.query.from
     },
-    wactch: {
+    activated() {
-        dialogVisible(val) {
+        this.tableData = this.$route.query.data
-            if (val) {
+        this.fromRoute = this.$route.query.from
-            }
-        }
     },
     methods: {
         close() {
@@ -56,6 +55,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
--- a/src/views/preMdeConfig/ursaToArea/index.vue
View file @69dc0f7
+++ b/src/views/preMdeConfig/ursaToArea/index.vue
View file @69dc0f7
@@ -171,7 +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' } })
+                        this.$router.push({ name: 'UpDateResult', query: { data: this.errorData, from: 'FlightInformationImport' } })
                     } else {
                         this.msgWarning(res.msg);
                     }
@@ -200,7 +200,6 @@ export default {
             this.selection()
         },
         upload() {
-            console.log(1)
             this.$refs.selectForm.validateField('beginDate')
         }
     },