jinhui.wang

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

1 <template> 1 <template>
2 <div style="padding:20px;min-height: 300px;"> 2 <div style="padding:20px;min-height: 300px;">
3 - <el-button class="ml20 mb20" size="small" icon="el-icon-back" @click="close">返 回</el-button> 3 + <!-- <el-button class="ml20 mb20" size="small" icon="el-icon-back" @click="close">返 回</el-button> -->
4 <!-- 空状态 --> 4 <!-- 空状态 -->
5 <div v-if="isEmpty"> 5 <div v-if="isEmpty">
6 <el-empty description="未查询到数据!"></el-empty> 6 <el-empty description="未查询到数据!"></el-empty>
......
...@@ -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;
273 + let obj = {
274 + handle: handle,
275 + fltNo: fltNo,
276 + fltDate: fltDate != null ? fltDate : ' ',
277 + route: route,
278 + routeStatus: 'FlightRandConfig',
279 + status: '1'
280 + }
271 this.$router.push({ 281 this.$router.push({
272 name: "FlightAllocConfigInfo", 282 name: "FlightAllocConfigInfo",
273 - params: { 283 + params: obj,
274 - handle: handle,
275 - fltNo: fltNo,
276 - fltDate: fltDate
277 - },
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>
......
1 <template> 1 <template>
2 <div style="padding:10px"> 2 <div style="padding:10px">
3 - <el-button class="ml20 mb20" size="small" icon="el-icon-back" @click="close">返 回</el-button> 3 + <!-- <el-button class="ml20 mb20" size="small" icon="el-icon-back" @click="close">返 回</el-button> -->
4 <el-card header="流水信息"> 4 <el-card header="流水信息">
5 <Tables ref="weatherTable" ductName="weatherTable" :order="true" :border="false" :data="data" 5 <Tables ref="weatherTable" ductName="weatherTable" :order="true" :border="false" :data="data"
6 :headerData="tableHeader" :showOverflowTooltip="false" :height="tableHeight" :page="selectData.page" 6 :headerData="tableHeader" :showOverflowTooltip="false" :height="tableHeight" :page="selectData.page"
......