朱兆平 / vue_cli · 提交

转到一个项目

作者 xudada
提交 a3f9876ab879c3c70c81440fb0d98a9d4bc532e1 1 个父辈 d689eb34

运输工具通用查询

内嵌 并排对比
正在显示 3 个修改的文件 包含 38 行增加 和 43 行删除
@@ -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);};
@@ -303,8 +303,9 @@ background-color: white; @@ -303,8 +303,9 @@ background-color: white;
303 .el-col{margin-right: 0px;} 303 .el-col{margin-right: 0px;}
304 </style> 304 </style>
305 <script> 305 <script>
306 -  
307 import {addBill} from '../../api/transport' 306 import {addBill} from '../../api/transport'
  307 + const fecha = require('fecha');
  308 + import loginUserInfo from '../../api/base'
308 export default { 309 export default {
309 data(){ 310 data(){
310 return{ 311 return{
@@ -338,9 +339,9 @@ background-color: white; @@ -338,9 +339,9 @@ background-color: white;
338 statusMsg:undefined, 339 statusMsg:undefined,
339 meno:undefined, 340 meno:undefined,
340 createTime:undefined, 341 createTime:undefined,
341 - createBy:undefined, 342 + createBy:loginUserInfo.username,
342 updateTime:undefined, 343 updateTime:undefined,
343 - updateBy:undefined, 344 + updateBy:loginUserInfo.username,
344 isDelete:undefined, 345 isDelete:undefined,
345 remark:undefined, 346 remark:undefined,
346 remark1:undefined, 347 remark1:undefined,
@@ -425,9 +426,9 @@ background-color: white; @@ -425,9 +426,9 @@ background-color: white;
425 certType:undefined, 426 certType:undefined,
426 ceterNo:undefined, 427 ceterNo:undefined,
427 createTime:undefined, 428 createTime:undefined,
428 - createBy:undefined, 429 + createBy:loginUserInfo.username,
429 updateTime:undefined, 430 updateTime:undefined,
430 - updateBy:undefined, 431 + updateBy:loginUserInfo.username,
431 meno:undefined, 432 meno:undefined,
432 isDelete:undefined, 433 isDelete:undefined,
433 billsId:undefined 434 billsId:undefined
@@ -471,7 +472,8 @@ background-color: white; @@ -471,7 +472,8 @@ background-color: white;
471 if(response.code=='200'){ 472 if(response.code=='200'){
472 this.centerDialogVisible=true; 473 this.centerDialogVisible=true;
473 this.msg=response.msg; 474 this.msg=response.msg;
474 - this.$router.push({path:'/queryBill',query:{serialNo:JSON.stringify(this.bill.serialNo)}}); 475 + this.$router.push({path:'/queryBill',query:{aircraftNo:JSON.stringify(this.bill.aircraftNo),flightNo:JSON.stringify(this.bill.flightNo),
  476 + flightDate:JSON.stringify(this.bill.flightDate)}});
475 }else{ 477 }else{
476 this.msg=response.msg; 478 this.msg=response.msg;
477 } 479 }
@@ -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"
@@ -59,61 +61,43 @@ @@ -59,61 +61,43 @@
59 </template> 61 </template>
60 </el-table-column> 62 </el-table-column>
61 <el-table-column 63 <el-table-column
62 - fixed  
63 prop=aircraftNo" 64 prop=aircraftNo"
64 - label="航空器注册号"  
65 - width="120"> 65 + label="航空器注册号">
66 </el-table-column> 66 </el-table-column>
67 <el-table-column 67 <el-table-column
68 - fixed  
69 prop="flightNo" 68 prop="flightNo"
70 - label="航班号"  
71 - width="80"> 69 + label="航班号">
72 </el-table-column> 70 </el-table-column>
73 <el-table-column 71 <el-table-column
74 - fixed  
75 prop="flightDate" 72 prop="flightDate"
76 - label="航班日期"  
77 - width="150"> 73 + label="航班日期">
78 </el-table-column> 74 </el-table-column>
79 <el-table-column 75 <el-table-column
80 - fixed  
81 prop="accessFlag" 76 prop="accessFlag"
82 - label="进出港标识"  
83 - width="120"> 77 + label="进出港标识">
84 </el-table-column> 78 </el-table-column>
85 <el-table-column 79 <el-table-column
86 - fixed  
87 prop="departureAirport" 80 prop="departureAirport"
88 - label="出发港"  
89 - width="80"> 81 + label="出发港">
90 </el-table-column> 82 </el-table-column>
91 <el-table-column 83 <el-table-column
92 - fixed  
93 prop="departuredatetime" 84 prop="departuredatetime"
94 - label="出发时间"  
95 - width="150"> 85 + label="出发时间">
96 </el-table-column> 86 </el-table-column>
97 <el-table-column 87 <el-table-column
98 - fixed  
99 prop="arrivalAirport" 88 prop="arrivalAirport"
100 - label="目的港"  
101 - width="80"> 89 + label="目的港">
102 </el-table-column> 90 </el-table-column>
103 <el-table-column 91 <el-table-column
104 - fixed  
105 prop="arrivaldatetime" 92 prop="arrivaldatetime"
106 - label="到达时间"  
107 - width="150"> 93 + label="到达时间">
108 </el-table-column> 94 </el-table-column>
109 <el-table-column 95 <el-table-column
110 - fixed  
111 prop="statusMsg" 96 prop="statusMsg"
112 - label="海关回执"  
113 - width="150"> 97 + label="海关回执">
114 </el-table-column> 98 </el-table-column>
115 <el-table-column 99 <el-table-column
116 - fixed 100 + fixed="right"
117 prop="" 101 prop=""
118 label="报文操作" 102 label="报文操作"
119 width="150"> 103 width="150">
@@ -122,8 +106,6 @@ @@ -122,8 +106,6 @@
122 size="mini" 106 size="mini"
123 type="success" 107 type="success"
124 @click="handleEdit(scope.$index, scope.row)">查看</el-button> 108 @click="handleEdit(scope.$index, scope.row)">查看</el-button>
125 - </template>  
126 - <template slot-scope="scope">  
127 <el-button 109 <el-button
128 size="mini" 110 size="mini"
129 type="danger" 111 type="danger"
@@ -229,10 +211,11 @@ @@ -229,10 +211,11 @@
229 }, 211 },
230 //获取默认值 212 //获取默认值
231 defaultData(){ 213 defaultData(){
232 - this.flightNo=JSON.parse(this.$route.query.flightNo);  
233 - this.aircraftNo=JSON.parse(this.$route.query.aircraftNo);  
234 - this.flightDate=JSON.parse(this.$route.query.flightDate);  
235 - 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 + }
236 }, 219 },
237 //编辑单据查询 220 //编辑单据查询
238 handleEdit(index,row){ 221 handleEdit(index,row){