朱兆平 / vue_cli · 提交

转到一个项目

作者 小范
提交 6a39c088cd36c8ffb25d63f93f1b3a848a8893cc 2 个父辈 dc68673b a3f9876a

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	src/views/airtransport/queryBill.vue
内嵌 并排对比
正在显示 3 个修改的文件 包含 38 行增加 和 33 行删除
@@ -9,6 +9,7 @@ let baseUrlPrediction = 'air-server-transport/transport/prediction' @@ -9,6 +9,7 @@ let baseUrlPrediction = 'air-server-transport/transport/prediction'
9 let baseUrlConfirm = 'air-server-transport/transport/confirm' 9 let baseUrlConfirm = 'air-server-transport/transport/confirm'
10 let baseUrlSchedule = 'air-server-transport/transport/schedule' 10 let baseUrlSchedule = 'air-server-transport/transport/schedule'
11 let baseUrlLongtimeplan = 'air-server-transport/transport/longtimeplan' 11 let baseUrlLongtimeplan = 'air-server-transport/transport/longtimeplan'
  12 +let baseUrlBillperson = 'air-server-transport/transport/billperson'
12 13
13 14
14 15
@@ -92,5 +93,14 @@ export const addSchedule = params => { return http.post(`${baseUrlSchedule}/addS @@ -92,5 +93,14 @@ export const addSchedule = params => { return http.post(`${baseUrlSchedule}/addS
92 export const editSchedule=params=>{return http.put(`${baseUrlSchedule}/editSchedule`, params);}; 93 export const editSchedule=params=>{return http.put(`${baseUrlSchedule}/editSchedule`, params);};
93 //查询列表 94 //查询列表
94 export const selectSchedule=params=>{return http.get(`${baseUrlSchedule}/selectSchedule`, params);}; 95 export const selectSchedule=params=>{return http.get(`${baseUrlSchedule}/selectSchedule`, params);};
  96 +
95 //查询长期计划查询列表 97 //查询长期计划查询列表
96 -export const selectLongTimePlan=params=>{return http.get(`${baseUrlLongtimeplan}/selectLongTimePlan`, params);};  
  98 +export const selectLongTimePlan=params=>{return http.get(`${baseUrlLongtimeplan}/selectLongTimePlan`, params);};
  99 +
  100 +//机组人员
  101 +//新增方法
  102 +export const addBillPerson = params => { return http.post(`${baseUrlBillperson}/addBillPerson`, params); };
  103 +//删除方法
  104 +export const editBillPerson=params=>{return http.put(`${baseUrlBillperson}/editBillPerson`, params);};
  105 +//查询列表
  106 +export const selectBillPerson=params=>{return http.get(`${baseUrlBillperson}/selectBillPerson`, params);};
@@ -309,8 +309,9 @@ background-color: white; @@ -309,8 +309,9 @@ background-color: white;
309 .el-col{margin-right: 0px;} 309 .el-col{margin-right: 0px;}
310 </style> 310 </style>
311 <script> 311 <script>
312 -  
313 import {addBill} from '../../api/transport' 312 import {addBill} from '../../api/transport'
  313 + const fecha = require('fecha');
  314 + import loginUserInfo from '../../api/base'
314 export default { 315 export default {
315 data(){ 316 data(){
316 return{ 317 return{
@@ -344,9 +345,9 @@ background-color: white; @@ -344,9 +345,9 @@ background-color: white;
344 statusMsg:undefined, 345 statusMsg:undefined,
345 meno:undefined, 346 meno:undefined,
346 createTime:undefined, 347 createTime:undefined,
347 - createBy:undefined, 348 + createBy:loginUserInfo.username,
348 updateTime:undefined, 349 updateTime:undefined,
349 - updateBy:undefined, 350 + updateBy:loginUserInfo.username,
350 isDelete:undefined, 351 isDelete:undefined,
351 remark:undefined, 352 remark:undefined,
352 remark1:undefined, 353 remark1:undefined,
@@ -431,9 +432,9 @@ background-color: white; @@ -431,9 +432,9 @@ background-color: white;
431 certType:undefined, 432 certType:undefined,
432 ceterNo:undefined, 433 ceterNo:undefined,
433 createTime:undefined, 434 createTime:undefined,
434 - createBy:undefined, 435 + createBy:loginUserInfo.username,
435 updateTime:undefined, 436 updateTime:undefined,
436 - updateBy:undefined, 437 + updateBy:loginUserInfo.username,
437 meno:undefined, 438 meno:undefined,
438 isDelete:undefined, 439 isDelete:undefined,
439 billsId:undefined 440 billsId:undefined
@@ -481,7 +482,8 @@ background-color: white; @@ -481,7 +482,8 @@ background-color: white;
481 if(response.code=='200'){ 482 if(response.code=='200'){
482 this.centerDialogVisible=true; 483 this.centerDialogVisible=true;
483 this.msg=response.msg; 484 this.msg=response.msg;
484 - this.$router.push({path:'/queryBill',query:{serialNo:JSON.stringify(this.bill.serialNo)}}); 485 + this.$router.push({path:'/queryBill',query:{aircraftNo:JSON.stringify(this.bill.aircraftNo),flightNo:JSON.stringify(this.bill.flightNo),
  486 + flightDate:JSON.stringify(this.bill.flightDate)}});
485 }else{ 487 }else{
486 this.msg=response.msg; 488 this.msg=response.msg;
487 } 489 }
@@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
6 <div class="grid-content content">单据查询</div> 6 <div class="grid-content content">单据查询</div>
7 </el-col> 7 </el-col>
8 </el-row> 8 </el-row>
9 - <!-- 搜索区域--> 9 + <!--搜索区域-->
10 <el-row> 10 <el-row>
11 <el-form :label-position="labelPosition" :model="queryBill" :rules="rules" ref="queryBill" 11 <el-form :label-position="labelPosition" :model="queryBill" :rules="rules" ref="queryBill"
12 label-width="130px" class="demo-ruleForm"> 12 label-width="130px" class="demo-ruleForm">
@@ -25,6 +25,8 @@ @@ -25,6 +25,8 @@
25 <el-date-picker 25 <el-date-picker
26 v-model="queryBill.flightDate" 26 v-model="queryBill.flightDate"
27 type="date" 27 type="date"
  28 + value-format="yyyyMMdd"
  29 + format="yyyyMMdd"
28 style="width:190px" 30 style="width:190px"
29 placeholder="选择日期"> 31 placeholder="选择日期">
30 </el-date-picker> 32 </el-date-picker>
@@ -40,7 +42,7 @@ @@ -40,7 +42,7 @@
40 </el-col> 42 </el-col>
41 </el-form> 43 </el-form>
42 </el-row> 44 </el-row>
43 -<!-- 表单区域--> 45 + <!--表单区域-->
44 <el-row> 46 <el-row>
45 <el-table 47 <el-table
46 :data="tableData" 48 :data="tableData"
@@ -60,50 +62,42 @@ @@ -60,50 +62,42 @@
60 </el-table-column> 62 </el-table-column>
61 <el-table-column 63 <el-table-column
62 prop=aircraftNo" 64 prop=aircraftNo"
63 - label="航空器注册号"  
64 - width="120"> 65 + label="航空器注册号">
65 </el-table-column> 66 </el-table-column>
66 <el-table-column 67 <el-table-column
67 prop="flightNo" 68 prop="flightNo"
68 - label="航班号"  
69 - width="80"> 69 + label="航班号">
70 </el-table-column> 70 </el-table-column>
71 <el-table-column 71 <el-table-column
72 prop="flightDate" 72 prop="flightDate"
73 - label="航班日期"  
74 - width="150"> 73 + label="航班日期">
75 </el-table-column> 74 </el-table-column>
76 <el-table-column 75 <el-table-column
77 prop="accessFlag" 76 prop="accessFlag"
78 - label="进出港标识"  
79 - width="120"> 77 + label="进出港标识">
80 </el-table-column> 78 </el-table-column>
81 <el-table-column 79 <el-table-column
82 prop="departureAirport" 80 prop="departureAirport"
83 - label="出发港"  
84 - width="80"> 81 + label="出发港">
85 </el-table-column> 82 </el-table-column>
86 <el-table-column 83 <el-table-column
87 prop="departuredatetime" 84 prop="departuredatetime"
88 - label="出发时间"  
89 - width="150"> 85 + label="出发时间">
90 </el-table-column> 86 </el-table-column>
91 <el-table-column 87 <el-table-column
92 prop="arrivalAirport" 88 prop="arrivalAirport"
93 - label="目的港"  
94 - width="80"> 89 + label="目的港">
95 </el-table-column> 90 </el-table-column>
96 <el-table-column 91 <el-table-column
97 prop="arrivaldatetime" 92 prop="arrivaldatetime"
98 - label="到达时间"  
99 - width="150"> 93 + label="到达时间">
100 </el-table-column> 94 </el-table-column>
101 <el-table-column 95 <el-table-column
102 prop="statusMsg" 96 prop="statusMsg"
103 - label="海关回执"  
104 - width="150"> 97 + label="海关回执">
105 </el-table-column> 98 </el-table-column>
106 <el-table-column 99 <el-table-column
  100 + fixed="right"
107 prop="" 101 prop=""
108 label="报文操作" 102 label="报文操作"
109 width="150"> 103 width="150">
@@ -112,8 +106,6 @@ @@ -112,8 +106,6 @@
112 size="mini" 106 size="mini"
113 type="success" 107 type="success"
114 @click="handleEdit(scope.$index, scope.row)">查看</el-button> 108 @click="handleEdit(scope.$index, scope.row)">查看</el-button>
115 - </template>  
116 - <template slot-scope="scope">  
117 <el-button 109 <el-button
118 size="mini" 110 size="mini"
119 type="danger" 111 type="danger"
@@ -219,10 +211,11 @@ @@ -219,10 +211,11 @@
219 }, 211 },
220 //获取默认值 212 //获取默认值
221 defaultData(){ 213 defaultData(){
222 - this.flightNo=JSON.parse(this.$route.query.flightNo);  
223 - this.aircraftNo=JSON.parse(this.$route.query.aircraftNo);  
224 - this.flightDate=JSON.parse(this.$route.query.flightDate);  
225 - this.accessFlag=JSON.parse(this.$route.query.accessFlag); 214 + if(this.$route.query.aircraftNo!=null){
  215 + this.queryBill.flightNo=JSON.parse(this.$route.query.flightNo);
  216 + this.queryBill.aircraftNo=JSON.parse(this.$route.query.aircraftNo);
  217 + this.queryBill.flightDate=JSON.parse(this.$route.query.flightDate);
  218 + }
226 }, 219 },
227 //编辑单据查询 220 //编辑单据查询
228 handleEdit(index,row){ 221 handleEdit(index,row){