朱兆平 / vue_cli · 提交

转到一个项目

作者 小范
提交 ebced10de931ee584aae2264f003733d029bd5ff 1 个父辈 14566ae6 master ... ExportOrder flightplan2.0 master_dev master_dev_markdown master_dev_permission master_ffmTemp zhidan

进出港航班申报功能完善

内嵌 并排对比
正在显示 19 个修改的文件 包含 989 行增加 和 389 行删除
@@ -13,6 +13,10 @@ let baseUrlBillperson = 'air-server-transport/transport/billperson' @@ -13,6 +13,10 @@ let baseUrlBillperson = 'air-server-transport/transport/billperson'
13 let baseUrlResultMsg = 'air-server-transport/transport/returnmsg' 13 let baseUrlResultMsg = 'air-server-transport/transport/returnmsg'
14 let baseUrlDynamics = 'air-server-transport/transport/aircraftStaying' 14 let baseUrlDynamics = 'air-server-transport/transport/aircraftStaying'
15 let baseUrlCancel = 'air-server-transport/transport/prediction' 15 let baseUrlCancel = 'air-server-transport/transport/prediction'
  16 +let baseUrlBillcountry = 'air-server-transport/transport/country'
  17 +let baseUrlBillcreden = 'air-server-transport/transport/creden'
  18 +
  19 +
16 20
17 //进港预报 取消申报原因 21 //进港预报 取消申报原因
18 export const cancelPrediction = params => { return http.post(`${baseUrlCancel}/cancelPrediction`, params); }; 22 export const cancelPrediction = params => { return http.post(`${baseUrlCancel}/cancelPrediction`, params); };
@@ -146,6 +150,22 @@ export const addBillPerson = params => { return http.post(`${baseUrlBillperson}/ @@ -146,6 +150,22 @@ export const addBillPerson = params => { return http.post(`${baseUrlBillperson}/
146 export const editBillPerson=params=>{return http.put(`${baseUrlBillperson}/editBillPerson`, params);}; 150 export const editBillPerson=params=>{return http.put(`${baseUrlBillperson}/editBillPerson`, params);};
147 //查询列表 151 //查询列表
148 export const selectBillPerson=params=>{return http.get(`${baseUrlBillperson}/selectBillPerson`, params);}; 152 export const selectBillPerson=params=>{return http.get(`${baseUrlBillperson}/selectBillPerson`, params);};
  153 +//国家代码
  154 +export const selectCountry=params=>{return http.get(`${baseUrlBillcountry}/selectCountry`, params);};
  155 +//证件查询
  156 +export const selectCreden=params=>{return http.get(`${baseUrlBillcreden}/selectCreden`, params);};
  157 +//保存并发送
  158 +export const sendBill=params=>{return http.post(`${baseUrlBill}/sendBill`, params);};
  159 +
  160 +
  161 +
  162 +
  163 +
  164 +
  165 +
  166 +
  167 +
  168 +
149 169
150 //查询回执列表 170 //查询回执列表
151 export const selectReturnMsg=params=>{return http.get(`${baseUrlResultMsg}/selectReturnMsg`, params);}; 171 export const selectReturnMsg=params=>{return http.get(`${baseUrlResultMsg}/selectReturnMsg`, params);};
@@ -80,7 +80,7 @@ @@ -80,7 +80,7 @@
80 </li> 80 </li>
81 </ul> 81 </ul>
82 </aside> 82 </aside>
83 -<div class="tabM"> 83 +<div class="tabM" >
84 <TabMenu></TabMenu> 84 <TabMenu></TabMenu>
85 </div> 85 </div>
86 86
@@ -509,6 +509,7 @@ @@ -509,6 +509,7 @@
509 min-width: 758px; 509 min-width: 758px;
510 max-width: 1190px; 510 max-width: 1190px;
511 padding-right: 15px; 511 padding-right: 15px;
  512 + overflow-y: scroll;
512 } 513 }
513 .go{ 514 .go{
514 transform:rotate(-180deg); 515 transform:rotate(-180deg);
@@ -9,7 +9,7 @@ @@ -9,7 +9,7 @@
9 <el-row> 9 <el-row>
10 <el-form :model="arrival" :rules="rules" ref="arrival" label-width="100%" class="demo-ruleForm"> 10 <el-form :model="arrival" :rules="rules" ref="arrival" label-width="100%" class="demo-ruleForm">
11 <el-col :span="8"> 11 <el-col :span="8">
12 - <el-form-item label="航空器注册编码" prop="aircraftNo" label-width="120px"> 12 + <el-form-item label="航空器注册码" prop="aircraftNo" label-width="120px">
13 <el-input v-model.trim="arrival.aircraftNo" @input="e => arrival.aircraftNo=inputMe(e)"></el-input> 13 <el-input v-model.trim="arrival.aircraftNo" @input="e => arrival.aircraftNo=inputMe(e)"></el-input>
14 </el-form-item> 14 </el-form-item>
15 </el-col> 15 </el-col>
@@ -23,10 +23,11 @@ @@ -23,10 +23,11 @@
23 <el-date-picker 23 <el-date-picker
24 v-model="arrival.flightDate" 24 v-model="arrival.flightDate"
25 type="date" 25 type="date"
  26 + placeholder="选择日期时间"
26 value-format="yyyyMMdd" 27 value-format="yyyyMMdd"
27 format="yyyyMMdd" 28 format="yyyyMMdd"
28 style="width:275px" 29 style="width:275px"
29 - placeholder="选择日期"> 30 + >
30 </el-date-picker> 31 </el-date-picker>
31 </el-form-item> 32 </el-form-item>
32 </el-col> 33 </el-col>
@@ -50,29 +51,29 @@ @@ -50,29 +51,29 @@
50 <el-form-item label="预计离港时间" prop="departuredatetime" label-width="120px"> 51 <el-form-item label="预计离港时间" prop="departuredatetime" label-width="120px">
51 <el-date-picker 52 <el-date-picker
52 v-model="arrival.departuredatetime" 53 v-model="arrival.departuredatetime"
53 - type="date"  
54 - format="yyyyMMdd"  
55 - value-format="yyyyMMdd"  
56 - style="width:100%"  
57 - placeholder="任意时间点"> 54 + type="datetime"
  55 + placeholder="选择日期时间"
  56 + value-format="yyyyMMddHHmmss"
  57 + format="yyyyMMddHHmmss"
  58 + style="width:110%">
58 </el-date-picker> 59 </el-date-picker>
59 </el-form-item> 60 </el-form-item>
60 </el-col> 61 </el-col>
61 <el-col :span="6"> 62 <el-col :span="6">
62 <el-form-item label="停靠机坪" prop="stayid" label-width="120px"> 63 <el-form-item label="停靠机坪" prop="stayid" label-width="120px">
63 <el-input v-model="arrival.stayid" oninput="value=value.replace(/[^\d]/g,'')" 64 <el-input v-model="arrival.stayid" oninput="value=value.replace(/[^\d]/g,'')"
64 - maxLength='7'></el-input> 65 + ></el-input>
65 </el-form-item> 66 </el-form-item>
66 </el-col> 67 </el-col>
67 <el-col :span="6"> 68 <el-col :span="6">
68 <el-form-item label="完成装卸时间" prop="dischargecompleteddatetime" label-width="120px"> 69 <el-form-item label="完成装卸时间" prop="dischargecompleteddatetime" label-width="120px">
69 <el-date-picker 70 <el-date-picker
70 v-model="arrival.dischargecompleteddatetime" 71 v-model="arrival.dischargecompleteddatetime"
71 - type="date"  
72 - format="yyyyMMdd"  
73 - value-format="yyyyMMdd"  
74 - style="width:100%"  
75 - placeholder="任意时间点"> 72 + type="datetime"
  73 + placeholder="选择日期时间"
  74 + value-format="yyyyMMddHHmmss"
  75 + format="yyyyMMddHHmmss"
  76 + style="width:100%">
76 </el-date-picker> 77 </el-date-picker>
77 </el-form-item> 78 </el-form-item>
78 </el-col> 79 </el-col>
@@ -80,11 +81,11 @@ @@ -80,11 +81,11 @@
80 <el-form-item label="预计抵港时间" prop="arrivaldatetime" label-width="140px"> 81 <el-form-item label="预计抵港时间" prop="arrivaldatetime" label-width="140px">
81 <el-date-picker 82 <el-date-picker
82 v-model="arrival.arrivaldatetime" 83 v-model="arrival.arrivaldatetime"
83 - type="date"  
84 - format="yyyyMMdd"  
85 - value-format="yyyyMMdd"  
86 - style="width:100%"  
87 - placeholder="任意时间点"> 84 + type="datetime"
  85 + placeholder="选择日期时间"
  86 + value-format="yyyyMMddHHmmss"
  87 + format="yyyyMMddHHmmss"
  88 + style="width:115%">
88 </el-date-picker> 89 </el-date-picker>
89 </el-form-item> 90 </el-form-item>
90 </el-col> 91 </el-col>
@@ -136,10 +137,32 @@ @@ -136,10 +137,32 @@
136 </style> 137 </style>
137 <script> 138 <script>
138 import {addPrediction, sendPredictionIn} from "../../api/transport"; 139 import {addPrediction, sendPredictionIn} from "../../api/transport";
139 - 140 + import loginUserInfo from '../../api/base'
140 export default { 141 export default {
141 data(){ 142 data(){
142 return{ 143 return{
  144 + // pickerOptions: {
  145 + // shortcuts: [{
  146 + // text: '今天',
  147 + // onClick(picker) {
  148 + // picker.$emit('pick', new Date());
  149 + // }
  150 + // }, {
  151 + // text: '昨天',
  152 + // onClick(picker) {
  153 + // const date = new Date();
  154 + // date.setTime(date.getTime() - 3600 * 1000 * 24);
  155 + // picker.$emit('pick', date);
  156 + // }
  157 + // }, {
  158 + // text: '一周前',
  159 + // onClick(picker) {
  160 + // const date = new Date();
  161 + // date.setTime(date.getTime() - 3600 * 1000 * 24 * 7);
  162 + // picker.$emit('pick', date);
  163 + // }
  164 + // }]
  165 + // },
143 arrival:{ 166 arrival:{
144 aircraftNo:undefined, 167 aircraftNo:undefined,
145 flightNo:undefined, 168 flightNo:undefined,
@@ -152,7 +175,9 @@ @@ -152,7 +175,9 @@
152 dischargecompleteddatetime:undefined, 175 dischargecompleteddatetime:undefined,
153 arrivaldatetime:undefined, 176 arrivaldatetime:undefined,
154 meno:undefined, 177 meno:undefined,
155 - accessFlag:'0' 178 + accessFlag:'0',
  179 + createBy:loginUserInfo.username,
  180 + updateBy:loginUserInfo.username,
156 }, 181 },
157 rules: { 182 rules: {
158 aircraftNo: [ 183 aircraftNo: [
@@ -182,7 +207,6 @@ @@ -182,7 +207,6 @@
182 ], 207 ],
183 stayid: [ 208 stayid: [
184 {required: true, message: '请输入', trigger: 'blur'}, 209 {required: true, message: '请输入', trigger: 'blur'},
185 - { pattern: /^[0-9]{6}$/, message: '请输入正确机坪号码', trigger: 'blur' }  
186 ], 210 ],
187 dischargecompleteddatetime: [ 211 dischargecompleteddatetime: [
188 {required: true, message: '请选择', trigger: 'blur'} 212 {required: true, message: '请选择', trigger: 'blur'}
@@ -201,6 +225,7 @@ @@ -201,6 +225,7 @@
201 submitForm(formName) { 225 submitForm(formName) {
202 this.$refs[formName].validate((valid) => { 226 this.$refs[formName].validate((valid) => {
203 if (valid) { 227 if (valid) {
  228 + console.log(this.arrival)
204 addPrediction(this.arrival).then(res=>{ 229 addPrediction(this.arrival).then(res=>{
205 let response=res.data; 230 let response=res.data;
206 if(response.code=='200'){ 231 if(response.code=='200'){
@@ -210,7 +235,8 @@ @@ -210,7 +235,8 @@
210 }else{ 235 }else{
211 this.msg=response.msg; 236 this.msg=response.msg;
212 } 237 }
213 - }); 238 + }
  239 + );
214 } else { 240 } else {
215 console.log('error submit!!'); 241 console.log('error submit!!');
216 return false; 242 return false;
@@ -221,6 +247,7 @@ @@ -221,6 +247,7 @@
221 sendForm(formName) { 247 sendForm(formName) {
222 this.$refs[formName].validate((valid) => { 248 this.$refs[formName].validate((valid) => {
223 if (valid) { 249 if (valid) {
  250 + this.arrival.createBy=loginUserInfo.username
224 sendPredictionIn(this.arrival).then(res=>{ 251 sendPredictionIn(this.arrival).then(res=>{
225 let response=res.data; 252 let response=res.data;
226 if(response.code=='200'){ 253 if(response.code=='200'){
@@ -6,130 +6,123 @@ @@ -6,130 +6,123 @@
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 + <el-row style="margin-left: 20px">
  10 + <el-col :span="24">
  11 + <el-button type="primary" @click="submitForm('bill')">暂存</el-button>
  12 + <el-button type="success" @click="sendForm('bill')" :disabled="statusFormater(this.type)">保存并发送</el-button>
  13 + <el-button type="warning" @click="resetForm('bill')">重置</el-button>
  14 + </el-col>
  15 + </el-row>
9 <el-row> 16 <el-row>
10 - <el-form :model="bill" :rules="rules" ref="bill" label-width="100%" class="demo-ruleForm">  
11 - <el-col :span="8">  
12 - <el-form-item label="航空器注册编号" prop="aircraftNo" label-width="120px"> 17 + <el-form autocomplete="off" :model="bill" :rules="rules" ref="bill" label-width="100%" class="demo-ruleForm">
  18 +
  19 + <el-col :span="6">
  20 + <el-form-item label="航空器注册码" prop="aircraftNo" label-width="120px">
13 <el-input v-model.trim="bill.aircraftNo" placeholder="请输入" @input="e => bill.aircraftNo=inputMe(e)"></el-input> 21 <el-input v-model.trim="bill.aircraftNo" placeholder="请输入" @input="e => bill.aircraftNo=inputMe(e)"></el-input>
14 </el-form-item> 22 </el-form-item>
15 </el-col> 23 </el-col>
16 - <el-col :span="8"> 24 + <el-col :span="6" id="a1">
  25 + <el-form-item label="进出港标识" prop="accessFlag" label-width="120px">
  26 + <el-select v-model="bill.accessFlag" placeholder="请选择">
  27 + <el-option label="进港" value="A"></el-option>
  28 + <el-option label="出港" value="D"></el-option>
  29 + </el-select>
  30 + <!-- <el-input v-model="bill.accessFlag" placeholder="A/D" @input="e => bill.accessFlag=inputMe(e)"></el-input>-->
  31 + </el-form-item>
  32 + </el-col>
  33 + <el-col :span="6">
17 <el-form-item label="航班号" prop="flightNo" label-width="120px"> 34 <el-form-item label="航班号" prop="flightNo" label-width="120px">
18 <el-input v-model="bill.flightNo" placeholder="请输入" @input="e => bill.flightNo=inputMe(e)"></el-input> 35 <el-input v-model="bill.flightNo" placeholder="请输入" @input="e => bill.flightNo=inputMe(e)"></el-input>
19 </el-form-item> 36 </el-form-item>
20 </el-col> 37 </el-col>
21 - <el-col :span="8"> 38 + <el-col :span="6">
22 <el-form-item label="航班日期" prop="flightDate" label-width="120px"> 39 <el-form-item label="航班日期" prop="flightDate" label-width="120px">
23 <el-date-picker 40 <el-date-picker
24 v-model="bill.flightDate" 41 v-model="bill.flightDate"
25 type="date" 42 type="date"
26 value-format="yyyyMMdd" 43 value-format="yyyyMMdd"
27 format="yyyyMMdd" 44 format="yyyyMMdd"
28 - style="width:100%" 45 + style="width: 100%"
29 placeholder="选择日期"> 46 placeholder="选择日期">
30 </el-date-picker> 47 </el-date-picker>
31 </el-form-item> 48 </el-form-item>
32 </el-col> 49 </el-col>
33 - <el-col :span="6">  
34 - <el-form-item label="进出港标识" prop="accessFlag" label-width="120px">  
35 - <el-input v-model="bill.accessFlag" placeholder="A/D" @input="e => bill.accessFlag=inputMe(e)"></el-input>  
36 - </el-form-item>  
37 - </el-col>  
38 - <el-col :span="6">  
39 - <el-form-item label="机组人数" prop="aircrewSum" label-width="120px">  
40 - <el-input v-model="bill.aircrewSum" oninput="value=value.replace(/[^\d]/g,'')" placeholder="请输入"></el-input>  
41 - </el-form-item>  
42 - </el-col>  
43 - <el-col :span="6">  
44 - <el-form-item label="国际旅客人数" prop="interPassengerSum" label-width="120px">  
45 - <el-input v-model="bill.interPassengerSum" oninput="value=value.replace(/[^\d]/g,'')" placeholder="请输入"></el-input>  
46 - </el-form-item>  
47 - </el-col>  
48 - <el-col :span="6">  
49 - <el-form-item label="国内旅客人数" prop="localePassengerSum" label-width="120px">  
50 - <el-input v-model="bill.localePassengerSum" oninput="value=value.replace(/[^\d]/g,'')" placeholder="请输入"></el-input>  
51 - </el-form-item>  
52 - </el-col>  
53 - <el-col :span="6">  
54 - <el-form-item label="国际行李件数" prop="interBaggageNum" label-width="120px">  
55 - <el-input v-model="bill.interBaggageNum" oninput="value=value.replace(/[^\d]/g,'')" placeholder="请输入"></el-input>  
56 - </el-form-item>  
57 - </el-col>  
58 - <el-col :span="6">  
59 - <el-form-item label="国内行李件数" prop="localeBaggageNum" label-width="120px">  
60 - <el-input v-model="bill.localeBaggageNum" oninput="value=value.replace(/[^\d]/g,'')" placeholder="请输入"></el-input>  
61 - </el-form-item>  
62 - </el-col>  
63 - <el-col :span="6">  
64 - <el-form-item label="货邮件数" prop="goodsNum" label-width="120px">  
65 - <el-input v-model="bill.goodsNum" oninput="value=value.replace(/[^\d]/g,'')" placeholder="请输入"></el-input>  
66 - </el-form-item>  
67 - </el-col>  
68 - <el-col :span="6">  
69 - <el-form-item label="货邮重量(KG)" prop="goodsQuantity" label-width="120px">  
70 - <el-input v-model="bill.goodsQuantity" oninput="value=value.replace(/[^\d]/g,'')" placeholder="请输入"></el-input>  
71 - </el-form-item>  
72 - </el-col>  
73 - <el-col :span="8"> 50 +
  51 + <el-col :span="6" id="a2" v-if="bill.accessFlag=='A'">
74 <el-form-item label="抵达港口" prop="arrivalAirport" label-width="120px" > 52 <el-form-item label="抵达港口" prop="arrivalAirport" label-width="120px" >
75 <el-input v-model="bill.arrivalAirport" placeholder="请输入" maxLength='3' @input="e => bill.arrivalAirport=inputMe(e)"></el-input> 53 <el-input v-model="bill.arrivalAirport" placeholder="请输入" maxLength='3' @input="e => bill.arrivalAirport=inputMe(e)"></el-input>
76 </el-form-item> 54 </el-form-item>
77 </el-col> 55 </el-col>
78 - <el-col :span="8">  
79 - <el-form-item label="关区代码" prop="arrivalno" label-width="120px">  
80 - <el-input v-model="bill.arrivalno" oninput="value=value.replace(/[^\d]/g,'')" maxLength='4' placeholder="请输入"></el-input>  
81 - </el-form-item>  
82 - </el-col>  
83 - <el-col :span="8"> 56 + <el-col :span="6" id="a3" v-if="bill.accessFlag=='A'">
84 <el-form-item label="抵达时间" prop="arrivaldatetime" label-width="120px"> 57 <el-form-item label="抵达时间" prop="arrivaldatetime" label-width="120px">
85 <el-date-picker 58 <el-date-picker
86 v-model="bill.arrivaldatetime" 59 v-model="bill.arrivaldatetime"
87 - value-format="yyyyMMdd"  
88 - format="yyyyMMdd"  
89 - style="width:100%"  
90 - placeholder="请选择"> 60 + type="datetime"
  61 + placeholder="选择日期时间"
  62 + value-format="yyyyMMddHHmmss"
  63 + format="yyyyMMddHHmmss"
  64 + style="width:100%">
91 </el-date-picker> 65 </el-date-picker>
92 </el-form-item> 66 </el-form-item>
93 </el-col> 67 </el-col>
94 - <el-col :span="8"> 68 + <el-col :span="6" id="a4" v-if="bill.accessFlag=='D'">
95 <el-form-item label="驶离港口" prop="departureAirport" label-width="120px"> 69 <el-form-item label="驶离港口" prop="departureAirport" label-width="120px">
96 <el-input v-model="bill.departureAirport" placeholder="请输入" maxLength='3' @input="e => bill.departureAirport=inputMe(e)"></el-input> 70 <el-input v-model="bill.departureAirport" placeholder="请输入" maxLength='3' @input="e => bill.departureAirport=inputMe(e)"></el-input>
97 </el-form-item> 71 </el-form-item>
98 </el-col> 72 </el-col>
99 - <el-col :span="8">  
100 - <el-form-item label="关区代码" prop="departureno" label-width="120px">  
101 - <el-input v-model="bill.departureno" oninput="value=value.replace(/[^\d]/g,'')" maxLength='4' placeholder="请输入"></el-input>  
102 - </el-form-item>  
103 - </el-col>  
104 - <el-col :span="8"> 73 +
  74 + <el-col :span="6" id="a5" v-if="bill.accessFlag=='D'">
105 <el-form-item label="驶离时间" prop="departuredatetime" label-width="120px"> 75 <el-form-item label="驶离时间" prop="departuredatetime" label-width="120px">
106 <el-date-picker 76 <el-date-picker
107 v-model="bill.departuredatetime" 77 v-model="bill.departuredatetime"
108 - value-format="yyyyMMdd"  
109 - format="yyyyMMdd"  
110 - style="width:100%"  
111 - placeholder="请选择"> 78 + type="datetime"
  79 + placeholder="选择日期时间"
  80 + value-format="yyyyMMddHHmmss"
  81 + format="yyyyMMddHHmmss"
  82 + style="width:100%">
112 </el-date-picker> 83 </el-date-picker>
113 </el-form-item> 84 </el-form-item>
114 </el-col> 85 </el-col>
115 <el-col :span="6"> 86 <el-col :span="6">
116 - <el-form-item label="货物申报单份数" prop="cargoBillNum" label-width="120px">  
117 - <el-input v-model="bill.cargoBillNum" oninput="value=value.replace(/[^\d]/g,'')"></el-input> 87 + <el-form-item label="海关关区" prop="arrivalno" label-width="120px">
  88 +<!-- <el-input v-model="bill.arrivalno"-->
  89 +
  90 +<!-- maxLength='4' placeholder="请输入"></el-input>-->
  91 +<!-- oninput="value=value.replace(/[^\d]/g,'')"-->
  92 + <el-select v-model="bill.arrivalno" placeholder="请选择" maxLength='4'>
  93 + <el-option label="4604" value="4604"></el-option>
  94 + <el-option label="4620" value="4620"></el-option>
  95 + </el-select>
  96 + </el-form-item>
  97 + </el-col>
  98 + <el-col :span="6">
  99 + <el-form-item label="不占座人数" prop="interPassengerSum" label-width="120px">
  100 + <el-input v-model="bill.interPassengerSum" oninput="value=value.replace(/[^\d]/g,'')" placeholder="请输入"></el-input>
  101 + </el-form-item>
  102 + </el-col>
  103 + <el-col :span="6">
  104 + <el-form-item label="机组人数" prop="aircrewSum" label-width="120px">
  105 + <el-input v-model="bill.aircrewSum" oninput="value=value.replace(/[^\d]/g,'')" placeholder="请输入"></el-input>
118 </el-form-item> 106 </el-form-item>
119 </el-col> 107 </el-col>
120 <el-col :span="6"> 108 <el-col :span="6">
121 - <el-form-item label="旅客名单份数" prop="passengerPage" label-width="120px">  
122 - <el-input v-model="bill.passengerPage" oninput="value=value.replace(/[^\d]/g,'')"></el-input> 109 + <el-form-item label="国际旅客人数" prop="localePassengerSum" label-width="120px">
  110 + <el-input v-model="bill.localePassengerSum" oninput="value=value.replace(/[^\d]/g,'')" placeholder="请输入"></el-input>
123 </el-form-item> 111 </el-form-item>
124 </el-col> 112 </el-col>
125 <el-col :span="6"> 113 <el-col :span="6">
126 - <el-form-item label="机组名单份数" prop="aircrewBillNum" label-width="120px">  
127 - <el-input v-model="bill.aircrewBillNum" oninput="value=value.replace(/[^\d]/g,'')"></el-input> 114 + <el-form-item label="国际行李件数" prop="interBaggageNum" label-width="120px">
  115 + <el-input v-model="bill.interBaggageNum" oninput="value=value.replace(/[^\d]/g,'')" placeholder="请输入"></el-input>
128 </el-form-item> 116 </el-form-item>
129 </el-col> 117 </el-col>
130 <el-col :span="6"> 118 <el-col :span="6">
131 - <el-form-item label="机组物品申报单份数" prop="aircrewCargoBillNum" label-width="150px">  
132 - <el-input v-model="bill.aircrewCargoBillNum" oninput="value=value.replace(/[^\d]/g,'')"></el-input> 119 + <el-form-item label="货邮件数" prop="goodsNum" label-width="120px">
  120 + <el-input v-model="bill.goodsNum" oninput="value=value.replace(/[^\d]/g,'')" placeholder="请输入"></el-input>
  121 + </el-form-item>
  122 + </el-col>
  123 + <el-col :span="6">
  124 + <el-form-item label="货邮重量(KG)" prop="goodsQuantity" label-width="120px">
  125 + <el-input v-model="bill.goodsQuantity" oninput="value=value.replace(/[^\d]/g,'')" placeholder="请输入"></el-input>
133 </el-form-item> 126 </el-form-item>
134 </el-col> 127 </el-col>
135 <el-col :span="6"> 128 <el-col :span="6">
@@ -146,17 +139,226 @@ @@ -146,17 +139,226 @@
146 </el-form-item> 139 </el-form-item>
147 </el-col> 140 </el-col>
148 <el-col :span="24"> 141 <el-col :span="24">
149 - <el-form-item label="备注" prop="meno" label-width="120px">  
150 - <el-input v-model="bill.meno" placeholder="请输入"></el-input>  
151 - </el-form-item> 142 + <el-form-item label="备注" prop="meno" label-width="120px">
  143 + <el-input v-model="bill.meno" placeholder="请输入"></el-input>
  144 + </el-form-item>
152 </el-col> 145 </el-col>
  146 +
  147 +
  148 +
  149 +
  150 +<!-- <el-col :span="6">-->
  151 +<!-- <el-form-item label="国内行李件数" prop="localeBaggageNum" label-width="120px">-->
  152 +<!-- <el-input v-model="bill.localeBaggageNum" oninput="value=value.replace(/[^\d]/g,'')" placeholder="请输入"></el-input>-->
  153 +<!-- </el-form-item>-->
  154 +<!-- </el-col>-->
  155 +
  156 +<!-- <el-col :span="8">-->
  157 +<!-- <el-form-item label="关区代码" prop="departureno" label-width="120px">-->
  158 +<!-- <el-input v-model="bill.departureno" oninput="value=value.replace(/[^\d]/g,'')" maxLength='4' placeholder="请输入"></el-input>-->
  159 +<!-- </el-form-item>-->
  160 +<!-- </el-col>-->
  161 +
  162 +<!-- <el-col :span="6">-->
  163 +<!-- <el-form-item label="货物申报单份数" prop="cargoBillNum" label-width="120px">-->
  164 +<!-- <el-input v-model="bill.cargoBillNum" oninput="value=value.replace(/[^\d]/g,'')"></el-input>-->
  165 +<!-- </el-form-item>-->
  166 +<!-- </el-col>-->
  167 +<!-- <el-col :span="6">-->
  168 +<!-- <el-form-item label="旅客名单份数" prop="passengerPage" label-width="120px">-->
  169 +<!-- <el-input v-model="bill.passengerPage" oninput="value=value.replace(/[^\d]/g,'')"></el-input>-->
  170 +<!-- </el-form-item>-->
  171 +<!-- </el-col>-->
  172 +<!-- <el-col :span="6">-->
  173 +<!-- <el-form-item label="机组名单份数" prop="aircrewBillNum" label-width="120px">-->
  174 +<!-- <el-input v-model="bill.aircrewBillNum" oninput="value=value.replace(/[^\d]/g,'')"></el-input>-->
  175 +<!-- </el-form-item>-->
  176 +<!-- </el-col>-->
  177 +<!-- <el-col :span="6">-->
  178 +<!-- <el-form-item label="机组物品申报单份数" prop="aircrewCargoBillNum" label-width="150px">-->
  179 +<!-- <el-input v-model="bill.aircrewCargoBillNum" oninput="value=value.replace(/[^\d]/g,'')"></el-input>-->
  180 +<!-- </el-form-item>-->
  181 +<!-- </el-col>-->
  182 +
  183 +
  184 +
153 </el-form> 185 </el-form>
154 </el-row> 186 </el-row>
155 - <el-row style="margin-left: 120px">  
156 - <el-col :span="24">  
157 - <el-button type="primary" @click="submitForm('bill')">保 存</el-button>  
158 - </el-col> 187 + <!--添加机组人员-->
  188 + <el-col :span="24">
  189 + <div class="grid-content content">添加机组人员</div>
  190 + </el-col>
  191 + <el-row>
  192 + <el-form :model="billperson" :rules="brules" ref="billperson" label-width="130px" class="demo-ruleForm">
  193 + <el-row>
  194 + <el-col :span="6">
  195 + <el-form-item label="姓名" prop="name">
  196 + <el-input v-model="billperson.name" placeholder="请输入"></el-input>
  197 + </el-form-item>
  198 + </el-col>
  199 + <el-col :span="6">
  200 + <el-form-item label="性别" prop="gender">
  201 +<!-- <el-input v-model="billperson.gender" placeholder="M/F"></el-input>-->
  202 + <el-select v-model="billperson.gender" placeholder="请选择">
  203 + <el-option label="M-男" value="M"></el-option>
  204 + <el-option label="F-女" value="F"></el-option>
  205 + </el-select>
  206 + </el-form-item>
  207 + </el-col>
  208 + <el-col :span="6">
  209 + <el-form-item label="职务" prop="gareer">
  210 +<!-- <el-input v-model="billperson.gareer" placeholder="请输入"></el-input>-->
  211 + <el-select v-model="billperson.gareer" placeholder="请选择">
  212 + <el-option label="1-航线机长" value="1"></el-option>
  213 + <el-option label="2-副驾驶" value="2"></el-option>
  214 + <el-option label="3-乘务长" value="3"></el-option>
  215 + <el-option label="4-安全员" value="4"></el-option>
  216 + <el-option label="5-乘务员" value="5"></el-option>
  217 + <el-option label="6-机械师" value="6"></el-option>
  218 + <el-option label="7-随行人员" value="7"></el-option>
  219 + <el-option label="8-工程师" value="8"></el-option>
  220 + <el-option label="9-装载员" value="9"></el-option>
  221 + <el-option label="10-押运员" value="10"></el-option>
  222 + <el-option label="11-其它随机人员" value="11"></el-option>
  223 +
  224 + </el-select>
  225 + </el-form-item>
  226 + </el-col>
  227 + <el-col :span="6">
  228 + <el-form-item label="证件号码" prop="ceterNo">
  229 + <el-input v-model="billperson.ceterNo" placeholder="请输入"></el-input>
  230 + </el-form-item>
  231 + </el-col>
  232 + <el-col :span="6">
  233 + <el-form-item label="国籍" prop="nationality">
  234 + <!-- <el-input v-model="billperson.nationality" placeholder="请输入"></el-input>-->
  235 + <el-select v-model="billperson.nationality"
  236 + filterable
  237 + @click.native="getCountry"
  238 + :loading="loading" placeholder="请选择"
  239 + style="text-transform:uppercase">
  240 + <el-option
  241 + v-for="item in countryOptions"
  242 + :key="item.countryid"
  243 + :label="item.countryid+'-'+item.countrydescchn"
  244 + :value="item.countryid">
  245 + <span style="float: left">{{ item.countryid }}</span>
  246 + <span style="float: right; color: #8492a6; font-size: 13px">{{ item.countrydescchn }}</span>
  247 + </el-option>
  248 + </el-select>
  249 + </el-form-item>
  250 + </el-col>
  251 + <el-col :span="6">
  252 + <el-form-item label="证件类型" prop="certType">
  253 +<!-- <el-input v-model="billperson.certType" placeholder="请输入"></el-input>-->
  254 +<!-- <el-select v-model="billperson.certType" placeholder="请输入">-->
  255 +<!-- <el-option-->
  256 +<!-- v-for="item in certOptions"-->
  257 +<!-- :key="item.value"-->
  258 +<!-- :label="item.label"-->
  259 +<!-- :value="item.value">-->
  260 +<!-- </el-option>-->
  261 +<!-- </el-select>-->
  262 + <el-select v-model="billperson.certType"
  263 + filterable
  264 + @click.native="getCreden"
  265 + :loading="loading" placeholder="请选择">
  266 + <el-option
  267 + v-for="item in certOptions"
  268 + :key="item.serialno"
  269 + :label="item.serialno+'-'+item.credenname"
  270 + :value="item.serialno">
  271 + <span style="float: left">{{ item.serialno }}</span>
  272 + <span style="float: right; color: #8492a6; font-size: 13px">{{ item.credenname }}</span>
  273 + </el-option>
  274 + </el-select>
  275 + </el-form-item>
  276 + </el-col>
  277 +
  278 + <el-col :span="24">
  279 + <el-form-item label="备注" prop="meno">
  280 + <el-input v-model="billperson.meno" placeholder="请输入"></el-input>
  281 + </el-form-item>
  282 + </el-col>
  283 + </el-row>
  284 + </el-form>
  285 + <el-row style="margin-left: 20px">
  286 + <el-col :span="24">
  287 + <el-button :disabled="btDeleStatusFormater(this.status)" type="primary" @click="submitPerson('billperson')">添加机组人员</el-button>
  288 + </el-col>
  289 + </el-row>
  290 + <el-row>
  291 + <el-table
  292 + :data="tableData2"
  293 + border
  294 + style="width: 100%;margin-bottom: 10px">
  295 + <el-table-column
  296 + fixed="left"
  297 + prop="name"
  298 + label="姓名"
  299 + width="120">
  300 + </el-table-column>
  301 + <el-table-column
  302 + prop="gender"
  303 + label="性别"
  304 + :formatter="formatGender"
  305 + width="100">
  306 + </el-table-column>
  307 + <el-table-column
  308 + prop="nationality"
  309 + label="国籍"
  310 + width="100">
  311 + </el-table-column>
  312 + <el-table-column
  313 + prop="certType"
  314 + label="证件类型"
  315 + :formatter="formatType"
  316 + width="240">
  317 + </el-table-column>
  318 + <el-table-column
  319 + prop="ceterNo"
  320 + label="证件号码"
  321 + width="160">
  322 + </el-table-column>
  323 + <el-table-column
  324 + prop="gareer"
  325 + label="职务"
  326 + :formatter="formatGareer"
  327 + width="140">
  328 + </el-table-column>
  329 + <el-table-column
  330 + fixed="right"
  331 + prop="meno"
  332 + label="备注">
  333 + </el-table-column>
  334 + <el-table-column
  335 + fixed="right"
  336 + prop=""
  337 + label="操作"
  338 + width="100">
  339 + <template slot-scope="scope">
  340 + <el-button
  341 + size="mini"
  342 + type="danger"
  343 + @click="del(scope.$index,scope.row)">删除</el-button>
  344 + </template>
  345 + </el-table-column>
  346 + </el-table>
  347 + <!--分页区域-->
  348 + <div class="block">
  349 + <el-pagination
  350 + :current-page="billperson.pageNum"
  351 + :page-sizes="[10, 50, 100, 500]"
  352 + :page-size="billperson.pageSize"
  353 + layout="total, sizes, prev, pager, next, jumper"
  354 + :total="total"
  355 + @size-change="handleSizeChange"
  356 + @current-change="handleCurrentChange"
  357 + />
  358 + </div>
  359 + </el-row>
159 </el-row> 360 </el-row>
  361 +
160 <!--对话提示框--> 362 <!--对话提示框-->
161 <el-row> 363 <el-row>
162 <el-dialog 364 <el-dialog
@@ -193,35 +395,37 @@ background-color: white; @@ -193,35 +395,37 @@ background-color: white;
193 .el-col{margin-right: 0px;} 395 .el-col{margin-right: 0px;}
194 </style> 396 </style>
195 <script> 397 <script>
196 - import {addBill} from '../../api/transport' 398 + import {addBill, addBillPerson,editBillPerson,selectBillPerson,selectCountry,selectCreden,sendBill} from '../../api/transport'
197 const fecha = require('fecha'); 399 const fecha = require('fecha');
198 import loginUserInfo from '../../api/base' 400 import loginUserInfo from '../../api/base'
  401 + import {getCountryCode} from "../../api/mt1201";
199 export default { 402 export default {
200 data(){ 403 data(){
201 return{ 404 return{
  405 + hidden:['a2','a3','a4','a5'],
202 bill:{ 406 bill:{
203 uuid:undefined, 407 uuid:undefined,
204 aircraftNo:undefined, 408 aircraftNo:undefined,
205 flightNo:undefined, 409 flightNo:undefined,
206 flightDate:undefined, 410 flightDate:undefined,
207 accessFlag:undefined, 411 accessFlag:undefined,
208 - departureAirport:undefined, 412 + departureAirport:'CGO',
209 departuredatetime:undefined, 413 departuredatetime:undefined,
210 departureno:undefined, 414 departureno:undefined,
211 - arrivalAirport:undefined, 415 + arrivalAirport:'CGO',
212 arrivaldatetime:undefined, 416 arrivaldatetime:undefined,
213 arrivalno:undefined, 417 arrivalno:undefined,
214 - aircrewSum:undefined, 418 + aircrewSum:'0',
215 interPassengerSum:undefined, 419 interPassengerSum:undefined,
216 - localePassengerSum:undefined,  
217 - interBaggageNum:undefined, 420 + localePassengerSum:'0',
  421 + interBaggageNum:'0',
218 localeBaggageNum:undefined, 422 localeBaggageNum:undefined,
219 - goodsNum:undefined, 423 + goodsNum:'0',
220 goodsQuantity:undefined, 424 goodsQuantity:undefined,
221 - cargoBillNum:3,  
222 - passengerPage:3,  
223 - aircrewBillNum:3,  
224 - aircrewCargoBillNum:3, 425 + cargoBillNum:undefined,
  426 + passengerPage:undefined,
  427 + aircrewBillNum:undefined,
  428 + aircrewCargoBillNum:undefined,
225 arrivalPosition:undefined, 429 arrivalPosition:undefined,
226 bussinessType:undefined, 430 bussinessType:undefined,
227 messageid:undefined, 431 messageid:undefined,
@@ -230,8 +434,8 @@ background-color: white; @@ -230,8 +434,8 @@ background-color: white;
230 meno:undefined, 434 meno:undefined,
231 createTime:undefined, 435 createTime:undefined,
232 createBy:loginUserInfo.username, 436 createBy:loginUserInfo.username,
233 - updateTime:undefined,  
234 updateBy:loginUserInfo.username, 437 updateBy:loginUserInfo.username,
  438 + updateTime:undefined,
235 isDelete:undefined, 439 isDelete:undefined,
236 remark:undefined, 440 remark:undefined,
237 remark1:undefined, 441 remark1:undefined,
@@ -254,9 +458,9 @@ background-color: white; @@ -254,9 +458,9 @@ background-color: white;
254 aircrewSum: [ 458 aircrewSum: [
255 {required: true, message: '请输入', trigger: 'blur'} 459 {required: true, message: '请输入', trigger: 'blur'}
256 ], 460 ],
257 - interPassengerSum: [  
258 - {required: true, message: '请选择', trigger: 'blur'}  
259 - ], 461 + // interPassengerSum: [
  462 + // {required: true, message: '请选择', trigger: 'blur'}
  463 + // ],
260 localePassengerSum: [ 464 localePassengerSum: [
261 {required: true, message: '请输入', trigger: 'blur'} 465 {required: true, message: '请输入', trigger: 'blur'}
262 ], 466 ],
@@ -266,12 +470,12 @@ background-color: white; @@ -266,12 +470,12 @@ background-color: white;
266 localeBaggageNum: [ 470 localeBaggageNum: [
267 {required: true, message: '请输入', trigger: 'blur'} 471 {required: true, message: '请输入', trigger: 'blur'}
268 ], 472 ],
269 - goodsNum: [  
270 - {required: true, message: '请输入', trigger: 'blur'}  
271 - ],  
272 - goodsQuantity: [  
273 - {required: true, message: '请输入', trigger: 'blur'}  
274 - ], 473 + // goodsNum: [
  474 + // {required: true, message: '请输入', trigger: 'blur'}
  475 + // ],
  476 + // goodsQuantity: [
  477 + // {required: true, message: '请输入', trigger: 'blur'}
  478 + // ],
275 arrivalAirport: [ 479 arrivalAirport: [
276 {required: true, message: '请选择', trigger: 'blur'} 480 {required: true, message: '请选择', trigger: 'blur'}
277 ], 481 ],
@@ -302,9 +506,9 @@ background-color: white; @@ -302,9 +506,9 @@ background-color: white;
302 aircrewCargoBillNum: [ 506 aircrewCargoBillNum: [
303 {required: true, message: '请输入', trigger: 'blur'} 507 {required: true, message: '请输入', trigger: 'blur'}
304 ], 508 ],
305 - arrivalPosition: [  
306 - {required: true, message: '请输入', trigger: 'blur'}  
307 - ], 509 + // arrivalPosition: [
  510 + // {required: true, message: '请输入', trigger: 'blur'}
  511 + // ],
308 }, 512 },
309 tableData:[{ 513 tableData:[{
310 arrivaldatetime: '161146', 514 arrivaldatetime: '161146',
@@ -313,31 +517,273 @@ background-color: white; @@ -313,31 +517,273 @@ background-color: white;
313 }], 517 }],
314 centerDialogVisible:false, 518 centerDialogVisible:false,
315 labelPosition:'left', 519 labelPosition:'left',
316 - currentPage: 1,  
317 - pageSize:10, 520 +
318 total:0, 521 total:0,
319 - msg:undefined 522 + msg:undefined,
  523 + billperson:{
  524 + pageNum: 1,
  525 + pageSize:10,
  526 + autoId:undefined,
  527 + name:undefined,
  528 + gender:undefined,
  529 + gareer:undefined,
  530 + nationality:undefined,
  531 + certType:undefined,
  532 + ceterNo:undefined,
  533 + createTime:undefined,
  534 + createBy:loginUserInfo.username,
  535 + updateTime:undefined,
  536 + updateBy:loginUserInfo.username,
  537 + meno:undefined,
  538 + isDelete:undefined,
  539 + billsId:undefined
  540 + },
  541 + tableData2:[],
  542 + certOptions:[],
  543 + serialno:'',
  544 + countryOptions:[],
  545 + countryid:'',
  546 + loading:false,
  547 + status:"1",
  548 + type:"1",
  549 + brules:{
  550 + name: [
  551 + {required: true, message: '请输入', trigger: 'blur'}
  552 + ],
  553 + gender: [
  554 + {required: true, message: '请输入', trigger: 'blur'}
  555 + ],
  556 + certType: [
  557 + {required: true, message: '请输入', trigger: 'blur'}
  558 + ],
  559 + ceterNo: [
  560 + {required: true, message: '请输入', trigger: 'blur'}
  561 + ],
  562 + nationality: [
  563 + {required: true, message: '请输入', trigger: 'blur'}
  564 + ],
  565 + gareer: [
  566 + {required: true, message: '请输入', trigger: 'blur'}
  567 + ],
  568 + },
  569 +
320 } 570 }
321 }, 571 },
322 methods:{ 572 methods:{
323 - //新增单据方法（保存按钮） 573 + //性别识别
  574 + formatGender: function(row,column){
  575 + return row.gender=='M'?'男':'女';
  576 + },
  577 + //职务识别
  578 + formatGareer: function(row,column){
  579 + return row.gareer=='1'?'航线机长':row.gareer=='2'?'副驾驶':row.gareer=='3'?'乘务长'
  580 + :row.gareer=='4'?'安全员':row.gareer=='5'?'乘务员':row.gareer=='6'?'机械师'
  581 + :row.gareer=='7'?'随行人员':row.gareer=='8'?'工程师':row.gareer=='9'?'装载员'
  582 + :row.gareer=='10'?'押运员':row.gareer=='11'?'其他随机人员':'';
  583 + },
  584 + //证件类型识别
  585 + formatType: function(row,column){
  586 + return row.certType=='06'?'一次有效台湾居民来往大陆通行证':row.certType=='11'?'外交护照':row.certType=='12'?'公务护照'
  587 + :row.certType=='13'?'因公普通护照':row.certType=='14'?'普通护照':row.certType=='15'?'中华人民共和国旅行证'
  588 + :row.certType=='16'?'五年有效台湾居民往来大陆通行证':row.certType=='17'?'海员证':row.certType=='20'?'中华人民共和国出入境通行证'
  589 + :row.certType=='21'?'前往港澳通行证(16页，多次有效)':row.certType=='22'?'前往港澳通行证(8页，一次有效)'
  590 + :row.certType=='23'?'前往港澳通行证':row.certType=='24'?'港澳同胞回乡证或港澳居民来往内地通行证'
  591 + :row.certType=='25'?'大陆居民来往台湾通行证':row.certType=='30'?'外国人出入境通行证':row.certType=='38'?'中华人民共和国回国证明'
  592 + :row.certType=='70'?'香港特别行政区护照':row.certType=='71'?'澳门特别行政区护照'
  593 + :row.certType=='72'?'因公往来香港澳门特别行政区通行证(官员)'
  594 + :row.certType=='73'?'因公往来香港澳门特别行政区通行证(普通)':row.certType=='74'?'中华人民共和国居民身份证':row.certType=='75'?'其他证件'
  595 + :row.certType=='98'?'其他因私证件(包括联合国通行证等)'
  596 + :row.certType=='99'?'其他因私证件(包括难民证等)':'';
  597 + },
  598 + resetForm(formName) {
  599 + this.bill.uuid = '';
  600 + this.bill.remark = false;
  601 + this.bill.remark1 = false;
  602 + this.bill.remark2 = false;
  603 + this.bill.remark3 = false;
  604 + this.$refs[formName].resetFields();
  605 + this.transList();
  606 + },
  607 + //提交机组人员按钮
  608 + submitPerson(formName){
  609 + //console.log(this.billperson.billsId)
  610 + this.$refs[formName].validate((valid) => {
  611 + if (valid) {
  612 + this.billperson.billsId=this.bill.uuid;
  613 + // let parms={billsId:this.bill.uuid}
  614 + addBillPerson(this.billperson).then(res=>{
  615 + let response=res.data;
  616 + if(response.code=='200'){
  617 + this.centerDialogVisible=true;
  618 + this.msg=response.msg;
  619 + this.transList()
  620 + //document.getElementById("send").disabled=true;
  621 + let sy=this.type="2";
  622 + this.statusFormater(sy);
  623 + this.$refs['billperson'].resetFields();
  624 + }else{
  625 + this.msg=response.msg;
  626 + }
  627 + });
  628 + } else {
  629 + console.log('error submit!!');
  630 + return false;
  631 + }
  632 + });
  633 + },
  634 + btDeleStatusFormater:(status) => {
  635 + if(status=='1'){
  636 + return true;
  637 + }else{
  638 + return false;
  639 + }
  640 + },
  641 + statusFormater:(type) => {
  642 + if(type=='1'){
  643 + return true;
  644 + }else{
  645 + return false;
  646 + }
  647 + },
  648 + //删除机组人员按钮
  649 + del(index, row) {
  650 + // 弹框询问是否删除？
  651 + this.$confirm('此操作永久删除该消息收发记录, 是否继续?', '警告', {
  652 + confirmButtonText: '确定删除',
  653 + cancelButtonText: '取消',
  654 + type: 'warning'
  655 + }
  656 + ).then(() => {
  657 + editBillPerson(row).then((response) => {
  658 + console.log(row)
  659 + const res = response.data
  660 + this.$message.success(res.msg)
  661 + this.transList()
  662 + }).catch(error => {
  663 + this.$message.error(res.msg)
  664 + })
  665 + }).catch(() => {
  666 + })
  667 + },
  668 + //获取机组人员信息
  669 + transList() {
  670 + const _this = this
  671 + let params={billsId:this.bill.uuid};
  672 + console.log(params)
  673 + selectBillPerson(params).then((response) => {
  674 + const res = response.data
  675 + console.log(res)
  676 + if (res.code != '200') {
  677 + return _this.$message.error('获取消息收发记录，失败！')
  678 + }
  679 + // 获取列表数据
  680 + _this.tableData2 = res.data.list
  681 + // 获取列表的总记录数
  682 + _this.total = res.data.total
  683 + _this.$message.success('获取消息收发记录，成功！')
  684 + }).catch(error => {
  685 + // 关闭加载
  686 + _this.$message.error(error.toString())
  687 + })
  688 + },
  689 + /*获取证件*/
  690 + getCreden:function(query){
  691 + this.certOptions=[];
  692 + let params={serialno:query};
  693 + this.loading = true;
  694 + selectCreden(params).then(res =>{
  695 + if (res!=null) {
  696 + console.log(res.data.data)
  697 + setTimeout(() => {
  698 + this.loading = false;
  699 + this.certOptions=res.data.data;
  700 + }, 200);
  701 + } else {
  702 + this.certOptions = [];
  703 + }
  704 +
  705 + });
  706 + },
  707 +
  708 + /*获取国籍*/
  709 + getCountry:function(query){
  710 + this.countryOptions=[];
  711 + let params={countryid:query};
  712 + this.loading = true;
  713 + selectCountry(params).then(res =>{
  714 + if (res!=null) {
  715 + console.log(res.data.data)
  716 + setTimeout(() => {
  717 + this.loading = false;
  718 + this.countryOptions=res.data.data;
  719 + }, 200);
  720 + } else {
  721 + this.countryOptions = [];
  722 + }
  723 +
  724 + });
  725 + },
  726 + // 隐藏进出港
  727 + update(){
  728 + this.hidden.forEach(id=>{
  729 + if (!document.getElementById(id)){
  730 + this.bill[id] = '';
  731 + }
  732 + })
  733 +
  734 + },
  735 + //新增单据方法（暂存按钮）
324 submitForm(formName) { 736 submitForm(formName) {
325 this.$refs[formName].validate((valid) => { 737 this.$refs[formName].validate((valid) => {
326 if (valid) { 738 if (valid) {
  739 + if(this.bill.uuid==null || this.bill.uuid=="" || this.bill.uuid==undefined){
  740 + this.bill.uuid=this.uuid();
  741 + console.log("dayinguuid"+this.bill.uuid)
  742 + }
  743 +
327 addBill(this.bill).then(res=>{ 744 addBill(this.bill).then(res=>{
328 let response=res.data; 745 let response=res.data;
329 if(response.code=='200'){ 746 if(response.code=='200'){
330 this.centerDialogVisible=true; 747 this.centerDialogVisible=true;
331 this.msg=response.msg; 748 this.msg=response.msg;
  749 + // this.$router.push({path:'/queryBill',query:{aircraftNo:this.bill.aircraftNo,flightNo:this.bill.flightNo,
  750 + // flightDate:this.bill.flightDate}});
  751 + //document.getElementById("add").disabled=true;
  752 + let st=this.status="2";
  753 + this.btDeleStatusFormater(st);
  754 + }else{
  755 + this.msg=response.msg;
  756 + }
  757 + });
  758 + } else {
  759 + console.log('error submit!!');
  760 + return false;
  761 + }
  762 + });
  763 + },
  764 + //新增单据方法（保存并发送按钮）
  765 + sendForm(formName) {
  766 + this.$refs[formName].validate((valid) => {
  767 + if (valid) {
  768 + // this.bill.uuid=this.uuid();
  769 + this.bill.createBy=loginUserInfo.username
  770 + sendBill(this.bill).then(res=>{
  771 + let response=res.data;
  772 + if(response.code=='200'){
  773 + this.centerDialogVisible=true;
  774 + this.msg=response.msg;
332 this.$router.push({path:'/queryBill',query:{aircraftNo:this.bill.aircraftNo,flightNo:this.bill.flightNo, 775 this.$router.push({path:'/queryBill',query:{aircraftNo:this.bill.aircraftNo,flightNo:this.bill.flightNo,
333 flightDate:this.bill.flightDate}}); 776 flightDate:this.bill.flightDate}});
  777 + //document.getElementById("add").disabled=true;
  778 + // let st=this.status="2";
  779 + // this.btDeleStatusFormater(st);
334 }else{ 780 }else{
335 this.msg=response.msg; 781 this.msg=response.msg;
336 } 782 }
337 }); 783 });
338 } else { 784 } else {
339 console.log('error submit!!'); 785 console.log('error submit!!');
340 - return false; 786 + // return false;
341 } 787 }
342 }); 788 });
343 }, 789 },
@@ -345,24 +791,59 @@ background-color: white; @@ -345,24 +791,59 @@ background-color: white;
345 defaultData(){ 791 defaultData(){
346 if(this.$route.query.uuid!=null){ 792 if(this.$route.query.uuid!=null){
347 let ob=Object.assign(this.bill, this.$route.query); 793 let ob=Object.assign(this.bill, this.$route.query);
348 - this.bill.arrivaldatetime=fecha.parse(ob.arrivaldatetime,'HHmmss'); 794 + if (this.$route.query.remark =='true'){
  795 + this.bill.remark = true;
  796 + };
  797 + if (this.$route.query.remark1 =='true'){
  798 + this.bill.remark1 = true;
  799 + };
  800 + if (this.$route.query.remark2 =='true'){
  801 + this.bill.remark2 = true;
  802 + };
  803 + if (this.$route.query.remark3 =='true'){
  804 + this.bill.remark3 = true;
  805 + };
  806 + this.transList();
  807 + let st=this.status="2";
  808 + this.btDeleStatusFormater(st);
  809 + let sy=this.type="2";
  810 + this.statusFormater(sy);
  811 + //this.bill.arrivaldatetime=fecha.parse(ob.arrivaldatetime,'HHmmss');
349 } 812 }
350 }, 813 },
351 // 分页 814 // 分页
352 handleSizeChange(val) { 815 handleSizeChange(val) {
353 - this.pageSize=val; 816 + this.billperson.pageSize=val;
354 }, 817 },
355 handleCurrentChange(val) { 818 handleCurrentChange(val) {
356 - this.currentPage=val;  
357 - this.submitForm(); 819 + this.billperson.pageNum=val;
  820 + this.transList();
358 }, 821 },
359 // 过滤中英文 822 // 过滤中英文
360 inputMe(e){ 823 inputMe(e){
361 return e.replace(/[^a-zA-Z0-9.-]/g,'').toUpperCase(); 824 return e.replace(/[^a-zA-Z0-9.-]/g,'').toUpperCase();
362 - } 825 + },
  826 + uuid(){
  827 + var s = [];
  828 + var hexDigits = "0123456789abcdef";
  829 + for (var i = 0; i < 36; i++) {
  830 + s[i] = hexDigits.substr(Math.floor(Math.random() * 0x10), 1);
  831 + }
  832 + s[14] = "4"; // bits 12-15 of the time_hi_and_version field to 0010
  833 + s[19] = hexDigits.substr((s[19] & 0x3) | 0x8, 1); // bits 6-7 of the clock_seq_hi_and_reserved to 01
  834 + s[8] = s[13] = s[18] = s[23] = "-";
  835 +
  836 + var uuid = s.join("");
  837 + console.log('----'+uuid)
  838 + return uuid;
  839 + },
363 }, 840 },
364 mounted(){ 841 mounted(){
365 this.defaultData(); 842 this.defaultData();
  843 + //this.transList();
  844 + // this.getCreden();
  845 + //this.uuid();
  846 + // this.btDeleStatusFormater("3");
366 } 847 }
367 } 848 }
368 </script> 849 </script>
@@ -69,16 +69,20 @@ @@ -69,16 +69,20 @@
69 </style> 69 </style>
70 <script> 70 <script>
71 import { addSchedule} from "../../api/transport"; 71 import { addSchedule} from "../../api/transport";
72 - import loginUserInfo from '@/api/base.js' 72 + import loginUserInfo from '../../api/base'
  73 +
  74 +
73 export default { 75 export default {
74 data(){ 76 data(){
75 return{ 77 return{
76 configure:{ 78 configure:{
  79 + username:loginUserInfo.username,
77 flightNo:undefined, 80 flightNo:undefined,
78 ietype:undefined, 81 ietype:undefined,
79 reamrk:undefined, 82 reamrk:undefined,
80 accessFlag:'1', 83 accessFlag:'1',
81 - username:'' 84 + createBy:loginUserInfo.username,
  85 + updateBy:loginUserInfo.username,
82 }, 86 },
83 LoginUserInfo: loginUserInfo, 87 LoginUserInfo: loginUserInfo,
84 rules: { 88 rules: {
@@ -105,7 +109,8 @@ @@ -105,7 +109,8 @@
105 let _this = this; 109 let _this = this;
106 this.$refs[formName].validate((valid) => { 110 this.$refs[formName].validate((valid) => {
107 if (valid) { 111 if (valid) {
108 - this.configure.username=_this.LoginUserInfo.username 112 + this.configure.createBy=loginUserInfo.username
  113 + this.configure.username=loginUserInfo.username
109 console.log(this.configure.flightNo) 114 console.log(this.configure.flightNo)
110 addSchedule(this.configure).then(res=>{ 115 addSchedule(this.configure).then(res=>{
111 let response=res.data; 116 let response=res.data;
@@ -9,7 +9,7 @@ @@ -9,7 +9,7 @@
9 <el-row> 9 <el-row>
10 <el-form :model="confirmatory" :rules="rules" ref="confirmatory" label-width="100%" class="demo-ruleForm"> 10 <el-form :model="confirmatory" :rules="rules" ref="confirmatory" label-width="100%" class="demo-ruleForm">
11 <el-col :span="8"> 11 <el-col :span="8">
12 - <el-form-item label="航空器注册编号" prop="aircraftNo" label-width="120px"> 12 + <el-form-item label="航空器注册码" prop="aircraftNo" label-width="120px">
13 <el-input v-model.trim="confirmatory.aircraftNo" @input="e => confirmatory.aircraftNo=inputMe(e)"></el-input> 13 <el-input v-model.trim="confirmatory.aircraftNo" @input="e => confirmatory.aircraftNo=inputMe(e)"></el-input>
14 </el-form-item> 14 </el-form-item>
15 </el-col> 15 </el-col>
@@ -34,11 +34,11 @@ @@ -34,11 +34,11 @@
34 <el-form-item label="离港时间" prop="departuredatetime" label-width="120px"> 34 <el-form-item label="离港时间" prop="departuredatetime" label-width="120px">
35 <el-date-picker 35 <el-date-picker
36 v-model="confirmatory.departuredatetime" 36 v-model="confirmatory.departuredatetime"
37 - type="date"  
38 - value-format="yyyyMMdd"  
39 - format="yyyyMMdd"  
40 - style="width:100%"  
41 - placeholder="任意时间点"> 37 + type="datetime"
  38 + placeholder="选择日期时间"
  39 + value-format="yyyyMMddHHmmss"
  40 + format="yyyyMMddHHmmss"
  41 + style="width:100%">
42 </el-date-picker> 42 </el-date-picker>
43 </el-form-item> 43 </el-form-item>
44 </el-col> 44 </el-col>
@@ -58,18 +58,18 @@ @@ -58,18 +58,18 @@
58 <el-form-item label="抵港时间" prop="arrivaldatetime" label-width="120px"> 58 <el-form-item label="抵港时间" prop="arrivaldatetime" label-width="120px">
59 <el-date-picker 59 <el-date-picker
60 v-model="confirmatory.arrivaldatetime" 60 v-model="confirmatory.arrivaldatetime"
61 - type="date"  
62 - value-format="yyyyMMdd"  
63 - format="yyyyMMdd"  
64 - style="width:100%"  
65 - placeholder="任意时间点"> 61 + type="datetime"
  62 + placeholder="选择日期时间"
  63 + value-format="yyyyMMddHHmmss"
  64 + format="yyyyMMddHHmmss"
  65 + style="width:100%">
66 </el-date-picker> 66 </el-date-picker>
67 </el-form-item> 67 </el-form-item>
68 </el-col> 68 </el-col>
69 <el-col :span="8"> 69 <el-col :span="8">
70 <el-form-item label="停靠机坪" prop="stayid" label-width="120px"> 70 <el-form-item label="停靠机坪" prop="stayid" label-width="120px">
71 <el-input v-model="confirmatory.stayid" oninput="value=value.replace(/[^\d]/g,'')" 71 <el-input v-model="confirmatory.stayid" oninput="value=value.replace(/[^\d]/g,'')"
72 - maxLength='7'></el-input> 72 + ></el-input>
73 </el-form-item> 73 </el-form-item>
74 </el-col> 74 </el-col>
75 <el-col :span="24"> 75 <el-col :span="24">
@@ -120,6 +120,7 @@ @@ -120,6 +120,7 @@
120 </style> 120 </style>
121 <script> 121 <script>
122 import {addConfirm, sendConfirmIn} from "../../api/transport"; 122 import {addConfirm, sendConfirmIn} from "../../api/transport";
  123 + import loginUserInfo from '../../api/base'
123 124
124 export default { 125 export default {
125 data(){ 126 data(){
@@ -134,7 +135,9 @@ @@ -134,7 +135,9 @@
134 arrivaldatetime:undefined, 135 arrivaldatetime:undefined,
135 stayid:undefined, 136 stayid:undefined,
136 meno:undefined, 137 meno:undefined,
137 - accessFlag:'0' 138 + accessFlag:'0',
  139 + createBy:loginUserInfo.username,
  140 + updateBy:loginUserInfo.username,
138 }, 141 },
139 rules: { 142 rules: {
140 aircraftNo: [ 143 aircraftNo: [
@@ -195,6 +198,9 @@ @@ -195,6 +198,9 @@
195 sendForm(formName) { 198 sendForm(formName) {
196 this.$refs[formName].validate((valid) => { 199 this.$refs[formName].validate((valid) => {
197 if (valid) { 200 if (valid) {
  201 + console.log(this.confirmatory)
  202 + this.confirmatory.createBy=loginUserInfo.username
  203 +
198 sendConfirmIn(this.confirmatory).then(res=>{ 204 sendConfirmIn(this.confirmatory).then(res=>{
199 let response=res.data; 205 let response=res.data;
200 if(response.code=='200'){ 206 if(response.code=='200'){
@@ -9,7 +9,7 @@ @@ -9,7 +9,7 @@
9 <el-row> 9 <el-row>
10 <el-form :model="declare" :rules="rules" ref="declare" label-width="100%" class="demo-ruleForm"> 10 <el-form :model="declare" :rules="rules" ref="declare" label-width="100%" class="demo-ruleForm">
11 <el-col :span="8"> 11 <el-col :span="8">
12 - <el-form-item label="航空器注册编号" prop="aircraftNo" label-width="120px"> 12 + <el-form-item label="航空器注册码" prop="aircraftNo" label-width="120px">
13 <el-input v-model.trim="declare.aircraftNo" @input="e => declare.aircraftNo=inputMe(e)"></el-input> 13 <el-input v-model.trim="declare.aircraftNo" @input="e => declare.aircraftNo=inputMe(e)"></el-input>
14 </el-form-item> 14 </el-form-item>
15 </el-col> 15 </el-col>
@@ -32,12 +32,20 @@ @@ -32,12 +32,20 @@
32 </el-col> 32 </el-col>
33 <el-col :span="8"> 33 <el-col :span="8">
34 <el-form-item label="离港时间" prop="departuredatetime" label-width="120px"> 34 <el-form-item label="离港时间" prop="departuredatetime" label-width="120px">
35 - <el-input v-model="declare.departuredatetime"  
36 - type="date"  
37 - value-format="yyyyMMdd"  
38 - format="yyyyMMdd"  
39 - style="width:100%"  
40 - placeholder="任意时间点">></el-input> 35 +<!-- <el-input v-model="declare.departuredatetime"-->
  36 +<!-- type="date"-->
  37 +<!-- value-format="yyyyMMdd"-->
  38 +<!-- format="yyyyMMdd"-->
  39 +<!-- style="width:100%"-->
  40 +<!-- placeholder="任意时间点">></el-input>-->
  41 + <el-date-picker
  42 + v-model="declare.departuredatetime"
  43 + type="datetime"
  44 + placeholder="选择日期时间"
  45 + value-format="yyyyMMddHHmmss"
  46 + format="yyyyMMddHHmmss"
  47 + style="width:100%">
  48 + </el-date-picker>
41 </el-form-item> 49 </el-form-item>
42 </el-col> 50 </el-col>
43 <el-col :span="8"> 51 <el-col :span="8">
@@ -100,6 +108,7 @@ @@ -100,6 +108,7 @@
100 </style> 108 </style>
101 <script> 109 <script>
102 import {addConfirm, sendConfirmOut} from "../../api/transport"; 110 import {addConfirm, sendConfirmOut} from "../../api/transport";
  111 + import loginUserInfo from '../../api/base'
103 112
104 export default { 113 export default {
105 data(){ 114 data(){
@@ -112,7 +121,9 @@ @@ -112,7 +121,9 @@
112 departuredatetime:undefined, 121 departuredatetime:undefined,
113 customDistrictNo:undefined, 122 customDistrictNo:undefined,
114 meno:undefined, 123 meno:undefined,
115 - accessFlag:'1' 124 + accessFlag:'1',
  125 + createBy:loginUserInfo.username,
  126 + updateBy:loginUserInfo.username,
116 }, 127 },
117 rules: { 128 rules: {
118 aircraftNo: [ 129 aircraftNo: [
@@ -166,6 +177,7 @@ @@ -166,6 +177,7 @@
166 sendForm(formName) { 177 sendForm(formName) {
167 this.$refs[formName].validate((valid) => { 178 this.$refs[formName].validate((valid) => {
168 if (valid) { 179 if (valid) {
  180 + this.declare.createBy=loginUserInfo.username
169 sendConfirmOut(this.declare).then(res=>{ 181 sendConfirmOut(this.declare).then(res=>{
170 let response=res.data; 182 let response=res.data;
171 if(response.code=='200'){ 183 if(response.code=='200'){
@@ -9,7 +9,7 @@ @@ -9,7 +9,7 @@
9 <el-row> 9 <el-row>
10 <el-form :model="departure" :rules="rules" ref="departure" label-width="100%" class="demo-ruleForm"> 10 <el-form :model="departure" :rules="rules" ref="departure" label-width="100%" class="demo-ruleForm">
11 <el-col :span="8"> 11 <el-col :span="8">
12 - <el-form-item label="航空器注册编码" prop="aircraftNo" label-width="120px"> 12 + <el-form-item label="航空器注册码" prop="aircraftNo" label-width="120px">
13 <el-input v-model.trim="departure.aircraftNo" @input="e => departure.aircraftNo=inputMe(e)"></el-input> 13 <el-input v-model.trim="departure.aircraftNo" @input="e => departure.aircraftNo=inputMe(e)"></el-input>
14 </el-form-item> 14 </el-form-item>
15 </el-col> 15 </el-col>
@@ -48,12 +48,21 @@ @@ -48,12 +48,21 @@
48 </el-col> 48 </el-col>
49 <el-col :span="8"> 49 <el-col :span="8">
50 <el-form-item label="预计离港时间" prop="departuredatetime" label-width="120px"> 50 <el-form-item label="预计离港时间" prop="departuredatetime" label-width="120px">
51 - <el-input v-model="departure.departuredatetime"  
52 - type="date"  
53 - format="yyyyMMdd"  
54 - value-format="yyyyMMdd"  
55 - style="width:100%"  
56 - placeholder="任意时间点">></el-input> 51 +<!-- <el-input v-model="departure.departuredatetime"-->
  52 +<!-- type="datetime"-->
  53 +<!-- placeholder="选择日期时间"-->
  54 +<!-- value-format="yyyyMMddHHmmss"-->
  55 +<!-- format="yyyyMMddHHmmss"-->
  56 +<!-- style="width:100%"-->
  57 +<!-- placeholder="任意时间点">></el-input>-->
  58 + <el-date-picker
  59 + v-model="departure.departuredatetime"
  60 + type="datetime"
  61 + placeholder="选择日期时间"
  62 + value-format="yyyyMMddHHmmss"
  63 + format="yyyyMMddHHmmss"
  64 + style="width:100%">
  65 + </el-date-picker>
57 </el-form-item> 66 </el-form-item>
58 </el-col> 67 </el-col>
59 <el-col :span="8"> 68 <el-col :span="8">
@@ -109,6 +118,8 @@ @@ -109,6 +118,8 @@
109 </style> 118 </style>
110 <script> 119 <script>
111 import {addPrediction, sendPredictionOut} from "../../api/transport"; 120 import {addPrediction, sendPredictionOut} from "../../api/transport";
  121 + import loginUserInfo from '../../api/base'
  122 +
112 123
113 export default { 124 export default {
114 data(){ 125 data(){
@@ -123,7 +134,9 @@ @@ -123,7 +134,9 @@
123 stayid:undefined, 134 stayid:undefined,
124 departuredatetime:undefined, 135 departuredatetime:undefined,
125 meno:undefined, 136 meno:undefined,
126 - accessFlag:'1' 137 + accessFlag:'1',
  138 + createBy:loginUserInfo.username,
  139 + updateBy:loginUserInfo.username,
127 }, 140 },
128 rules: { 141 rules: {
129 aircraftNo: [ 142 aircraftNo: [
@@ -152,7 +165,6 @@ @@ -152,7 +165,6 @@
152 ], 165 ],
153 stayid: [ 166 stayid: [
154 {required: true, message: '请输入', trigger: 'blur'}, 167 {required: true, message: '请输入', trigger: 'blur'},
155 - { pattern: /^[0-9]{6}$/, message: '请输入正确机坪号码', trigger: 'blur' }  
156 ], 168 ],
157 }, 169 },
158 tableData:[], 170 tableData:[],
@@ -185,6 +197,8 @@ @@ -185,6 +197,8 @@
185 sendForm(formName) { 197 sendForm(formName) {
186 this.$refs[formName].validate((valid) => { 198 this.$refs[formName].validate((valid) => {
187 if (valid) { 199 if (valid) {
  200 + this.departure.createBy=loginUserInfo.username
  201 +
188 sendPredictionOut(this.departure).then(res=>{ 202 sendPredictionOut(this.departure).then(res=>{
189 let response=res.data; 203 let response=res.data;
190 if(response.code=='200'){ 204 if(response.code=='200'){
@@ -65,39 +65,44 @@ @@ -65,39 +65,44 @@
65 <el-table-column 65 <el-table-column
66 prop="flightno" 66 prop="flightno"
67 label="航班号" 67 label="航班号"
68 - width="140" 68 + width="100"
69 > 69 >
70 </el-table-column> 70 </el-table-column>
71 <el-table-column 71 <el-table-column
72 prop="flightdate" 72 prop="flightdate"
73 label="航班日期" 73 label="航班日期"
74 - width="120" 74 + width="100"
75 /> 75 />
76 <el-table-column 76 <el-table-column
77 - prop="flightno" 77 + prop="customcode"
78 label="海关关区" 78 label="海关关区"
79 - width="120" 79 + width="100"
80 /> 80 />
81 <el-table-column 81 <el-table-column
82 - prop="customcode"  
83 - label="注册海关关区" 82 + prop="statusmsg"
  83 + label="回执内容"
84 width="120" 84 width="120"
85 /> 85 />
86 <el-table-column 86 <el-table-column
87 prop="registeredcustom" 87 prop="registeredcustom"
  88 + label="注册海关关区"
  89 + width="100"
  90 + />
  91 + <el-table-column
  92 + prop="aircrafttype"
88 label="航空器备案类型" 93 label="航空器备案类型"
89 - width="120" 94 + width="110"
90 /> 95 />
91 <el-table-column 96 <el-table-column
92 prop="callport" 97 prop="callport"
93 label="停靠港" 98 label="停靠港"
94 - width="120" 99 + width="100"
95 > 100 >
96 </el-table-column> 101 </el-table-column>
97 <el-table-column 102 <el-table-column
98 prop="callarea" 103 prop="callarea"
99 label="停机位" 104 label="停机位"
100 - width="120" 105 + width="100"
101 > 106 >
102 </el-table-column> 107 </el-table-column>
103 <el-table-column 108 <el-table-column
@@ -109,7 +114,6 @@ @@ -109,7 +114,6 @@
109 <el-table-column 114 <el-table-column
110 prop="remark" 115 prop="remark"
111 label="海关备注" 116 label="海关备注"
112 - width="120"  
113 > 117 >
114 </el-table-column> 118 </el-table-column>
115 <el-table-column 119 <el-table-column
@@ -287,6 +291,7 @@ @@ -287,6 +291,7 @@
287 callarea: '', 291 callarea: '',
288 reasons: '', 292 reasons: '',
289 remark: '', 293 remark: '',
  294 + userid:''
290 }, 295 },
291 rules: { 296 rules: {
292 } 297 }
@@ -144,6 +144,8 @@ @@ -144,6 +144,8 @@
144 <script> 144 <script>
145 const fecha = require('fecha'); 145 const fecha = require('fecha');
146 import {addFlightPlan, sendFlightPlan} from "../../api/transport"; 146 import {addFlightPlan, sendFlightPlan} from "../../api/transport";
  147 + import loginUserInfo from '@/api/base.js'
  148 +
147 export default { 149 export default {
148 data(){ 150 data(){
149 return{ 151 return{
@@ -157,7 +159,9 @@ @@ -157,7 +159,9 @@
157 currentTakeoffTime:undefined, 159 currentTakeoffTime:undefined,
158 currentLandingTime:undefined, 160 currentLandingTime:undefined,
159 linesType:'2', 161 linesType:'2',
160 - meno:undefined 162 + meno:undefined,
  163 + createBy:loginUserInfo.username,
  164 + updateBy:''
161 }, 165 },
162 rules:{ 166 rules:{
163 flightNo: [ 167 flightNo: [
@@ -69,15 +69,20 @@ @@ -69,15 +69,20 @@
69 </style> 69 </style>
70 <script> 70 <script>
71 import {addSchedule} from "../../api/transport"; 71 import {addSchedule} from "../../api/transport";
  72 + import loginUserInfo from '../../api/base'
  73 +
72 74
73 export default { 75 export default {
74 data(){ 76 data(){
75 return{ 77 return{
76 outConfigure:{ 78 outConfigure:{
  79 + username:loginUserInfo.username,
77 flightNo:undefined, 80 flightNo:undefined,
78 ietype:undefined, 81 ietype:undefined,
79 reamrk:undefined, 82 reamrk:undefined,
80 - accessFlag:'2' 83 + accessFlag:'2',
  84 + createBy:loginUserInfo.username,
  85 + updateBy:loginUserInfo.username,
81 }, 86 },
82 rules: { 87 rules: {
83 flightNo: [ 88 flightNo: [
@@ -102,6 +107,9 @@ @@ -102,6 +107,9 @@
102 submitForm(formName) { 107 submitForm(formName) {
103 this.$refs[formName].validate((valid) => { 108 this.$refs[formName].validate((valid) => {
104 if (valid) { 109 if (valid) {
  110 + this.outConfigure.createBy=loginUserInfo.username
  111 + this.outConfigure.username=loginUserInfo.username
  112 +
105 addSchedule(this.outConfigure).then(res=>{ 113 addSchedule(this.outConfigure).then(res=>{
106 let response=res.data; 114 let response=res.data;
107 if(response.code=='200'){ 115 if(response.code=='200'){
@@ -61,7 +61,7 @@ @@ -61,7 +61,7 @@
61 </el-table-column> 61 </el-table-column>
62 <el-table-column 62 <el-table-column
63 prop="aircraftNo" 63 prop="aircraftNo"
64 - label="航空器注册编码"> 64 + label="航空器注册码">
65 </el-table-column> 65 </el-table-column>
66 <el-table-column 66 <el-table-column
67 prop="departurePort" 67 prop="departurePort"
@@ -75,18 +75,20 @@ @@ -75,18 +75,20 @@
75 prop="customDistrictNo" 75 prop="customDistrictNo"
76 label="关区代码"> 76 label="关区代码">
77 </el-table-column> 77 </el-table-column>
78 - <el-table-column  
79 - prop="transportflag"  
80 - label="运输计划">  
81 - </el-table-column> 78 +<!-- <el-table-column-->
  79 +<!-- prop="transportflag"-->
  80 +<!-- label="运输计划">-->
  81 +<!-- </el-table-column>-->
82 <el-table-column 82 <el-table-column
83 prop="departuredatetime" 83 prop="departuredatetime"
84 label="离港时间" 84 label="离港时间"
85 - width="120"> 85 + width="150">
86 </el-table-column> 86 </el-table-column>
87 <el-table-column 87 <el-table-column
88 prop="statusMsg" 88 prop="statusMsg"
89 - label="海关回执"> 89 + label="海关回执"
  90 + width="120"
  91 + show-overflow-tooltip>
90 </el-table-column> 92 </el-table-column>
91 <el-table-column 93 <el-table-column
92 fixed="right" 94 fixed="right"
@@ -115,7 +117,7 @@ @@ -115,7 +117,7 @@
115 <el-pagination 117 <el-pagination
116 @size-change="handleSizeChange" 118 @size-change="handleSizeChange"
117 @current-change="handleCurrentChange" 119 @current-change="handleCurrentChange"
118 - :current-page="currentPage" 120 + :current-page="pageNum"
119 :page-sizes="[10, 20, 30, 40]" 121 :page-sizes="[10, 20, 30, 40]"
120 :page-size="pageSize" 122 :page-size="pageSize"
121 layout="total, sizes, prev, pager, next, jumper" 123 layout="total, sizes, prev, pager, next, jumper"
@@ -173,6 +175,7 @@ @@ -173,6 +175,7 @@
173 </style> 175 </style>
174 <script> 176 <script>
175 import {addAircraftStaying, editPrediction, selectPrediction, selectReturnMsg, cancelPrediction} from "../../api/transport"; 177 import {addAircraftStaying, editPrediction, selectPrediction, selectReturnMsg, cancelPrediction} from "../../api/transport";
  178 + import loginUserInfo from "../../api/base";
176 179
177 export default { 180 export default {
178 data(){ 181 data(){
@@ -183,7 +186,7 @@ @@ -183,7 +186,7 @@
183 }, 186 },
184 rules: {}, 187 rules: {},
185 labelPosition:'left', 188 labelPosition:'left',
186 - currentPage: 1, 189 + pageNum: 1,
187 pageSize:10, 190 pageSize:10,
188 total:0, 191 total:0,
189 tableData:[], 192 tableData:[],
@@ -204,15 +207,17 @@ @@ -204,15 +207,17 @@
204 selectDetail(index,row){ 207 selectDetail(index,row){
205 this.gridData=[]; 208 this.gridData=[];
206 this.dialogTableVisible=true; 209 this.dialogTableVisible=true;
  210 + console.log(row.messageid)
207 let params={messageid:row.messageid}; 211 let params={messageid:row.messageid};
208 selectReturnMsg(params).then(res=>{ 212 selectReturnMsg(params).then(res=>{
209 let response=res.data.data; 213 let response=res.data.data;
210 - console.log(response) 214 + //console.log(response)
211 this.gridData=response; 215 this.gridData=response;
212 }); 216 });
213 }, 217 },
214 //取消申报 218 //取消申报
215 trans_cancle(row){ 219 trans_cancle(row){
  220 + console.log(row)
216 this.dialogFormVisible=true; 221 this.dialogFormVisible=true;
217 this.row2=row; 222 this.row2=row;
218 }, 223 },
@@ -248,13 +253,13 @@ @@ -248,13 +253,13 @@
248 this.pageSize=val; 253 this.pageSize=val;
249 }, 254 },
250 handleCurrentChange(val) { 255 handleCurrentChange(val) {
251 - this.currentPage=val; 256 + this.pageNum=val;
252 this.submitForm(); 257 this.submitForm();
253 }, 258 },
254 //获取进港预报查询列表 259 //获取进港预报查询列表
255 submitForm() { 260 submitForm() {
256 let params = { 261 let params = {
257 - currentPage: this.currentPage, pageSize: this.pageSize, flightNo: this.queryArrival.flightNo, 262 + pageNum: this.pageNum, pageSize: this.pageSize, flightNo: this.queryArrival.flightNo,
258 flightDate: this.queryArrival.flightDate 263 flightDate: this.queryArrival.flightDate
259 }; 264 };
260 this.tableloading = true; 265 this.tableloading = true;
@@ -53,16 +53,16 @@ @@ -53,16 +53,16 @@
53 <el-table-column 53 <el-table-column
54 fixed="left" 54 fixed="left"
55 label="操作" 55 label="操作"
56 - width="200"> 56 + width="120">
57 <template slot-scope="scope"> 57 <template slot-scope="scope">
58 <el-button 58 <el-button
59 size="mini" 59 size="mini"
60 type="primary" 60 type="primary"
61 @click="handleEdit(scope.$index, scope.row)">编辑</el-button> 61 @click="handleEdit(scope.$index, scope.row)">编辑</el-button>
62 - <el-button  
63 - size="mini"  
64 - type="primary"  
65 - @click="showPerson(scope.$index,scope.row)">添加机组人员</el-button> 62 +<!-- <el-button-->
  63 +<!-- size="mini"-->
  64 +<!-- type="primary"-->
  65 +<!-- @click="showPerson(scope.$index,scope.row)">添加机组人员</el-button>-->
66 </template> 66 </template>
67 </el-table-column> 67 </el-table-column>
68 <el-table-column 68 <el-table-column
@@ -103,7 +103,10 @@ @@ -103,7 +103,10 @@
103 </el-table-column> 103 </el-table-column>
104 <el-table-column 104 <el-table-column
105 prop="statusMsg" 105 prop="statusMsg"
106 - label="海关回执"> 106 + label="海关回执"
  107 + width="140"
  108 + show-overflow-tooltip
  109 + >
107 </el-table-column> 110 </el-table-column>
108 <el-table-column 111 <el-table-column
109 fixed="right" 112 fixed="right"
@@ -115,7 +118,7 @@ @@ -115,7 +118,7 @@
115 size="mini" 118 size="mini"
116 type="primary" 119 type="primary"
117 @click="selectDetail(scope.$index,scope.row)">查看回执</el-button> 120 @click="selectDetail(scope.$index,scope.row)">查看回执</el-button>
118 - <el-button size="mini" type="success">保存并发送</el-button> 121 +<!-- <el-button size="mini" type="success">发送</el-button>-->
119 <el-button 122 <el-button
120 size="mini" 123 size="mini"
121 type="danger" 124 type="danger"
@@ -129,8 +132,8 @@ @@ -129,8 +132,8 @@
129 <el-pagination 132 <el-pagination
130 @size-change="handleSizeChange" 133 @size-change="handleSizeChange"
131 @current-change="handleCurrentChange" 134 @current-change="handleCurrentChange"
132 - :current-page="currentPage"  
133 - :page-sizes="[10, 20, 30, 40]" 135 + :current-page="pageNum"
  136 + :page-sizes="[10, 50, 100, 500]"
134 :page-size="pageSize" 137 :page-size="pageSize"
135 layout="total, sizes, prev, pager, next, jumper" 138 layout="total, sizes, prev, pager, next, jumper"
136 :total="total"> 139 :total="total">
@@ -149,87 +152,87 @@ @@ -149,87 +152,87 @@
149 </el-dialog> 152 </el-dialog>
150 </el-main> 153 </el-main>
151 <!--添加机组人员dialog--> 154 <!--添加机组人员dialog-->
152 - <el-row>  
153 - <el-dialog title="机组人员添加" :visible.sync="dialogTableVisibles" >  
154 - <el-form :model="billperson" :rules="brules" ref="billperson" label-width="130px" class="demo-ruleForm">  
155 - <el-row>  
156 - <el-col :span="10">  
157 - <el-form-item label="姓名" prop="name">  
158 - <el-input v-model="billperson.name" placeholder="请输入"></el-input>  
159 - </el-form-item>  
160 - </el-col>  
161 - <el-col :span="10">  
162 - <el-form-item label="性别" prop="gender">  
163 - <el-input v-model="billperson.gender" placeholder="M/F"></el-input>  
164 - </el-form-item>  
165 - </el-col>  
166 - <el-col :span="10">  
167 - <el-form-item label="证件类型" prop="certType">  
168 - <el-input v-model="billperson.certType" placeholder="请输入"></el-input>  
169 - </el-form-item>  
170 - </el-col>  
171 - <el-col :span="10">  
172 - <el-form-item label="证件号码" prop="ceterNo">  
173 - <el-input v-model="billperson.ceterNo" placeholder="请输入"></el-input>  
174 - </el-form-item>  
175 - </el-col>  
176 - <el-col :span="10">  
177 - <el-form-item label="国籍" prop="nationality">  
178 - <el-input v-model="billperson.nationality" placeholder="请输入"></el-input>  
179 - </el-form-item>  
180 - </el-col>  
181 - <el-col :span="10">  
182 - <el-form-item label="职务" prop="gareer">  
183 - <el-input v-model="billperson.gareer" placeholder="请输入"></el-input>  
184 - </el-form-item>  
185 - </el-col>  
186 - <el-col :span="24">  
187 - <el-form-item label="备注" prop="meno">  
188 - <el-input v-model="billperson.meno" placeholder="请输入"></el-input>  
189 - </el-form-item>  
190 - </el-col>  
191 - <el-col :span="24"> <el-button type="primary" @click="submitPerson('billperson')" style="float: right">提 交</el-button></el-col>  
192 - </el-row>  
193 - </el-form>  
194 - <el-row>  
195 - <el-table  
196 - :data="tableData2"  
197 - border  
198 - style="width: 100%;margin-bottom: 10px">  
199 - <el-table-column  
200 - fixed="left"  
201 - prop="name"  
202 - label="姓名">  
203 - </el-table-column>  
204 - <el-table-column  
205 - prop="gender"  
206 - label="性别">  
207 - </el-table-column>  
208 - <el-table-column  
209 - prop="nationality"  
210 - label="国籍">  
211 - </el-table-column>  
212 - <el-table-column  
213 - prop="certType"  
214 - label="证件类型">  
215 - </el-table-column>  
216 - <el-table-column  
217 - prop="ceterNo"  
218 - label="证件编辑">  
219 - </el-table-column>  
220 - <el-table-column  
221 - prop="gareer"  
222 - label="职务">  
223 - </el-table-column>  
224 - <el-table-column  
225 - fixed="right"  
226 - prop="meno"  
227 - label="备注">  
228 - </el-table-column>  
229 - </el-table>  
230 - </el-row>  
231 - </el-dialog>  
232 - </el-row> 155 +<!-- <el-row>-->
  156 +<!-- <el-dialog title="机组人员添加" :visible.sync="dialogTableVisibles" >-->
  157 +<!-- <el-form :model="billperson" :rules="brules" ref="billperson" label-width="130px" class="demo-ruleForm">-->
  158 +<!-- <el-row>-->
  159 +<!-- <el-col :span="10">-->
  160 +<!-- <el-form-item label="姓名" prop="name">-->
  161 +<!-- <el-input v-model="billperson.name" placeholder="请输入"></el-input>-->
  162 +<!-- </el-form-item>-->
  163 +<!-- </el-col>-->
  164 +<!-- <el-col :span="10">-->
  165 +<!-- <el-form-item label="性别" prop="gender">-->
  166 +<!-- <el-input v-model="billperson.gender" placeholder="M/F"></el-input>-->
  167 +<!-- </el-form-item>-->
  168 +<!-- </el-col>-->
  169 +<!-- <el-col :span="10">-->
  170 +<!-- <el-form-item label="证件类型" prop="certType">-->
  171 +<!-- <el-input v-model="billperson.certType" placeholder="请输入"></el-input>-->
  172 +<!-- </el-form-item>-->
  173 +<!-- </el-col>-->
  174 +<!-- <el-col :span="10">-->
  175 +<!-- <el-form-item label="证件号码" prop="ceterNo">-->
  176 +<!-- <el-input v-model="billperson.ceterNo" placeholder="请输入"></el-input>-->
  177 +<!-- </el-form-item>-->
  178 +<!-- </el-col>-->
  179 +<!-- <el-col :span="10">-->
  180 +<!-- <el-form-item label="国籍" prop="nationality">-->
  181 +<!-- <el-input v-model="billperson.nationality" placeholder="请输入"></el-input>-->
  182 +<!-- </el-form-item>-->
  183 +<!-- </el-col>-->
  184 +<!-- <el-col :span="10">-->
  185 +<!-- <el-form-item label="职务" prop="gareer">-->
  186 +<!-- <el-input v-model="billperson.gareer" placeholder="请输入"></el-input>-->
  187 +<!-- </el-form-item>-->
  188 +<!-- </el-col>-->
  189 +<!-- <el-col :span="24">-->
  190 +<!-- <el-form-item label="备注" prop="meno">-->
  191 +<!-- <el-input v-model="billperson.meno" placeholder="请输入"></el-input>-->
  192 +<!-- </el-form-item>-->
  193 +<!-- </el-col>-->
  194 +<!-- <el-col :span="24"> <el-button type="primary" @click="submitPerson('billperson')" style="float: right">提 交</el-button></el-col>-->
  195 +<!-- </el-row>-->
  196 +<!-- </el-form>-->
  197 +<!-- <el-row>-->
  198 +<!-- <el-table-->
  199 +<!-- :data="tableData2"-->
  200 +<!-- border-->
  201 +<!-- style="width: 100%;margin-bottom: 10px">-->
  202 +<!-- <el-table-column-->
  203 +<!-- fixed="left"-->
  204 +<!-- prop="name"-->
  205 +<!-- label="姓名">-->
  206 +<!-- </el-table-column>-->
  207 +<!-- <el-table-column-->
  208 +<!-- prop="gender"-->
  209 +<!-- label="性别">-->
  210 +<!-- </el-table-column>-->
  211 +<!-- <el-table-column-->
  212 +<!-- prop="nationality"-->
  213 +<!-- label="国籍">-->
  214 +<!-- </el-table-column>-->
  215 +<!-- <el-table-column-->
  216 +<!-- prop="certType"-->
  217 +<!-- label="证件类型">-->
  218 +<!-- </el-table-column>-->
  219 +<!-- <el-table-column-->
  220 +<!-- prop="ceterNo"-->
  221 +<!-- label="证件编辑">-->
  222 +<!-- </el-table-column>-->
  223 +<!-- <el-table-column-->
  224 +<!-- prop="gareer"-->
  225 +<!-- label="职务">-->
  226 +<!-- </el-table-column>-->
  227 +<!-- <el-table-column-->
  228 +<!-- fixed="right"-->
  229 +<!-- prop="meno"-->
  230 +<!-- label="备注">-->
  231 +<!-- </el-table-column>-->
  232 +<!-- </el-table>-->
  233 +<!-- </el-row>-->
  234 +<!-- </el-dialog>-->
  235 +<!-- </el-row>-->
233 <!--对话提示框--> 236 <!--对话提示框-->
234 <el-row> 237 <el-row>
235 <el-dialog 238 <el-dialog
@@ -267,6 +270,7 @@ @@ -267,6 +270,7 @@
267 </style> 270 </style>
268 <script> 271 <script>
269 import { addBillPerson, editBill, selectBill, selectReturnMsg} from "../../api/transport"; 272 import { addBillPerson, editBill, selectBill, selectReturnMsg} from "../../api/transport";
  273 +
270 import loginUserInfo from "../../api/base"; 274 import loginUserInfo from "../../api/base";
271 export default { 275 export default {
272 data(){ 276 data(){
@@ -277,47 +281,47 @@ @@ -277,47 +281,47 @@
277 flightDate:undefined, 281 flightDate:undefined,
278 accessFlag:undefined, 282 accessFlag:undefined,
279 }, 283 },
280 - billperson:{  
281 - autoId:undefined,  
282 - name:undefined,  
283 - gender:undefined,  
284 - gareer:undefined,  
285 - nationality:undefined,  
286 - certType:undefined,  
287 - ceterNo:undefined,  
288 - createTime:undefined,  
289 - createBy:loginUserInfo.username,  
290 - updateTime:undefined,  
291 - updateBy:loginUserInfo.username,  
292 - meno:undefined,  
293 - isDelete:undefined,  
294 - billsId:undefined  
295 - },  
296 - brules:{  
297 - name: [  
298 - {required: true, message: '请输入', trigger: 'blur'}  
299 - ],  
300 - gender: [  
301 - {required: true, message: '请输入', trigger: 'blur'}  
302 - ],  
303 - certType: [  
304 - {required: true, message: '请输入', trigger: 'blur'}  
305 - ],  
306 - ceterNo: [  
307 - {required: true, message: '请输入', trigger: 'blur'}  
308 - ],  
309 - nationality: [  
310 - {required: true, message: '请输入', trigger: 'blur'}  
311 - ],  
312 - gareer: [  
313 - {required: true, message: '请输入', trigger: 'blur'}  
314 - ],  
315 - },  
316 - dialogTableVisibles:false, 284 + // billperson:{
  285 + // autoId:undefined,
  286 + // name:undefined,
  287 + // gender:undefined,
  288 + // gareer:undefined,
  289 + // nationality:undefined,
  290 + // certType:undefined,
  291 + // ceterNo:undefined,
  292 + // createTime:undefined,
  293 + // createBy:loginUserInfo.username,
  294 + // updateTime:undefined,
  295 + // updateBy:loginUserInfo.username,
  296 + // meno:undefined,
  297 + // isDelete:undefined,
  298 + // billsId:undefined
  299 + // },
  300 + // brules:{
  301 + // name: [
  302 + // {required: true, message: '请输入', trigger: 'blur'}
  303 + // ],
  304 + // gender: [
  305 + // {required: true, message: '请输入', trigger: 'blur'}
  306 + // ],
  307 + // certType: [
  308 + // {required: true, message: '请输入', trigger: 'blur'}
  309 + // ],
  310 + // ceterNo: [
  311 + // {required: true, message: '请输入', trigger: 'blur'}
  312 + // ],
  313 + // nationality: [
  314 + // {required: true, message: '请输入', trigger: 'blur'}
  315 + // ],
  316 + // gareer: [
  317 + // {required: true, message: '请输入', trigger: 'blur'}
  318 + // ],
  319 + // },
  320 + // dialogTableVisibles:false,
317 tableloading:false, 321 tableloading:false,
318 rules:{}, 322 rules:{},
319 labelPosition:'left', 323 labelPosition:'left',
320 - currentPage: 1, 324 + pageNum: 1,
321 pageSize:10, 325 pageSize:10,
322 total:0, 326 total:0,
323 tableData:[], 327 tableData:[],
@@ -330,30 +334,30 @@ @@ -330,30 +334,30 @@
330 }, 334 },
331 methods: { 335 methods: {
332 //添加机组人员按钮 336 //添加机组人员按钮
333 - showPerson(index,row){  
334 - this.dialogTableVisibles=true;  
335 - this.billperson.billsId=row.uuid;  
336 - }, 337 + // showPerson(index,row){
  338 + // this.dialogTableVisibles=true;
  339 + // this.billperson.billsId=row.uuid;
  340 + // },
337 //提交按钮 341 //提交按钮
338 - submitPerson(formName){  
339 - //console.log(this.billperson.billsId)  
340 - this.$refs[formName].validate((valid) => {  
341 - if (valid) {  
342 - addBillPerson(this.billperson).then(res=>{  
343 - let response=res.data;  
344 - if(response.code=='200'){  
345 - this.centerDialogVisible=true;  
346 - this.msg=response.msg;  
347 - }else{  
348 - this.msg=response.msg;  
349 - }  
350 - });  
351 - } else {  
352 - console.log('error submit!!');  
353 - return false;  
354 - }  
355 - });  
356 - }, 342 + // submitPerson(formName){
  343 + // //console.log(this.billperson.billsId)
  344 + // this.$refs[formName].validate((valid) => {
  345 + // if (valid) {
  346 + // addBillPerson(this.billperson).then(res=>{
  347 + // let response=res.data;
  348 + // if(response.code=='200'){
  349 + // this.centerDialogVisible=true;
  350 + // this.msg=response.msg;
  351 + // }else{
  352 + // this.msg=response.msg;
  353 + // }
  354 + // });
  355 + // } else {
  356 + // console.log('error submit!!');
  357 + // return false;
  358 + // }
  359 + // });
  360 + // },
357 //查询回执列表 361 //查询回执列表
358 selectDetail(index,row){ 362 selectDetail(index,row){
359 this.gridData=[]; 363 this.gridData=[];
@@ -366,12 +370,13 @@ @@ -366,12 +370,13 @@
366 }, 370 },
367 //获取单据列表 371 //获取单据列表
368 submitForm(){ 372 submitForm(){
369 - let params={currentPage:this.currentPage,pageSize:this.pageSize,flightNo:this.queryBill.flightNo, 373 + let params={pageNum:this.pageNum,pageSize:this.pageSize,flightNo:this.queryBill.flightNo,
370 aircraftNo:this.queryBill.aircraftNo,flightDate:this.queryBill.flightDate,accessFlag:this.queryBill.accessFlag}; 374 aircraftNo:this.queryBill.aircraftNo,flightDate:this.queryBill.flightDate,accessFlag:this.queryBill.accessFlag};
371 this.tableloading=true; 375 this.tableloading=true;
372 selectBill(params).then(res=>{ 376 selectBill(params).then(res=>{
373 let response=res.data.data; 377 let response=res.data.data;
374 this.tableData=response.list; 378 this.tableData=response.list;
  379 + console.log(this.tableData)
375 this.tableloading=false; 380 this.tableloading=false;
376 this.total=response.total; 381 this.total=response.total;
377 }); 382 });
@@ -410,14 +415,16 @@ @@ -410,14 +415,16 @@
410 }, 415 },
411 //编辑单据查询 416 //编辑单据查询
412 handleEdit(index,row){ 417 handleEdit(index,row){
413 - this.$router.push({path:'/bill',query:row}) 418 +
  419 + this.$router.push({path:'/bill',query:row});
  420 +
414 }, 421 },
415 //分页 422 //分页
416 handleSizeChange(val) { 423 handleSizeChange(val) {
417 this.pageSize=val; 424 this.pageSize=val;
418 }, 425 },
419 handleCurrentChange(val) { 426 handleCurrentChange(val) {
420 - this.currentPage=val; 427 + this.pageNum=val;
421 this.submitForm(); 428 this.submitForm();
422 } 429 }
423 }, 430 },
@@ -76,10 +76,10 @@ @@ -76,10 +76,10 @@
76 label="报文操作" 76 label="报文操作"
77 width="200"> 77 width="200">
78 <template slot-scope="scope"> 78 <template slot-scope="scope">
79 - <el-button  
80 - size="mini"  
81 - type="primary"  
82 - @click="selectDetail(scope.$index,scope.row)">查看回执</el-button> 79 +<!-- <el-button-->
  80 +<!-- size="mini"-->
  81 +<!-- type="primary"-->
  82 +<!-- @click="selectDetail(scope.$index,scope.row)">查看回执</el-button>-->
83 <el-button 83 <el-button
84 size="mini" 84 size="mini"
85 type="danger" 85 type="danger"
@@ -93,7 +93,7 @@ @@ -93,7 +93,7 @@
93 <el-pagination 93 <el-pagination
94 @size-change="handleSizeChange" 94 @size-change="handleSizeChange"
95 @current-change="handleCurrentChange" 95 @current-change="handleCurrentChange"
96 - :current-page="currentPage" 96 + :current-page="pageNum"
97 :page-sizes="[10, 20, 30, 40]" 97 :page-sizes="[10, 20, 30, 40]"
98 :page-size="pageSize" 98 :page-size="pageSize"
99 layout="total, sizes, prev, pager, next, jumper" 99 layout="total, sizes, prev, pager, next, jumper"
@@ -142,7 +142,7 @@ @@ -142,7 +142,7 @@
142 flightNo:undefined, 142 flightNo:undefined,
143 }, 143 },
144 labelPosition:'left', 144 labelPosition:'left',
145 - currentPage: 1, 145 + pageNum: 1,
146 pageSize:10, 146 pageSize:10,
147 total:0, 147 total:0,
148 tableloading:false, 148 tableloading:false,
@@ -168,13 +168,13 @@ @@ -168,13 +168,13 @@
168 this.pageSize=val; 168 this.pageSize=val;
169 }, 169 },
170 handleCurrentChange(val) { 170 handleCurrentChange(val) {
171 - this.currentPage=val; 171 + this.pageNum=val;
172 this.submitForm(); 172 this.submitForm();
173 }, 173 },
174 //获取进港航班配置查询列表 174 //获取进港航班配置查询列表
175 submitForm() { 175 submitForm() {
176 let params = { 176 let params = {
177 - currentPage: this.currentPage, pageSize: this.pageSize, flightNo: this.queryConfigure.flightNo, 177 + pageNum: this.pageNum, pageSize: this.pageSize, flightNo: this.queryConfigure.flightNo,
178 }; 178 };
179 this.tableloading = true; 179 this.tableloading = true;
180 selectSchedule(params).then(res => { 180 selectSchedule(params).then(res => {
@@ -61,7 +61,7 @@ @@ -61,7 +61,7 @@
61 </el-table-column> 61 </el-table-column>
62 <el-table-column 62 <el-table-column
63 prop="aircraftNo" 63 prop="aircraftNo"
64 - label="航空器注册编码"> 64 + label="航空器注册码">
65 </el-table-column> 65 </el-table-column>
66 <el-table-column 66 <el-table-column
67 prop="arrivalPort" 67 prop="arrivalPort"
@@ -78,12 +78,12 @@ @@ -78,12 +78,12 @@
78 <el-table-column 78 <el-table-column
79 prop="departuredatetime" 79 prop="departuredatetime"
80 label="离港时间" 80 label="离港时间"
81 - width="120"> 81 + width="150">
82 </el-table-column> 82 </el-table-column>
83 <el-table-column 83 <el-table-column
84 prop="arrivaldatetime" 84 prop="arrivaldatetime"
85 label="抵港时间" 85 label="抵港时间"
86 - width="120"> 86 + width="150">
87 </el-table-column> 87 </el-table-column>
88 <el-table-column 88 <el-table-column
89 prop="statusMsg" 89 prop="statusMsg"
@@ -112,7 +112,7 @@ @@ -112,7 +112,7 @@
112 <el-pagination 112 <el-pagination
113 @size-change="handleSizeChange" 113 @size-change="handleSizeChange"
114 @current-change="handleCurrentChange" 114 @current-change="handleCurrentChange"
115 - :current-page="currentPage" 115 + :current-page="pageNum"
116 :page-sizes="[10, 20, 30, 40]" 116 :page-sizes="[10, 20, 30, 40]"
117 :page-size="pageSize" 117 :page-size="pageSize"
118 layout="total, sizes, prev, pager, next, jumper" 118 layout="total, sizes, prev, pager, next, jumper"
@@ -162,7 +162,7 @@ @@ -162,7 +162,7 @@
162 flightDate:undefined, 162 flightDate:undefined,
163 }, 163 },
164 labelPosition:'left', 164 labelPosition:'left',
165 - currentPage: 1, 165 + pageNum: 1,
166 pageSize:10, 166 pageSize:10,
167 total:0, 167 total:0,
168 tableloading:false, 168 tableloading:false,
@@ -188,13 +188,13 @@ @@ -188,13 +188,13 @@
188 this.pageSize=val; 188 this.pageSize=val;
189 }, 189 },
190 handleCurrentChange(val) { 190 handleCurrentChange(val) {
191 - this.currentPage=val; 191 + this.pageNum=val;
192 this.submitForm(); 192 this.submitForm();
193 }, 193 },
194 //获取进港确报查询列表 194 //获取进港确报查询列表
195 submitForm() { 195 submitForm() {
196 let params = { 196 let params = {
197 - currentPage: this.currentPage, pageSize: this.pageSize, flightNo: this.queryConfirmatory.flightNo, 197 + pageNum: this.pageNum, pageSize: this.pageSize, flightNo: this.queryConfirmatory.flightNo,
198 flightDate: this.queryConfirmatory.flightDate 198 flightDate: this.queryConfirmatory.flightDate
199 }; 199 };
200 this.tableloading = true; 200 this.tableloading = true;
@@ -68,7 +68,7 @@ @@ -68,7 +68,7 @@
68 </el-table-column> 68 </el-table-column>
69 <el-table-column 69 <el-table-column
70 prop="aircraftNo" 70 prop="aircraftNo"
71 - label="航空器注册编码" 71 + label="航空器注册码"
72 width="120"> 72 width="120">
73 </el-table-column> 73 </el-table-column>
74 <el-table-column 74 <el-table-column
@@ -89,7 +89,8 @@ @@ -89,7 +89,8 @@
89 </el-table-column> 89 </el-table-column>
90 <el-table-column 90 <el-table-column
91 prop="departuredatetime" 91 prop="departuredatetime"
92 - label="离港时间"> 92 + label="离港时间"
  93 + width="150">
93 </el-table-column> 94 </el-table-column>
94 <el-table-column 95 <el-table-column
95 prop="statusMsg" 96 prop="statusMsg"
@@ -118,7 +119,7 @@ @@ -118,7 +119,7 @@
118 <el-pagination 119 <el-pagination
119 @size-change="handleSizeChange" 120 @size-change="handleSizeChange"
120 @current-change="handleCurrentChange" 121 @current-change="handleCurrentChange"
121 - :current-page="currentPage" 122 + :current-page="pageNum"
122 :page-sizes="[10, 20, 30, 40]" 123 :page-sizes="[10, 20, 30, 40]"
123 :page-size="pageSize" 124 :page-size="pageSize"
124 layout="total, sizes, prev, pager, next, jumper" 125 layout="total, sizes, prev, pager, next, jumper"
@@ -169,7 +170,7 @@ @@ -169,7 +170,7 @@
169 flightDate:undefined, 170 flightDate:undefined,
170 }, 171 },
171 labelPosition:'left', 172 labelPosition:'left',
172 - currentPage: 1, 173 + pageNum: 1,
173 pageSize:10, 174 pageSize:10,
174 total:0, 175 total:0,
175 tableloading:false, 176 tableloading:false,
@@ -195,13 +196,13 @@ @@ -195,13 +196,13 @@
195 this.pageSize=val; 196 this.pageSize=val;
196 }, 197 },
197 handleCurrentChange(val) { 198 handleCurrentChange(val) {
198 - this.currentPage=val; 199 + this.pageNum=val;
199 this.submitForm(); 200 this.submitForm();
200 }, 201 },
201 //获取进港确报查询列表 202 //获取进港确报查询列表
202 submitForm() { 203 submitForm() {
203 let params = { 204 let params = {
204 - currentPage: this.currentPage, pageSize: this.pageSize, flightNo: this.queryDeclare.flightNo, 205 + pageNum: this.pageNum, pageSize: this.pageSize, flightNo: this.queryDeclare.flightNo,
205 flightDate: this.queryDeclare.flightDate 206 flightDate: this.queryDeclare.flightDate
206 }; 207 };
207 this.tableloading = true; 208 this.tableloading = true;
@@ -66,7 +66,7 @@ @@ -66,7 +66,7 @@
66 </el-table-column> 66 </el-table-column>
67 <el-table-column 67 <el-table-column
68 prop="aircraftNo" 68 prop="aircraftNo"
69 - label="航空器注册编码" 69 + label="航空器注册码"
70 width="120"> 70 width="120">
71 </el-table-column> 71 </el-table-column>
72 <el-table-column 72 <el-table-column
@@ -87,7 +87,8 @@ @@ -87,7 +87,8 @@
87 </el-table-column> 87 </el-table-column>
88 <el-table-column 88 <el-table-column
89 prop="departuredatetime" 89 prop="departuredatetime"
90 - label="离港时间"> 90 + label="离港时间"
  91 + width="150">
91 </el-table-column> 92 </el-table-column>
92 <el-table-column 93 <el-table-column
93 prop="statusMsg" 94 prop="statusMsg"
@@ -119,7 +120,7 @@ @@ -119,7 +120,7 @@
119 <el-pagination 120 <el-pagination
120 @size-change="handleSizeChange" 121 @size-change="handleSizeChange"
121 @current-change="handleCurrentChange" 122 @current-change="handleCurrentChange"
122 - :current-page="currentPage" 123 + :current-page="pageNum"
123 :page-sizes="[10, 20, 30, 40]" 124 :page-sizes="[10, 20, 30, 40]"
124 :page-size="pageSize" 125 :page-size="pageSize"
125 layout="total, sizes, prev, pager, next, jumper" 126 layout="total, sizes, prev, pager, next, jumper"
@@ -187,7 +188,7 @@ @@ -187,7 +188,7 @@
187 flightDate:undefined, 188 flightDate:undefined,
188 }, 189 },
189 labelPosition:'left', 190 labelPosition:'left',
190 - currentPage: 1, 191 + pageNum: 1,
191 pageSize:10, 192 pageSize:10,
192 total:0, 193 total:0,
193 tableData:[], 194 tableData:[],
@@ -219,13 +220,13 @@ @@ -219,13 +220,13 @@
219 this.pageSize=val; 220 this.pageSize=val;
220 }, 221 },
221 handleCurrentChange(val) { 222 handleCurrentChange(val) {
222 - this.currentPage=val; 223 + this.pageNum=val;
223 this.submitForm(); 224 this.submitForm();
224 }, 225 },
225 //获取出港预报查询列表 226 //获取出港预报查询列表
226 submitForm() { 227 submitForm() {
227 let params = { 228 let params = {
228 - currentPage: this.currentPage, pageSize: this.pageSize, flightNo: this.queryDeparture.flightNo, 229 + pageNum: this.pageNum, pageSize: this.pageSize, flightNo: this.queryDeparture.flightNo,
229 flightDate: this.queryDeparture.flightDate 230 flightDate: this.queryDeparture.flightDate
230 }; 231 };
231 this.tableloading = true; 232 this.tableloading = true;
@@ -76,10 +76,10 @@ @@ -76,10 +76,10 @@
76 label="报文操作" 76 label="报文操作"
77 width="200"> 77 width="200">
78 <template slot-scope="scope"> 78 <template slot-scope="scope">
79 - <el-button  
80 - size="mini"  
81 - type="primary"  
82 - @click="selectDetail(scope.$index,scope.row)">查看回执</el-button> 79 +<!-- <el-button-->
  80 +<!-- size="mini"-->
  81 +<!-- type="primary"-->
  82 +<!-- @click="selectDetail(scope.$index,scope.row)">查看回执</el-button>-->
83 <el-button 83 <el-button
84 size="mini" 84 size="mini"
85 type="danger" 85 type="danger"
@@ -93,7 +93,7 @@ @@ -93,7 +93,7 @@
93 <el-pagination 93 <el-pagination
94 @size-change="handleSizeChange" 94 @size-change="handleSizeChange"
95 @current-change="handleCurrentChange" 95 @current-change="handleCurrentChange"
96 - :current-page="currentPage" 96 + :current-page="pageNum"
97 :page-sizes="[10, 20, 30, 40]" 97 :page-sizes="[10, 20, 30, 40]"
98 :page-size="pageSize" 98 :page-size="pageSize"
99 layout="total, sizes, prev, pager, next, jumper" 99 layout="total, sizes, prev, pager, next, jumper"
@@ -142,7 +142,7 @@ @@ -142,7 +142,7 @@
142 flightNo:undefined, 142 flightNo:undefined,
143 }, 143 },
144 labelPosition:'left', 144 labelPosition:'left',
145 - currentPage: 1, 145 + pageNum: 1,
146 pageSize:10, 146 pageSize:10,
147 total:0, 147 total:0,
148 tableloading:false, 148 tableloading:false,
@@ -168,13 +168,13 @@ @@ -168,13 +168,13 @@
168 this.pageSize=val; 168 this.pageSize=val;
169 }, 169 },
170 handleCurrentChange(val) { 170 handleCurrentChange(val) {
171 - this.currentPage=val; 171 + this.pageNum=val;
172 this.submitForm(); 172 this.submitForm();
173 }, 173 },
174 //获取出港航班配置查询列表 174 //获取出港航班配置查询列表
175 submitForm() { 175 submitForm() {
176 let params = { 176 let params = {
177 - currentPage: this.currentPage, pageSize: this.pageSize, flightNo: this.queryFlightConfigure.flightNo, 177 + pageNum: this.pageNum, pageSize: this.pageSize, flightNo: this.queryFlightConfigure.flightNo,
178 }; 178 };
179 this.tableloading = true; 179 this.tableloading = true;
180 selectSchedule(params).then(res => { 180 selectSchedule(params).then(res => {
@@ -103,7 +103,8 @@ @@ -103,7 +103,8 @@
103 </el-table-column> 103 </el-table-column>
104 <el-table-column 104 <el-table-column
105 prop="statusMsg" 105 prop="statusMsg"
106 - label="海关回执"> 106 + label="海关回执"
  107 + show-overflow-tooltip>
107 </el-table-column> 108 </el-table-column>
108 <el-table-column 109 <el-table-column
109 fixed="right" 110 fixed="right"
@@ -139,11 +140,11 @@ @@ -139,11 +140,11 @@
139 <!-- 查看回执弹框--> 140 <!-- 查看回执弹框-->
140 <el-dialog title="回执明细" :visible.sync="dialogTableVisible"> 141 <el-dialog title="回执明细" :visible.sync="dialogTableVisible">
141 <el-table :data="gridData"> 142 <el-table :data="gridData">
142 - <el-table-column prop="" label="操作时间" fixed="left" width="150"></el-table-column> 143 + <el-table-column property="createTime" label="操作时间" fixed="left" width="150"></el-table-column>
143 <el-table-column property="createBy" label="操作人" ></el-table-column> 144 <el-table-column property="createBy" label="操作人" ></el-table-column>
144 <el-table-column property="flightNo" label="航班号" ></el-table-column> 145 <el-table-column property="flightNo" label="航班号" ></el-table-column>
145 <el-table-column property="flightDate" label="航班日期" ></el-table-column> 146 <el-table-column property="flightDate" label="航班日期" ></el-table-column>
146 - <el-table-column property="receiptContent" label="回执内容" fixed="right" width="300"></el-table-column> 147 + <el-table-column property="receiptContent" label="回执内容" show-overflow-tooltip fixed="right" width="300"></el-table-column>
147 </el-table> 148 </el-table>
148 </el-dialog> 149 </el-dialog>
149 </el-main> 150 </el-main>
@@ -169,6 +170,8 @@ @@ -169,6 +170,8 @@
169 </style> 170 </style>
170 <script> 171 <script>
171 import {selectFlightPlan, editFlightPlan, selectReturnMsg} from "../../api/transport"; 172 import {selectFlightPlan, editFlightPlan, selectReturnMsg} from "../../api/transport";
  173 + import loginUserInfo from '@/api/base.js'
  174 +
172 export default { 175 export default {
173 data(){ 176 data(){
174 return{ 177 return{