Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/views/airtransport/queryBill.vue

@@ -9,6 +9,7 @@ let baseUrlPrediction = 'air-server-transport/transport/prediction'
 let baseUrlConfirm = 'air-server-transport/transport/confirm'
 let baseUrlSchedule = 'air-server-transport/transport/schedule'
 let baseUrlLongtimeplan = 'air-server-transport/transport/longtimeplan'
+let baseUrlBillperson = 'air-server-transport/transport/billperson'
 
 
 
@@ -92,5 +93,14 @@ export const addSchedule = params => { return http.post(`${baseUrlSchedule}/addS
 export const editSchedule=params=>{return http.put(`${baseUrlSchedule}/editSchedule`,  params);};
 //查询列表
 export const selectSchedule=params=>{return http.get(`${baseUrlSchedule}/selectSchedule`,  params);};
+
 //查询长期计划查询列表
-export const selectLongTimePlan=params=>{return http.get(`${baseUrlLongtimeplan}/selectLongTimePlan`,  params);};
\ No newline at end of file
+export const selectLongTimePlan=params=>{return http.get(`${baseUrlLongtimeplan}/selectLongTimePlan`,  params);};
+
+//机组人员
+//新增方法
+export const addBillPerson = params => { return http.post(`${baseUrlBillperson}/addBillPerson`,  params); };
+//删除方法
+export const editBillPerson=params=>{return http.put(`${baseUrlBillperson}/editBillPerson`,  params);};
+//查询列表
+export const selectBillPerson=params=>{return http.get(`${baseUrlBillperson}/selectBillPerson`,  params);};
\ No newline at end of file

@@ -309,8 +309,9 @@ background-color: white;
 .el-col{margin-right: 0px;}
 </style>
 <script>
-
     import {addBill} from '../../api/transport'
+    const fecha = require('fecha');
+    import loginUserInfo from '../../api/base'
     export default {
         data(){
             return{
@@ -344,9 +345,9 @@ background-color: white;
                     statusMsg:undefined,
                     meno:undefined,
                     createTime:undefined,
-                    createBy:undefined,
+                    createBy:loginUserInfo.username,
                     updateTime:undefined,
-                    updateBy:undefined,
+                    updateBy:loginUserInfo.username,
                     isDelete:undefined,
                     remark:undefined,
                     remark1:undefined,
@@ -431,9 +432,9 @@ background-color: white;
                     certType:undefined,
                     ceterNo:undefined,
                     createTime:undefined,
-                    createBy:undefined,
+                    createBy:loginUserInfo.username,
                     updateTime:undefined,
-                    updateBy:undefined,
+                    updateBy:loginUserInfo.username,
                     meno:undefined,
                     isDelete:undefined,
                     billsId:undefined
@@ -481,7 +482,8 @@ background-color: white;
                             if(response.code=='200'){
                                 this.centerDialogVisible=true;
                                 this.msg=response.msg;
-                                this.$router.push({path:'/queryBill',query:{serialNo:JSON.stringify(this.bill.serialNo)}});
+                                this.$router.push({path:'/queryBill',query:{aircraftNo:JSON.stringify(this.bill.aircraftNo),flightNo:JSON.stringify(this.bill.flightNo),
+                                        flightDate:JSON.stringify(this.bill.flightDate)}});
                             }else{
                                 this.msg=response.msg;
                             }

@@ -6,7 +6,7 @@
                     <div class="grid-content content">单据查询</div>
                 </el-col>
             </el-row>
-            <!--            搜索区域-->
+            <!--搜索区域-->
             <el-row>
                  <el-form :label-position="labelPosition" :model="queryBill" :rules="rules" ref="queryBill"
                      label-width="130px" class="demo-ruleForm">
@@ -25,6 +25,8 @@
                             <el-date-picker
                                     v-model="queryBill.flightDate"
                                     type="date"
+                                    value-format="yyyyMMdd"
+                                    format="yyyyMMdd"
                                     style="width:190px"
                                     placeholder="选择日期">
                             </el-date-picker>
@@ -40,7 +42,7 @@
                     </el-col>
                  </el-form>
             </el-row>
-<!--            表单区域-->
+            <!--表单区域-->
             <el-row>
                 <el-table
                         :data="tableData"
@@ -60,50 +62,42 @@
                     </el-table-column>
                     <el-table-column
                             prop=aircraftNo"
-                            label="航空器注册号"
-                            width="120">
+                            label="航空器注册号">
                     </el-table-column>
                     <el-table-column
                             prop="flightNo"
-                            label="航班号"
-                            width="80">
+                            label="航班号">
                     </el-table-column>
                     <el-table-column
                             prop="flightDate"
-                            label="航班日期"
-                            width="150">
+                            label="航班日期">
                     </el-table-column>
                     <el-table-column
                             prop="accessFlag"
-                            label="进出港标识"
-                            width="120">
+                            label="进出港标识">
                     </el-table-column>
                     <el-table-column
                             prop="departureAirport"
-                            label="出发港"
-                            width="80">
+                            label="出发港">
                     </el-table-column>
                     <el-table-column
                             prop="departuredatetime"
-                            label="出发时间"
-                            width="150">
+                            label="出发时间">
                     </el-table-column>
                     <el-table-column
                             prop="arrivalAirport"
-                            label="目的港"
-                            width="80">
+                            label="目的港">
                     </el-table-column>
                     <el-table-column
                             prop="arrivaldatetime"
-                            label="到达时间"
-                            width="150">
+                            label="到达时间">
                     </el-table-column>
                     <el-table-column
                             prop="statusMsg"
-                            label="海关回执"
-                            width="150">
+                            label="海关回执">
                     </el-table-column>
                     <el-table-column
+                            fixed="right"
                             prop=""
                             label="报文操作"
                             width="150">
@@ -112,8 +106,6 @@
                                     size="mini"
                                     type="success"
                                     @click="handleEdit(scope.$index, scope.row)">查看</el-button>
-                        </template>
-                        <template slot-scope="scope">
                             <el-button
                                     size="mini"
                                     type="danger"
@@ -219,10 +211,11 @@
             },
             //获取默认值
             defaultData(){
-                this.flightNo=JSON.parse(this.$route.query.flightNo);
-                this.aircraftNo=JSON.parse(this.$route.query.aircraftNo);
-                this.flightDate=JSON.parse(this.$route.query.flightDate);
-                this.accessFlag=JSON.parse(this.$route.query.accessFlag);
+                if(this.$route.query.aircraftNo!=null){
+                    this.queryBill.flightNo=JSON.parse(this.$route.query.flightNo);
+                    this.queryBill.aircraftNo=JSON.parse(this.$route.query.aircraftNo);
+                    this.queryBill.flightDate=JSON.parse(this.$route.query.flightDate);
+                }
             },
             //编辑单据查询
             handleEdit(index,row){