Merge remote-tracking branch 'origin/master'
# Conflicts: # src/views/airtransport/queryBill.vue
正在显示
2 个修改的文件
包含
19 行增加
和
9 行删除
| @@ -95,7 +95,8 @@ | @@ -95,7 +95,8 @@ | ||
| 95 | </el-table-column> | 95 | </el-table-column> |
| 96 | <el-table-column | 96 | <el-table-column |
| 97 | prop="linesType" | 97 | prop="linesType" |
| 98 | - label="执行任务类型"> | 98 | + label="执行任务类型" |
| 99 | + width="120"> | ||
| 99 | </el-table-column> | 100 | </el-table-column> |
| 100 | <el-table-column | 101 | <el-table-column |
| 101 | prop="statusMsg" | 102 | prop="statusMsg" |
| @@ -105,14 +106,12 @@ | @@ -105,14 +106,12 @@ | ||
| 105 | fixed="right" | 106 | fixed="right" |
| 106 | prop="" | 107 | prop="" |
| 107 | label="报文操作" | 108 | label="报文操作" |
| 108 | - width="150"> | 109 | + width="200"> |
| 109 | <template slot-scope="scope"> | 110 | <template slot-scope="scope"> |
| 110 | <el-button | 111 | <el-button |
| 111 | size="mini" | 112 | size="mini" |
| 112 | - type="success" | ||
| 113 | - @click="handleEdit(scope.$index, scope.row)">查看</el-button> | ||
| 114 | - </template> | ||
| 115 | - <template slot-scope="scope"> | 113 | + type="primary" |
| 114 | + @click="dialogTableVisible = true">查看回执</el-button> | ||
| 116 | <el-button | 115 | <el-button |
| 117 | size="mini" | 116 | size="mini" |
| 118 | type="danger" | 117 | type="danger" |
| @@ -134,6 +133,16 @@ | @@ -134,6 +133,16 @@ | ||
| 134 | </el-pagination> | 133 | </el-pagination> |
| 135 | </div> | 134 | </div> |
| 136 | </el-row> | 135 | </el-row> |
| 136 | + <!-- 查看回执弹框--> | ||
| 137 | + <el-dialog title="回执明细" :visible.sync="dialogTableVisible"> | ||
| 138 | + <el-table :data="gridData"> | ||
| 139 | + <el-table-column prop="" label="操作时间" fixed="left" width="150"></el-table-column> | ||
| 140 | + <el-table-column property="createBy" label="操作人" ></el-table-column> | ||
| 141 | + <el-table-column property="flightNo" label="航班号" ></el-table-column> | ||
| 142 | + <el-table-column property="flightDate" label="航班日期" ></el-table-column> | ||
| 143 | + <el-table-column property="receiptContent" label="回执内容" fixed="right" width="400"></el-table-column> | ||
| 144 | + </el-table> | ||
| 145 | + </el-dialog> | ||
| 137 | </el-main> | 146 | </el-main> |
| 138 | </el-container> | 147 | </el-container> |
| 139 | </template> | 148 | </template> |
| @@ -170,8 +179,9 @@ | @@ -170,8 +179,9 @@ | ||
| 170 | pageSize:10, | 179 | pageSize:10, |
| 171 | total:0, | 180 | total:0, |
| 172 | tableData: [], | 181 | tableData: [], |
| 173 | - tableloading:false | ||
| 174 | - | 182 | + tableloading:false, |
| 183 | + gridData:[], | ||
| 184 | + dialogTableVisible: false, | ||
| 175 | } | 185 | } |
| 176 | }, | 186 | }, |
| 177 | methods: { | 187 | methods: { |
| @@ -91,7 +91,7 @@ | @@ -91,7 +91,7 @@ | ||
| 91 | @click="handleDetail(scope.$index, scope.row)">查看明细</el-button> | 91 | @click="handleDetail(scope.$index, scope.row)">查看明细</el-button> |
| 92 | <el-button | 92 | <el-button |
| 93 | size="mini" | 93 | size="mini" |
| 94 | - type="primary" | 94 | + type="danger" |
| 95 | @click="handleDelete(scope.$index, scope.row)">删除</el-button> | 95 | @click="handleDelete(scope.$index, scope.row)">删除</el-button> |
| 96 | </template> | 96 | </template> |
| 97 | </el-table-column> | 97 | </el-table-column> |
-
请 注册 或 登录 后发表评论