作者 xudada

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/views/airtransport/queryBill.vue
... ... @@ -95,7 +95,8 @@
</el-table-column>
<el-table-column
prop="linesType"
label="执行任务类型">
label="执行任务类型"
width="120">
</el-table-column>
<el-table-column
prop="statusMsg"
... ... @@ -105,14 +106,12 @@
fixed="right"
prop=""
label="报文操作"
width="150">
width="200">
<template slot-scope="scope">
<el-button
size="mini"
type="success"
@click="handleEdit(scope.$index, scope.row)">查看</el-button>
</template>
<template slot-scope="scope">
type="primary"
@click="dialogTableVisible = true">查看回执</el-button>
<el-button
size="mini"
type="danger"
... ... @@ -134,6 +133,16 @@
</el-pagination>
</div>
</el-row>
<!-- 查看回执弹框-->
<el-dialog title="回执明细" :visible.sync="dialogTableVisible">
<el-table :data="gridData">
<el-table-column prop="" label="操作时间" fixed="left" width="150"></el-table-column>
<el-table-column property="createBy" label="操作人" ></el-table-column>
<el-table-column property="flightNo" label="航班号" ></el-table-column>
<el-table-column property="flightDate" label="航班日期" ></el-table-column>
<el-table-column property="receiptContent" label="回执内容" fixed="right" width="400"></el-table-column>
</el-table>
</el-dialog>
</el-main>
</el-container>
</template>
... ... @@ -170,8 +179,9 @@
pageSize:10,
total:0,
tableData: [],
tableloading:false
tableloading:false,
gridData:[],
dialogTableVisible: false,
}
},
methods: {
... ...
... ... @@ -91,7 +91,7 @@
@click="handleDetail(scope.$index, scope.row)">查看明细</el-button>
<el-button
size="mini"
type="primary"
type="danger"
@click="handleDelete(scope.$index, scope.row)">删除</el-button>
</template>
</el-table-column>
... ...