朱兆平 / vue_cli · 提交

转到一个项目

作者 小范
提交 cfbefa082f530a946fd2b101f2f1e9580dd8f507 1 个父辈 e022fe13

20200623-trans

内嵌 并排对比
正在显示 2 个修改的文件 包含 127 行增加 和 155 行删除
... ... @@ -155,123 +155,7 @@
<el-row style="margin-left: 120px">
<el-col :span="24">
<el-button type="primary" @click="submitForm('bill')">保 存</el-button>
<el-button type="success">保存并发送</el-button></el-col>
</el-row>
<el-row class="row-bg">
<el-col :span="24">
<div class="grid-content content">机组名单<el-button type="primary" size="mini" @click="dialogTableVisible = true" style="margin-left:50px">添加机组人员</el-button></div>
</el-col>
</el-row>
<!--添加机组人员dialog-->
<el-row>
<el-dialog title="机组人员添加" :visible.sync="dialogTableVisible">
<el-form :model="billperson" :rules="brules" ref="billperson" label-width="100px" class="demo-ruleForm">
<el-row>
<el-col :span="12">
<el-form-item label="姓名" prop="name">
<el-input v-model="billperson.name" placeholder="请输入"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="性别" prop="gender">
<el-input v-model="billperson.gender" placeholder="M/F"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="证件类型" prop="certType">
<el-input v-model="billperson.certType" placeholder="请输入"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="证件号码" prop="ceterNo">
<el-input v-model="billperson.ceterNo" placeholder="请输入"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="国籍" prop="nationality">
<el-input v-model="billperson.nationality" placeholder="请输入"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="职务" prop="gareer">
<el-input v-model="billperson.gareer" placeholder="请输入"></el-input>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="备注" prop="meno">
<el-input v-model="billperson.meno" placeholder="请输入"></el-input>
</el-form-item>
</el-col>
<el-col :span="24"> <el-button type="primary" @click="submitPerson('billperson')" style="float: right">提 交</el-button></el-col>
</el-row>
</el-form>
</el-dialog>
</el-row>
<el-row>
<el-table
:data="tableData"
border
style="width: 100%;margin-bottom: 10px">
<el-table-column
fixed="left"
label="操作"
width="150">
<template slot-scope="scope">
<el-button
size="mini"
type="primary"
@click="handleEdit(scope.$index, scope.row)">选择</el-button>
</template>
</el-table-column>
<el-table-column
prop="name"
label="姓名"
width="150">
</el-table-column>
<el-table-column
prop="gender"
label="性别"
width="150">
</el-table-column>
<el-table-column
prop="nationality"
label="国籍"
width="150">
</el-table-column>
<el-table-column
prop="certType"
label="证件类型"
width="150">
</el-table-column>
<el-table-column
prop="ceterNo"
label="证件编辑"
width="150">
</el-table-column>
<el-table-column
prop="gareer"
label="职务"
width="150">
</el-table-column>
<el-table-column
prop="meno"
label="备注"
width="350">
</el-table-column>
</el-table>
</el-row>
<el-row>
<div class="block">
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page="currentPage"
:page-sizes="[10, 20, 30, 40]"
:page-size="pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="total">
</el-pagination>
</div>
</el-row>
<!--对话提示框-->
<el-row>
... ... @@ -422,43 +306,6 @@ background-color: white;
{required: true, message: '请输入', trigger: 'blur'}
],
},
dialogTableVisible:false,
billperson:{
autoId:undefined,
name:undefined,
gender:undefined,
gareer:undefined,
nationality:undefined,
certType:undefined,
ceterNo:undefined,
createTime:undefined,
createBy:loginUserInfo.username,
updateTime:undefined,
updateBy:loginUserInfo.username,
meno:undefined,
isDelete:undefined,
billsId:undefined
},
brules:{
name: [
{required: true, message: '请输入', trigger: 'blur'}
],
gender: [
{required: true, message: '请输入', trigger: 'blur'}
],
certType: [
{required: true, message: '请输入', trigger: 'blur'}
],
ceterNo: [
{required: true, message: '请输入', trigger: 'blur'}
],
nationality: [
{required: true, message: '请输入', trigger: 'blur'}
],
gareer: [
{required: true, message: '请输入', trigger: 'blur'}
],
},
tableData:[{
arrivaldatetime: '161146',
departuredatetime: '161146',
... ...
... ... @@ -52,12 +52,16 @@
<el-table-column
fixed="left"
label="操作"
width="100">
width="200">
<template slot-scope="scope">
<el-button
size="mini"
type="primary"
@click="handleEdit(scope.$index, scope.row)">编辑</el-button>
<el-button
size="mini"
type="primary"
@click="dialogTableVisibles = true">添加机组人员</el-button>
</template>
</el-table-column>
<el-table-column
... ... @@ -100,12 +104,13 @@
fixed="right"
prop=""
label="报文操作"
width="200">
width="280">
<template slot-scope="scope">
<el-button
size="mini"
type="primary"
@click="selectDetail(scope.$index,scope.row)">查看回执</el-button>
<el-button size="mini" type="success">保存并发送</el-button>
<el-button
size="mini"
type="danger"
... ... @@ -138,6 +143,87 @@
</el-table>
</el-dialog>
</el-main>
<!--添加机组人员dialog-->
<el-row>
<el-dialog title="机组人员添加" :visible.sync="dialogTableVisibles" >
<el-form :model="billperson" :rules="brules" ref="billperson" label-width="130px" class="demo-ruleForm">
<el-row>
<el-col :span="10">
<el-form-item label="姓名" prop="name">
<el-input v-model="billperson.name" placeholder="请输入"></el-input>
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item label="性别" prop="gender">
<el-input v-model="billperson.gender" placeholder="M/F"></el-input>
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item label="证件类型" prop="certType">
<el-input v-model="billperson.certType" placeholder="请输入"></el-input>
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item label="证件号码" prop="ceterNo">
<el-input v-model="billperson.ceterNo" placeholder="请输入"></el-input>
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item label="国籍" prop="nationality">
<el-input v-model="billperson.nationality" placeholder="请输入"></el-input>
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item label="职务" prop="gareer">
<el-input v-model="billperson.gareer" placeholder="请输入"></el-input>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="备注" prop="meno">
<el-input v-model="billperson.meno" placeholder="请输入"></el-input>
</el-form-item>
</el-col>
<el-col :span="24"> <el-button type="primary" @click="submitPerson('billperson')" style="float: right">提 交</el-button></el-col>
</el-row>
</el-form>
<el-row>
<el-table
:data="tableData2"
border
style="width: 100%;margin-bottom: 10px">
<el-table-column
prop="name"
label="姓名">
</el-table-column>
<el-table-column
prop="gender"
label="性别">
</el-table-column>
<el-table-column
prop="nationality"
label="国籍">
</el-table-column>
<el-table-column
prop="certType"
label="证件类型">
</el-table-column>
<el-table-column
prop="ceterNo"
label="证件编辑">
</el-table-column>
<el-table-column
prop="gareer"
label="职务">
</el-table-column>
<el-table-column
prop="meno"
label="备注">
</el-table-column>
</el-table>
</el-row>
</el-dialog>
</el-row>
</el-container>
</template>
<style scoped>
... ... @@ -160,6 +246,7 @@
</style>
<script>
import {editBill,selectBill,selectReturnMsg} from "../../api/transport";
import loginUserInfo from "../../api/base";
export default {
data(){
return{
... ... @@ -169,6 +256,43 @@
flightDate:undefined,
accessFlag:undefined,
},
billperson:{
autoId:undefined,
name:undefined,
gender:undefined,
gareer:undefined,
nationality:undefined,
certType:undefined,
ceterNo:undefined,
createTime:undefined,
createBy:loginUserInfo.username,
updateTime:undefined,
updateBy:loginUserInfo.username,
meno:undefined,
isDelete:undefined,
billsId:undefined
},
brules:{
name: [
{required: true, message: '请输入', trigger: 'blur'}
],
gender: [
{required: true, message: '请输入', trigger: 'blur'}
],
certType: [
{required: true, message: '请输入', trigger: 'blur'}
],
ceterNo: [
{required: true, message: '请输入', trigger: 'blur'}
],
nationality: [
{required: true, message: '请输入', trigger: 'blur'}
],
gareer: [
{required: true, message: '请输入', trigger: 'blur'}
],
},
dialogTableVisibles:false,
tableloading:false,
rules:{},
labelPosition:'left',
... ... @@ -176,6 +300,7 @@
pageSize:10,
total:0,
tableData:[],
tableData2:[],
gridData:[],
dialogTableVisible: false,
}
... ...