Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
jinhui.wang
3470282b 1 parent 0b4cefbc

航班顺位查看配载航班增加航线，修正维度新增保留状态的bug，文本修正

Inline Side-by-side
Showing 4 changed files with 21 additions and 13 deletions
...@@ -1158,6 +1158,7 @@ export default { ...@@ -1158,6 +1158,7 @@ export default {
1158 }, 1158 },
1159 //返回 1159 //返回
1160 close() { 1160 close() {
1161 + this.$store.dispatch('tagsView/delView', this.$route)
1161 this.$store.state.tagsView.visitedViews.splice( 1162 this.$store.state.tagsView.visitedViews.splice(
1162 this.$store.state.tagsView.visitedViews.findIndex( 1163 this.$store.state.tagsView.visitedViews.findIndex(
1163 (item) => item.path === this.$route.path 1164 (item) => item.path === this.$route.path
......
...@@ -60,13 +60,15 @@ ...@@ -60,13 +60,15 @@
60 <el-table-column type="index" label="序号" align="center"> 60 <el-table-column type="index" label="序号" align="center">
61 <template slot-scope="scope">{{ scope.$index + 1 }}</template> 61 <template slot-scope="scope">{{ scope.$index + 1 }}</template>
62 </el-table-column> 62 </el-table-column>
63 - <el-table-column label="原航班" align="center" prop="sourceFlightNo" /> 63 + <el-table-column label="原航班" align="center" prop="sourceFlightNo" width="150" />
64 - <el-table-column label="实际配载航班" align="center" prop="actualFlight" width="280" /> 64 + <el-table-column label="实际配载航班" align="center" prop="actualFlight" width="250" />
65 - <el-table-column label="航班日期" align="center" prop="flightDate" /> 65 + <el-table-column label="航线" align="center" prop="route" />
66 - <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="200"> 66 + <el-table-column label="航班日期" align="center" prop="flightDate" width="150" />
67 + <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150">
67 <template slot-scope="scope"> 68 <template slot-scope="scope">
68 <el-button size="mini" type="text" icon="el-icon-edit" 69 <el-button size="mini" type="text" icon="el-icon-edit"
69 - @click="handleClick(scope.row.actualFlight, 'detail', scope.row.flightDate)">查看配置维度</el-button> 70 + @click="handleClick(scope.row.actualFlight, 'detail', scope.row.flightDate,scope.row.route)">查看配置维度
71 + </el-button>
70 </template> 72 </template>
71 </el-table-column> 73 </el-table-column>
72 </el-table> 74 </el-table>
...@@ -266,15 +268,19 @@ export default { ...@@ -266,15 +268,19 @@ export default {
266 }, 268 },
267 methods: { 269 methods: {
268 //跳转到查看，修改页面 270 //跳转到查看，修改页面
269 - handleClick(fltNo, handle, fltDate) { 271 + handleClick(fltNo, handle, fltDate, route) {
270 this.openFlightDate = false; 272 this.openFlightDate = false;
271 - this.$router.push({ 273 + let obj = {
272 - name: "FlightAllocConfigInfo",
273 - params: {
274 handle: handle, 274 handle: handle,
275 fltNo: fltNo, 275 fltNo: fltNo,
276 - fltDate: fltDate 276 + fltDate: fltDate != null ? fltDate : ' ',
277 - }, 277 + route: route,
278 + routeStatus: 'FlightRandConfig',
279 + status: '1'
280 + }
281 + this.$router.push({
282 + name: "FlightAllocConfigInfo",
283 + params: obj,
278 }); 284 });
279 }, 285 },
280 /** 查询原航班顺位规则*/ 286 /** 查询原航班顺位规则*/
......
...@@ -11,8 +11,8 @@ ...@@ -11,8 +11,8 @@
11 </el-col> 11 </el-col>
12 <el-col :span="6"> 12 <el-col :span="6">
13 <el-form-item label="品名"> 13 <el-form-item label="品名">
14 - <el-input class="formItem" v-model="selectionData.goodsName" placeholder="请输入货站名称" 14 + <el-input class="formItem" v-model="selectionData.goodsName" placeholder="请输入品名" maxlength="50"
15 - maxlength="50" clearable /> 15 + clearable />
16 </el-form-item> 16 </el-form-item>
17 </el-col> 17 </el-col>
18 </el-row> 18 </el-row>
......
...@@ -64,6 +64,7 @@ export default { ...@@ -64,6 +64,7 @@ export default {
64 }, 64 },
65 //返回 65 //返回
66 close() { 66 close() {
67 + this.$store.dispatch('tagsView/delView', this.$route)
67 this.$store.state.tagsView.visitedViews.splice( 68 this.$store.state.tagsView.visitedViews.splice(
68 this.$store.state.tagsView.visitedViews.findIndex( 69 this.$store.state.tagsView.visitedViews.findIndex(
69 (item) => item.path === this.$route.path 70 (item) => item.path === this.$route.path
......