朱兆平 / vue_cli · 提交

转到一个项目

作者 唐俊升
提交 66b9571a59a2977de2382b5c51f9af5ac839fc48 2 个父辈 8eef3b47 f4405275

Merge branch 'ExportOrder' 

# Conflicts:
#	src/views/nav3/Way.vue
内嵌 并排对比
正在显示 25 个修改的文件 包含 634 行增加 和 108 行删除
@@ -12,3 +12,5 @@ export const delCustomer = params => { return axios.get(`${baseServiceURL2}/cust @@ -12,3 +12,5 @@ export const delCustomer = params => { return axios.get(`${baseServiceURL2}/cust
12 export const ediCustomer = params => { return http.post(`${baseServiceURL2}/customer/ediCustomer`, params); }; 12 export const ediCustomer = params => { return http.post(`${baseServiceURL2}/customer/ediCustomer`, params); };
13 //客户配置列表 13 //客户配置列表
14 export const selectCustomers = params => { return axios.get(`${baseServiceURL2}/customer/selectCustomers`, { params: params }); }; 14 export const selectCustomers = params => { return axios.get(`${baseServiceURL2}/customer/selectCustomers`, { params: params }); };
  15 +// 查询客户配置所有列表
  16 +export const selectAll = params => {return axios.get(`${baseServiceURL2}/customer/selectAll`, {params: params});};
@@ -7,11 +7,12 @@ let baseServiceURL2 = 'wlpt-cbed-system' @@ -7,11 +7,12 @@ let baseServiceURL2 = 'wlpt-cbed-system'
7 7
8 8
9 //订单列表 9 //订单列表
10 -export const selectLists = params => { return axios.get(`${baseServiceURL2}/ExportOrderDeclaration/selectLists`, { params: params }); }; 10 +// export const selectLists = params => { return axios.get(`${baseServiceURL2}/ExportOrderDeclaration/selectLists`, { params: params }); };
  11 +export const selectLists = params => { return axios.get(`${baseServiceURL2}/ExportOrder/selectList`, { params: params }); };
11 //订单申报 12 //订单申报
12 export const sendOrder = params => { return http.post(`${baseServiceURL2}/ExportOrderDeclaration/sendOrder`, params); }; 13 export const sendOrder = params => { return http.post(`${baseServiceURL2}/ExportOrderDeclaration/sendOrder`, params); };
13 //上传EXCEL 14 //上传EXCEL
14 -export const importExcel = params => { return http.postExcelData(`${baseServiceURL2}/import/importExcel`, params); }; 15 +// export const importExcel = params => { return http.postExcelData(`${baseServiceURL2}/import/importExcel`, params); };
15 //订单批量申报 16 //订单批量申报
16 export const batchOrder = params => { return http.post(`${baseServiceURL2}/ExportOrderDeclaration/batchOrder`, params); }; 17 export const batchOrder = params => { return http.post(`${baseServiceURL2}/ExportOrderDeclaration/batchOrder`, params); };
17 //订单批量导入申报 18 //订单批量导入申报
@@ -30,3 +31,11 @@ export const zfeldBatchDeclare = params => { return http.post(`${baseServiceURL2 @@ -30,3 +31,11 @@ export const zfeldBatchDeclare = params => { return http.post(`${baseServiceURL2
30 export const zfeldImportDeclare = params => { return http.postExcelData(`${baseServiceURL2}/ExportWaybillDeclaration/eldImportDeclare`, params); }; 31 export const zfeldImportDeclare = params => { return http.postExcelData(`${baseServiceURL2}/ExportWaybillDeclaration/eldImportDeclare`, params); };
31 //根据提运单统计信息 32 //根据提运单统计信息
32 export const billNoStatistics = params => { return axios.get(`${baseServiceURL2}/ExportListDeclaration/billNoStatistics`, { params: params }); }; 33 export const billNoStatistics = params => { return axios.get(`${baseServiceURL2}/ExportListDeclaration/billNoStatistics`, { params: params }); };
  34 +// 根据guid删除订单信息
  35 +export const deleteOrderByGuid = params => {return axios.get(`${baseServiceURL2}/ExportOrder/deleteByGuid`, {params: params}); };
  36 +// 根据guid列表批量删除订单信息
  37 +export const batchDelOrderByBeans = params =>{return http.post(`${baseServiceURL2}/ExportOrder/deleteByBeans`,params); };
  38 +// 导入订单文件到minio
  39 +export const importExcelToMinio = params => { return http.postExcelData(`${baseServiceURL2}/import/importExcelToMinio`, params); };
  40 +// 查询导入文件列表
  41 +export const selectFilePage = params =>{return axios.get(`${baseServiceURL2}/import/selectFilePage`, { params: params }); }
@@ -32,6 +32,9 @@ export const addTeleAddr = params => {return axios.post(`${base1}/teleaddr/addTe @@ -32,6 +32,9 @@ export const addTeleAddr = params => {return axios.post(`${base1}/teleaddr/addTe
32 export const delTeleAddr = params => {return http.get(`${base1}/teleaddr/delTeleAddr`, params);}; 32 export const delTeleAddr = params => {return http.get(`${base1}/teleaddr/delTeleAddr`, params);};
33 export const ediTeleAddr = params => {return axios.post(`${base1}/teleaddr/ediTeleAddr`, params);}; 33 export const ediTeleAddr = params => {return axios.post(`${base1}/teleaddr/ediTeleAddr`, params);};
34 export const selectLists = params => {return http.get(`${base1}/teleaddr/selectLists`, params);}; 34 export const selectLists = params => {return http.get(`${base1}/teleaddr/selectLists`, params);};
  35 +//结算统计
  36 +export const selectStatistics = params => {return http.get(`${base1}/efre/selectStatistics`, params);};
  37 +
35 38
36 39
37 40
@@ -189,6 +189,7 @@ import TeleAddr from "./views/nav3/TeleAddr.vue"; @@ -189,6 +189,7 @@ import TeleAddr from "./views/nav3/TeleAddr.vue";
189 //朱总让做的网页在线客服 189 //朱总让做的网页在线客服
190 import Webdialog from './views/bus/Webdialog.vue' 190 import Webdialog from './views/bus/Webdialog.vue'
191 import C6Way from './views/nav3/C6Way.vue' 191 import C6Way from './views/nav3/C6Way.vue'
  192 +import DBstatistics from './views/nav3/statistics.vue'
192 193
193 //转运申请 194 //转运申请
194 import Transport from './views/nav4/Transport.vue' 195 import Transport from './views/nav4/Transport.vue'
@@ -205,6 +206,7 @@ import satellite from "./views/deploy/satellite"; @@ -205,6 +206,7 @@ import satellite from "./views/deploy/satellite";
205 import ExortOrder from './views/exportorder/Exportorder.vue' 206 import ExortOrder from './views/exportorder/Exportorder.vue'
206 import CustomerConfig from './views/exportorder/CustomerConfig.vue' 207 import CustomerConfig from './views/exportorder/CustomerConfig.vue'
207 import ManagerWaybill from "./views/exportorder/ManagerWaybill.vue"; 208 import ManagerWaybill from "./views/exportorder/ManagerWaybill.vue";
  209 +import ImportOrder from './views/exportorder/ImportOrder';
208 210
209 /*制单管理*/ 211 /*制单管理*/
210 import ZhiDan from './views/zhidan/zhidan.vue' 212 import ZhiDan from './views/zhidan/zhidan.vue'
@@ -244,7 +246,8 @@ let routes = [ @@ -244,7 +246,8 @@ let routes = [
244 children: [ 246 children: [
245 {path: '/ExortOrder', component: ExortOrder, name: '出口订单'}, 247 {path: '/ExortOrder', component: ExortOrder, name: '出口订单'},
246 {path: '/CustomerConfig', component: CustomerConfig, name: '客户配置'}, 248 {path: '/CustomerConfig', component: CustomerConfig, name: '客户配置'},
247 - {path: '/ManagerWaybill', component: ManagerWaybill, name: '主单管理'} 249 + {path: '/ManagerWaybill', component: ManagerWaybill, name: '主单管理'},
  250 + {path: '/import', component: ImportOrder, name: '订单预录入'}
248 ] 251 ]
249 }, 252 },
250 { 253 {
@@ -279,6 +282,7 @@ let routes = [ @@ -279,6 +282,7 @@ let routes = [
279 {path: '/Webdialog', component: Webdialog, name: '在线客服'}, 282 {path: '/Webdialog', component: Webdialog, name: '在线客服'},
280 {path: '/TeleAddr', component: TeleAddr, name: '电报地址'}, 283 {path: '/TeleAddr', component: TeleAddr, name: '电报地址'},
281 {path: '/C6Way', component: C6Way, name: 'C6货运单'}, 284 {path: '/C6Way', component: C6Way, name: 'C6货运单'},
  285 + {path: '/DBstatistics', component: DBstatistics, name: '结算统计'},
282 ] 286 ]
283 }, 287 },
284 { 288 {
@@ -282,7 +282,6 @@ @@ -282,7 +282,6 @@
282 this.loading = true; 282 this.loading = true;
283 selectCountry(params).then(res =>{ 283 selectCountry(params).then(res =>{
284 if (res!=null) { 284 if (res!=null) {
285 - console.log(res.data.data)  
286 setTimeout(() => { 285 setTimeout(() => {
287 this.loading = false; 286 this.loading = false;
288 this.countryOptions=res.data.data; 287 this.countryOptions=res.data.data;
@@ -300,7 +299,6 @@ @@ -300,7 +299,6 @@
300 this.loading = true; 299 this.loading = true;
301 selectCreden(params).then(res =>{ 300 selectCreden(params).then(res =>{
302 if (res!=null) { 301 if (res!=null) {
303 - console.log(res.data.data)  
304 setTimeout(() => { 302 setTimeout(() => {
305 this.loading = false; 303 this.loading = false;
306 this.certOptions=res.data.data; 304 this.certOptions=res.data.data;
@@ -318,8 +316,9 @@ @@ -318,8 +316,9 @@
318 addAircraft(this.aircraft).then(res=>{ 316 addAircraft(this.aircraft).then(res=>{
319 let response=res.data; 317 let response=res.data;
320 if(response.code=='200'){ 318 if(response.code=='200'){
321 - this.centerDialogVisible=true;  
322 - this.msg=response.msg; 319 + //this.centerDialogVisible=true;
  320 + //this.msg=response.msg;
  321 + this.$message.success(response.msg)
323 this.$router.push({path:'/queryAircraft',query:{airwayCode:this.aircraft.airwayCode,aircraftNo:this.aircraft.aircraftNo}}); 322 this.$router.push({path:'/queryAircraft',query:{airwayCode:this.aircraft.airwayCode,aircraftNo:this.aircraft.aircraftNo}});
324 }else{ 323 }else{
325 this.msg=response.msg; 324 this.msg=response.msg;
@@ -338,17 +337,16 @@ @@ -338,17 +337,16 @@
338 this.aircraft.createBy=loginUserInfo.username 337 this.aircraft.createBy=loginUserInfo.username
339 sendAircraft(this.aircraft).then(res=>{ 338 sendAircraft(this.aircraft).then(res=>{
340 let response=res.data; 339 let response=res.data;
341 - console.log(response);  
342 if(response.code=='200'){ 340 if(response.code=='200'){
343 - this.centerDialogVisible=true;  
344 - this.msg=response.msg; 341 + //this.centerDialogVisible=true;
  342 + //this.msg=response.msg;
345 this.$router.push({path:'/queryAircraft',query:{airwayCode:this.aircraft.airwayCode,aircraftNo:this.aircraft.aircraftNo}}); 343 this.$router.push({path:'/queryAircraft',query:{airwayCode:this.aircraft.airwayCode,aircraftNo:this.aircraft.aircraftNo}});
  344 + this.$message.success(response.msg)
346 }else{ 345 }else{
347 - this.msg=response.msg; 346 + this.$message.error(response.msg)
348 } 347 }
349 }); 348 });
350 } else { 349 } else {
351 - console.log('error submit!!');  
352 return false; 350 return false;
353 } 351 }
354 }); 352 });
@@ -368,7 +366,7 @@ @@ -368,7 +366,7 @@
368 return e.replace(/[^a-zA-Z0-9.-]/g,'').toUpperCase(); 366 return e.replace(/[^a-zA-Z0-9.-]/g,'').toUpperCase();
369 } 367 }
370 }, 368 },
371 - mounted(){ 369 + activated(){
372 this.defaultData(); 370 this.defaultData();
373 } 371 }
374 } 372 }
@@ -241,15 +241,15 @@ @@ -241,15 +241,15 @@
241 submitForm(formName) { 241 submitForm(formName) {
242 this.$refs[formName].validate((valid) => { 242 this.$refs[formName].validate((valid) => {
243 if (valid) { 243 if (valid) {
244 - console.log(this.arrival)  
245 addPrediction(this.arrival).then(res=>{ 244 addPrediction(this.arrival).then(res=>{
246 let response=res.data; 245 let response=res.data;
247 if(response.code=='200'){ 246 if(response.code=='200'){
248 - this.centerDialogVisible=true;  
249 - this.msg=response.msg; 247 + // this.centerDialogVisible=true;
  248 + //this.msg=response.msg;
250 this.$router.push({path:'/queryArrival',query:{flightNo:this.arrival.flightNo,flightDate:this.arrival.flightDate}}); 249 this.$router.push({path:'/queryArrival',query:{flightNo:this.arrival.flightNo,flightDate:this.arrival.flightDate}});
  250 + this.$message.success(response.msg)
251 }else{ 251 }else{
252 - this.msg=response.msg; 252 + this.$message.error(response.msg)
253 } 253 }
254 } 254 }
255 ); 255 );
@@ -292,7 +292,7 @@ @@ -292,7 +292,7 @@
292 return e.replace(/[^a-zA-Z0-9.-]/g,'').toUpperCase(); 292 return e.replace(/[^a-zA-Z0-9.-]/g,'').toUpperCase();
293 } 293 }
294 }, 294 },
295 - mounted(){ 295 + activated(){
296 this.defaultData(); 296 this.defaultData();
297 } 297 }
298 } 298 }
@@ -641,8 +641,9 @@ background-color: white; @@ -641,8 +641,9 @@ background-color: white;
641 addBillPerson(this.billperson).then(res=>{ 641 addBillPerson(this.billperson).then(res=>{
642 let response=res.data; 642 let response=res.data;
643 if(response.code=='200'){ 643 if(response.code=='200'){
644 - this.centerDialogVisible=true;  
645 - this.msg=response.msg; 644 + //this.centerDialogVisible=true;
  645 + //this.msg=response.msg;
  646 + this.$message.success(response.msg);
646 this.transList() 647 this.transList()
647 //document.getElementById("send").disabled=true; 648 //document.getElementById("send").disabled=true;
648 let sy=this.type="2"; 649 let sy=this.type="2";
@@ -771,15 +772,16 @@ background-color: white; @@ -771,15 +772,16 @@ background-color: white;
771 addBill(this.bill).then(res=>{ 772 addBill(this.bill).then(res=>{
772 let response=res.data; 773 let response=res.data;
773 if(response.code=='200'){ 774 if(response.code=='200'){
774 - this.centerDialogVisible=true;  
775 - this.msg=response.msg; 775 + this.$message.success(response.msg)
  776 + //this.centerDialogVisible=true;
  777 + //this.msg=response.msg;
776 // this.$router.push({path:'/queryBill',query:{aircraftNo:this.bill.aircraftNo,flightNo:this.bill.flightNo, 778 // this.$router.push({path:'/queryBill',query:{aircraftNo:this.bill.aircraftNo,flightNo:this.bill.flightNo,
777 // flightDate:this.bill.flightDate}}); 779 // flightDate:this.bill.flightDate}});
778 //document.getElementById("add").disabled=true; 780 //document.getElementById("add").disabled=true;
779 let st=this.status="2"; 781 let st=this.status="2";
780 this.btDeleStatusFormater(st); 782 this.btDeleStatusFormater(st);
781 }else{ 783 }else{
782 - this.msg=response.msg; 784 + this.$message.error(response.msg)
783 } 785 }
784 }); 786 });
785 } else { 787 } else {
@@ -797,10 +799,11 @@ background-color: white; @@ -797,10 +799,11 @@ background-color: white;
797 sendBill(this.bill).then(res=>{ 799 sendBill(this.bill).then(res=>{
798 let response=res.data; 800 let response=res.data;
799 if(response.code=='200'){ 801 if(response.code=='200'){
800 - this.centerDialogVisible=true;  
801 - this.msg=response.msg; 802 + //this.centerDialogVisible=true;
  803 + //this.msg=response.msg;
802 this.$router.push({path:'/queryBill',query:{aircraftNo:this.bill.aircraftNo,flightNo:this.bill.flightNo, 804 this.$router.push({path:'/queryBill',query:{aircraftNo:this.bill.aircraftNo,flightNo:this.bill.flightNo,
803 flightDate:this.bill.flightDate}}); 805 flightDate:this.bill.flightDate}});
  806 + this.$message.success(response.msg)
804 //document.getElementById("add").disabled=true; 807 //document.getElementById("add").disabled=true;
805 // let st=this.status="2"; 808 // let st=this.status="2";
806 // this.btDeleStatusFormater(st); 809 // this.btDeleStatusFormater(st);
@@ -865,7 +868,7 @@ background-color: white; @@ -865,7 +868,7 @@ background-color: white;
865 return uuid; 868 return uuid;
866 }, 869 },
867 }, 870 },
868 - mounted(){ 871 + activated(){
869 this.defaultData(); 872 this.defaultData();
870 //this.transList(); 873 //this.transList();
871 // this.getCreden(); 874 // this.getCreden();
@@ -487,7 +487,6 @@ @@ -487,7 +487,6 @@
487 const _this = this 487 const _this = this
488 selectExact(this.queryConfigure).then((response) => { 488 selectExact(this.queryConfigure).then((response) => {
489 const res = response.data 489 const res = response.data
490 - console.log(response.data)  
491 if (res.code !== '200') { 490 if (res.code !== '200') {
492 return _this.$message.error('获取消息收发记录，失败！') 491 return _this.$message.error('获取消息收发记录，失败！')
493 } 492 }
@@ -93,7 +93,7 @@ @@ -93,7 +93,7 @@
93 configure:{ 93 configure:{
94 username:loginUserInfo.username, 94 username:loginUserInfo.username,
95 flightNo:undefined, 95 flightNo:undefined,
96 - ietype:'0', 96 + ietype:'1',
97 reamrk:undefined, 97 reamrk:undefined,
98 // accessFlag:'1', 98 // accessFlag:'1',
99 country:'', 99 country:'',
@@ -138,16 +138,15 @@ @@ -138,16 +138,15 @@
138 if (valid) { 138 if (valid) {
139 this.configure.createBy=loginUserInfo.username 139 this.configure.createBy=loginUserInfo.username
140 this.configure.username=loginUserInfo.username 140 this.configure.username=loginUserInfo.username
141 - console.log(this.configure.flightNo)  
142 addSchedule(this.configure).then(res=>{ 141 addSchedule(this.configure).then(res=>{
143 let response=res.data; 142 let response=res.data;
144 - console.log(response)  
145 if(response.code=='200'){ 143 if(response.code=='200'){
146 - this.centerDialogVisible=true;  
147 - this.msg=response.msg; 144 + //this.centerDialogVisible=true;
  145 + //this.msg=response.msg;
148 this.$router.push({path:'/queryConfigure',query:{flightNo:this.configure.flightNo}}); 146 this.$router.push({path:'/queryConfigure',query:{flightNo:this.configure.flightNo}});
  147 + this.$message.success(response.msg)
149 }else{ 148 }else{
150 - this.msg=response.msg; 149 + this.$message.error(response.msg)
151 } 150 }
152 }); 151 });
153 } else { 152 } else {
@@ -167,7 +166,7 @@ @@ -167,7 +166,7 @@
167 return e.replace(/[^a-zA-Z0-9.-]/g,'').toUpperCase(); 166 return e.replace(/[^a-zA-Z0-9.-]/g,'').toUpperCase();
168 } 167 }
169 }, 168 },
170 - mounted(){ 169 + activated(){
171 this.defaultData(); 170 this.defaultData();
172 } 171 }
173 } 172 }
@@ -218,11 +218,12 @@ @@ -218,11 +218,12 @@
218 addConfirm(this.confirmatory).then(res=>{ 218 addConfirm(this.confirmatory).then(res=>{
219 let response=res.data; 219 let response=res.data;
220 if(response.code=='200'){ 220 if(response.code=='200'){
221 - this.centerDialogVisible=true;  
222 - this.msg=response.msg; 221 + //this.centerDialogVisible=true;
  222 + //this.msg=response.msg;
223 this.$router.push({path:'/queryConfirmatory',query:{flightNo:this.confirmatory.flightNo,flightDate:this.confirmatory.flightDate}}); 223 this.$router.push({path:'/queryConfirmatory',query:{flightNo:this.confirmatory.flightNo,flightDate:this.confirmatory.flightDate}});
  224 + this.$message.success(response.msg)
224 }else{ 225 }else{
225 - this.msg=response.msg; 226 + this.$message.error(response.msg)
226 } 227 }
227 }); 228 });
228 } else { 229 } else {
@@ -235,17 +236,16 @@ @@ -235,17 +236,16 @@
235 sendForm(formName) { 236 sendForm(formName) {
236 this.$refs[formName].validate((valid) => { 237 this.$refs[formName].validate((valid) => {
237 if (valid) { 238 if (valid) {
238 - console.log(this.confirmatory)  
239 this.confirmatory.createBy=loginUserInfo.username 239 this.confirmatory.createBy=loginUserInfo.username
240 -  
241 sendConfirmIn(this.confirmatory).then(res=>{ 240 sendConfirmIn(this.confirmatory).then(res=>{
242 let response=res.data; 241 let response=res.data;
243 if(response.code=='200'){ 242 if(response.code=='200'){
244 - this.centerDialogVisible=true;  
245 - this.msg=response.msg; 243 + //this.centerDialogVisible=true;
  244 + //this.msg=response.msg;
246 this.$router.push({path:'/queryConfirmatory',query:{flightNo:this.confirmatory.flightNo,flightDate:this.confirmatory.flightDate}}); 245 this.$router.push({path:'/queryConfirmatory',query:{flightNo:this.confirmatory.flightNo,flightDate:this.confirmatory.flightDate}});
  246 + this.$message.success(response.msg)
247 }else{ 247 }else{
248 - this.msg=response.msg; 248 + this.$message.error(response.msg)
249 } 249 }
250 }); 250 });
251 } else { 251 } else {
@@ -265,7 +265,7 @@ @@ -265,7 +265,7 @@
265 return e.replace(/[^a-zA-Z0-9.-]/g,'').toUpperCase(); 265 return e.replace(/[^a-zA-Z0-9.-]/g,'').toUpperCase();
266 } 266 }
267 }, 267 },
268 - mounted(){ 268 + activated(){
269 this.defaultData(); 269 this.defaultData();
270 } 270 }
271 } 271 }
@@ -195,11 +195,12 @@ @@ -195,11 +195,12 @@
195 addConfirm(this.declare).then(res=>{ 195 addConfirm(this.declare).then(res=>{
196 let response=res.data; 196 let response=res.data;
197 if(response.code=='200'){ 197 if(response.code=='200'){
198 - this.centerDialogVisible=true;  
199 - this.msg=response.msg; 198 + //this.centerDialogVisible=true;
  199 + //this.msg=response.msg;
  200 + this.$message.success(response.msg)
200 this.$router.push({path:'/queryDeclare',query:{flightNo:this.declare.flightNo,flightDate:this.declare.flightDate}}); 201 this.$router.push({path:'/queryDeclare',query:{flightNo:this.declare.flightNo,flightDate:this.declare.flightDate}});
201 }else{ 202 }else{
202 - this.msg=response.msg; 203 + this.$message.error(response.msg)
203 } 204 }
204 }); 205 });
205 } else { 206 } else {
@@ -216,11 +217,12 @@ @@ -216,11 +217,12 @@
216 sendConfirmOut(this.declare).then(res=>{ 217 sendConfirmOut(this.declare).then(res=>{
217 let response=res.data; 218 let response=res.data;
218 if(response.code=='200'){ 219 if(response.code=='200'){
219 - this.centerDialogVisible=true;  
220 - this.msg=response.msg; 220 + //this.centerDialogVisible=true;
  221 + //this.msg=response.msg;
  222 + this.$message.success(response.msg)
221 this.$router.push({path:'/queryDeclare',query:{flightNo:this.declare.flightNo,flightDate:this.declare.flightDate}}); 223 this.$router.push({path:'/queryDeclare',query:{flightNo:this.declare.flightNo,flightDate:this.declare.flightDate}});
222 }else{ 224 }else{
223 - this.msg=response.msg; 225 + this.$message.error(response.msg)
224 } 226 }
225 }); 227 });
226 } else { 228 } else {
@@ -240,7 +242,7 @@ @@ -240,7 +242,7 @@
240 return e.replace(/[^a-zA-Z0-9.-]/g,'').toUpperCase(); 242 return e.replace(/[^a-zA-Z0-9.-]/g,'').toUpperCase();
241 } 243 }
242 }, 244 },
243 - mounted(){ 245 + activated(){
244 this.defaultData(); 246 this.defaultData();
245 } 247 }
246 } 248 }
@@ -216,11 +216,13 @@ @@ -216,11 +216,13 @@
216 addPrediction(this.departure).then(res=>{ 216 addPrediction(this.departure).then(res=>{
217 let response=res.data; 217 let response=res.data;
218 if(response.code=='200'){ 218 if(response.code=='200'){
219 - this.centerDialogVisible=true;  
220 - this.msg=response.msg; 219 + //this.centerDialogVisible=true;
  220 + //this.msg=response.msg;
  221 + this.$message.success(response.msg)
221 this.$router.push({path:'/queryDeparture',query:{flightNo:this.departure.flightNo,flightDate:this.departure.flightDate}}); 222 this.$router.push({path:'/queryDeparture',query:{flightNo:this.departure.flightNo,flightDate:this.departure.flightDate}});
222 }else{ 223 }else{
223 - this.msg=response.msg; 224 + //this.msg=response.msg;
  225 + this.$message.error(response.msg)
224 } 226 }
225 }); 227 });
226 } else { 228 } else {
@@ -238,11 +240,12 @@ @@ -238,11 +240,12 @@
238 sendPredictionOut(this.departure).then(res=>{ 240 sendPredictionOut(this.departure).then(res=>{
239 let response=res.data; 241 let response=res.data;
240 if(response.code=='200'){ 242 if(response.code=='200'){
241 - this.centerDialogVisible=true;  
242 - this.msg=response.msg; 243 + //this.centerDialogVisible=true;
  244 + //this.msg=response.msg;
  245 + this.$message.success(response.msg)
243 this.$router.push({path:'/queryDeparture',query:{flightNo:this.departure.flightNo,flightDate:this.departure.flightDate}}); 246 this.$router.push({path:'/queryDeparture',query:{flightNo:this.departure.flightNo,flightDate:this.departure.flightDate}});
244 }else{ 247 }else{
245 - this.msg=response.msg; 248 + this.$message.error(response.msg)
246 } 249 }
247 }); 250 });
248 } else { 251 } else {
@@ -262,7 +265,7 @@ @@ -262,7 +265,7 @@
262 return e.replace(/[^a-zA-Z0-9.-]/g,'').toUpperCase(); 265 return e.replace(/[^a-zA-Z0-9.-]/g,'').toUpperCase();
263 } 266 }
264 }, 267 },
265 - mounted(){ 268 + activated(){
266 this.defaultData(); 269 this.defaultData();
267 } 270 }
268 } 271 }
@@ -435,13 +435,15 @@ @@ -435,13 +435,15 @@
435 addFlight(this.flight).then(res=>{ 435 addFlight(this.flight).then(res=>{
436 let response=res.data; 436 let response=res.data;
437 if(response.code=='200'){ 437 if(response.code=='200'){
438 - this.centerDialogVisible=true;  
439 - this.msg=response.msg; 438 + //this.centerDialogVisible=true;
  439 + //this.msg=response.msg;
440 this.$router.push({path:'/queryFlights',query:{flightNo:this.flight.flightNo,flightDate:this.flight.flightDate}}); 440 this.$router.push({path:'/queryFlights',query:{flightNo:this.flight.flightNo,flightDate:this.flight.flightDate}});
441 - this.centerDialogVisible=false; 441 + //this.centerDialogVisible=false;
  442 + this.$message.success(response.msg)
442 }else{ 443 }else{
443 - this.centerDialogVisible=true;  
444 - this.msg=response.msg; 444 + //this.centerDialogVisible=true;
  445 + //this.msg=response.msg;
  446 + this.$message.error(response.msg)
445 } 447 }
446 }); 448 });
447 } else { 449 } else {
@@ -457,13 +459,15 @@ @@ -457,13 +459,15 @@
457 sendFlight(this.flight).then(res=>{ 459 sendFlight(this.flight).then(res=>{
458 let response=res.data; 460 let response=res.data;
459 if(response.code=='200'){ 461 if(response.code=='200'){
460 - this.centerDialogVisible=true;  
461 - this.msg=response.msg; 462 + //this.centerDialogVisible=true;
  463 + //this.msg=response.msg;
462 this.$router.push({path:'/queryFlights',query:{flightNo:this.flight.flightNo,flightDate:this.flight.flightDate}}); 464 this.$router.push({path:'/queryFlights',query:{flightNo:this.flight.flightNo,flightDate:this.flight.flightDate}});
463 - this.centerDialogVisible=false; 465 + //this.centerDialogVisible=false;
  466 + this.$message.success(response.msg)
464 }else{ 467 }else{
465 - this.centerDialogVisible=true;  
466 - this.msg=response.msg; 468 + //this.centerDialogVisible=true;
  469 + //this.msg=response.msg;
  470 + this.$message.error(response.msg)
467 } 471 }
468 }); 472 });
469 } else { 473 } else {
@@ -505,7 +509,7 @@ @@ -505,7 +509,7 @@
505 } 509 }
506 }, 510 },
507 //渲染方法 511 //渲染方法
508 - mounted(){ 512 + activated(){
509 this.defaultData(); 513 this.defaultData();
510 } 514 }
511 } 515 }
@@ -257,9 +257,10 @@ @@ -257,9 +257,10 @@
257 addFlightPlan(this.flight).then(res=>{ 257 addFlightPlan(this.flight).then(res=>{
258 let response=res.data; 258 let response=res.data;
259 if(response.code=='200'){ 259 if(response.code=='200'){
260 - this.centerDialogVisible=true;  
261 - this.msg=response.msg; 260 + //this.centerDialogVisible=true;
  261 + //this.msg=response.msg;
262 this.$router.push({path:'/queryFlightplan',query:{flightNo:this.flight.flightNo,flightDate:this.flight.flightDate,aircraftNo:this.flight.aircraftNo}}); 262 this.$router.push({path:'/queryFlightplan',query:{flightNo:this.flight.flightNo,flightDate:this.flight.flightDate,aircraftNo:this.flight.aircraftNo}});
  263 + this.$message.success(response.msg)
263 }else{ 264 }else{
264 this.msg=response.msg; 265 this.msg=response.msg;
265 } 266 }
@@ -277,9 +278,10 @@ @@ -277,9 +278,10 @@
277 sendFlightPlan(this.flight).then(res=>{ 278 sendFlightPlan(this.flight).then(res=>{
278 let response=res.data; 279 let response=res.data;
279 if(response.code=='200'){ 280 if(response.code=='200'){
280 - this.centerDialogVisible=true;  
281 - this.msg=response.msg; 281 + //this.centerDialogVisible=true;
  282 + // this.msg=response.msg;
282 this.$router.push({path:'/queryFlightplan',query:{flightNo:this.flight.flightNo,flightDate:this.flight.flightDate,aircraftNo:this.flight.aircraftNo}}); 283 this.$router.push({path:'/queryFlightplan',query:{flightNo:this.flight.flightNo,flightDate:this.flight.flightDate,aircraftNo:this.flight.aircraftNo}});
  284 + this.$message.success(response.msg)
283 }else{ 285 }else{
284 this.msg=response.msg; 286 this.msg=response.msg;
285 } 287 }
@@ -304,7 +306,7 @@ @@ -304,7 +306,7 @@
304 }, 306 },
305 }, 307 },
306 308
307 - mounted(){ 309 + activated(){
308 this.defaultData(); 310 this.defaultData();
309 } 311 }
310 } 312 }
@@ -78,7 +78,7 @@ @@ -78,7 +78,7 @@
78 outConfigure:{ 78 outConfigure:{
79 username:loginUserInfo.username, 79 username:loginUserInfo.username,
80 flightNo:undefined, 80 flightNo:undefined,
81 - ietype:'1', 81 + ietype:'2',
82 reamrk:undefined, 82 reamrk:undefined,
83 // accessFlag:'2', 83 // accessFlag:'2',
84 createBy:loginUserInfo.username, 84 createBy:loginUserInfo.username,
@@ -113,11 +113,12 @@ @@ -113,11 +113,12 @@
113 addSchedule(this.outConfigure).then(res=>{ 113 addSchedule(this.outConfigure).then(res=>{
114 let response=res.data; 114 let response=res.data;
115 if(response.code=='200'){ 115 if(response.code=='200'){
116 - this.centerDialogVisible=true;  
117 - this.msg=response.msg; 116 + //this.centerDialogVisible=true;
  117 + //this.msg=response.msg;
  118 + this.$message.success(response.msg)
118 this.$router.push({path:'/queryFlightConfigure',query:{flightNo:this.outConfigure.flightNo}}); 119 this.$router.push({path:'/queryFlightConfigure',query:{flightNo:this.outConfigure.flightNo}});
119 }else{ 120 }else{
120 - this.msg=response.msg; 121 + this.$message.error(response.msg)
121 } 122 }
122 }); 123 });
123 } else { 124 } else {
@@ -137,7 +138,7 @@ @@ -137,7 +138,7 @@
137 return e.replace(/[^a-zA-Z0-9.-]/g,'').toUpperCase(); 138 return e.replace(/[^a-zA-Z0-9.-]/g,'').toUpperCase();
138 } 139 }
139 }, 140 },
140 - mounted(){ 141 + activated(){
141 this.defaultData(); 142 this.defaultData();
142 } 143 }
143 } 144 }
@@ -159,7 +159,6 @@ @@ -159,7 +159,6 @@
159 let params={messageid:row.messageid}; 159 let params={messageid:row.messageid};
160 selectReturnMsg(params).then(res=>{ 160 selectReturnMsg(params).then(res=>{
161 let response=res.data.data; 161 let response=res.data.data;
162 - console.log(response)  
163 this.gridData=response; 162 this.gridData=response;
164 }); 163 });
165 }, 164 },
@@ -174,7 +173,7 @@ @@ -174,7 +173,7 @@
174 //获取进港航班配置查询列表 173 //获取进港航班配置查询列表
175 submitForm() { 174 submitForm() {
176 let params = { 175 let params = {
177 - pageNum: this.pageNum, pageSize: this.pageSize, flightNo: this.queryConfigure.flightNo,ieType:'0' 176 + pageNum: this.pageNum, pageSize: this.pageSize, flightNo: this.queryConfigure.flightNo,ieType:'2'
178 }; 177 };
179 this.tableloading = true; 178 this.tableloading = true;
180 selectSchedule(params).then(res => { 179 selectSchedule(params).then(res => {
@@ -45,7 +45,7 @@ @@ -45,7 +45,7 @@
45 label="用户名"> 45 label="用户名">
46 </el-table-column> 46 </el-table-column>
47 <el-table-column 47 <el-table-column
48 - prop="flightno" 48 + prop="flightNo"
49 label="航班号"> 49 label="航班号">
50 </el-table-column> 50 </el-table-column>
51 <el-table-column 51 <el-table-column
@@ -180,6 +180,7 @@ @@ -180,6 +180,7 @@
180 selectSchedule(params).then(res => { 180 selectSchedule(params).then(res => {
181 let response = res.data.data; 181 let response = res.data.data;
182 this.tableData = response.list; 182 this.tableData = response.list;
  183 + console.log(response)
183 this.tableloading = false; 184 this.tableloading = false;
184 this.total = response.total; 185 this.total = response.total;
185 }); 186 });
@@ -490,7 +490,6 @@ @@ -490,7 +490,6 @@
490 const _this = this 490 const _this = this
491 selectPrePlanConfig(this.queryConfigure).then((response) => { 491 selectPrePlanConfig(this.queryConfigure).then((response) => {
492 const res = response.data 492 const res = response.data
493 - console.log(response.data)  
494 if (res.code !== '200') { 493 if (res.code !== '200') {
495 return _this.$message.error('获取消息收发记录，失败！') 494 return _this.$message.error('获取消息收发记录，失败！')
496 } 495 }
@@ -519,7 +518,6 @@ @@ -519,7 +518,6 @@
519 this.$refs.configure_addForm.validate(valid => { 518 this.$refs.configure_addForm.validate(valid => {
520 // 未通过，表单预校验 519 // 未通过，表单预校验
521 if (!valid) return 520 if (!valid) return
522 - console.log(this.configure_addForm);  
523 addPrePlanConfig(this.configure_addForm).then((response) => { 521 addPrePlanConfig(this.configure_addForm).then((response) => {
524 const res = response.data 522 const res = response.data
525 // 添加失败 523 // 添加失败
@@ -541,7 +539,6 @@ @@ -541,7 +539,6 @@
541 // 打开编辑 539 // 打开编辑
542 handleEdit(index, row) { 540 handleEdit(index, row) {
543 this.configure_addForm = Object.assign({}, row); 541 this.configure_addForm = Object.assign({}, row);
544 - console.log(this.configure_addForm)  
545 this.configure_addForm.schedule.options=[]; 542 this.configure_addForm.schedule.options=[];
546 for(var obj in row.schedulelist){ 543 for(var obj in row.schedulelist){
547 console.log(this.configure_addForm.schedule.options.push(row.schedulelist[obj]['weekday'])) 544 console.log(this.configure_addForm.schedule.options.push(row.schedulelist[obj]['weekday']))
@@ -109,7 +109,7 @@ @@ -109,7 +109,7 @@
109 </el-col> 109 </el-col>
110 <el-col :span="8" style="margin-left: 120px"> 110 <el-col :span="8" style="margin-left: 120px">
111 <el-button type="primary" @click="submitForm('airline')">保 存</el-button> 111 <el-button type="primary" @click="submitForm('airline')">保 存</el-button>
112 - <el-button type="success">保存并发送</el-button> 112 + <!--<el-button type="success">保存并发送</el-button>-->
113 </el-col> 113 </el-col>
114 </el-form> 114 </el-form>
115 </el-row> 115 </el-row>
@@ -296,13 +296,15 @@ @@ -296,13 +296,15 @@
296 addRoute(this.airline).then(res=>{ 296 addRoute(this.airline).then(res=>{
297 let response=res.data; 297 let response=res.data;
298 if(response.code=='200'){ 298 if(response.code=='200'){
299 - this.centerDialogVisible=true;  
300 - this.msg=response.msg; 299 + //this.centerDialogVisible=true;
  300 + //this.msg=response.msg;
301 this.$router.push({path:'/queryRoute',query:{serialNo:this.airline.serialNo}}); 301 this.$router.push({path:'/queryRoute',query:{serialNo:this.airline.serialNo}});
302 - this.centerDialogVisible=false; 302 + //this.centerDialogVisible=false;
  303 + this.$message.success(response.msg)
303 }else{ 304 }else{
304 - this.centerDialogVisible=true;  
305 - this.msg=response.msg; 305 + //this.centerDialogVisible=true;
  306 + //this.msg=response.msg;
  307 + this.$message.error(response.msg)
306 } 308 }
307 }); 309 });
308 } else { 310 } else {
@@ -346,7 +348,7 @@ @@ -346,7 +348,7 @@
346 }, 348 },
347 349
348 //渲染方法 350 //渲染方法
349 - mounted(){ 351 + activated(){
350 this.defaultData(); 352 this.defaultData();
351 } 353 }
352 } 354 }
@@ -279,11 +279,12 @@ @@ -279,11 +279,12 @@
279 addAirLineAircraft(this.aircraft).then(res=>{ 279 addAirLineAircraft(this.aircraft).then(res=>{
280 let response=res.data; 280 let response=res.data;
281 if(response.code=='200'){ 281 if(response.code=='200'){
282 - this.centerDialogVisible=true;  
283 - this.msg=response.msg; 282 + //this.centerDialogVisible=true;
  283 + //this.msg=response.msg;
284 this.$router.push({path:'/queryRouteaircraft',query:{airwayCode:this.aircraft.airwayCode,aircraftNo:this.aircraft.aircraftNo},}); 284 this.$router.push({path:'/queryRouteaircraft',query:{airwayCode:this.aircraft.airwayCode,aircraftNo:this.aircraft.aircraftNo},});
  285 + this.$message.success(response.msg)
285 }else{ 286 }else{
286 - this.msg=response.msg; 287 + this.$message.error(response.msg)
287 } 288 }
288 }); 289 });
289 } else { 290 } else {
@@ -300,11 +301,12 @@ @@ -300,11 +301,12 @@
300 sendAirLineAircraft(this.aircraft).then(res=>{ 301 sendAirLineAircraft(this.aircraft).then(res=>{
301 let response=res.data; 302 let response=res.data;
302 if(response.code=='200'){ 303 if(response.code=='200'){
303 - this.centerDialogVisible=true;  
304 - this.msg=response.msg; 304 + //this.centerDialogVisible=true;
  305 + //this.msg=response.msg;
305 this.$router.push({path:'/queryRouteaircraft',query:{airwayCode:this.aircraft.airwayCode,aircraftNo:this.aircraft.aircraftNo},}); 306 this.$router.push({path:'/queryRouteaircraft',query:{airwayCode:this.aircraft.airwayCode,aircraftNo:this.aircraft.aircraftNo},});
  307 + this.$message.success(response.msg)
306 }else{ 308 }else{
307 - this.msg=response.msg; 309 + this.$message.error(response.msg)
308 } 310 }
309 }); 311 });
310 } else { 312 } else {
@@ -325,7 +327,7 @@ @@ -325,7 +327,7 @@
325 } 327 }
326 328
327 }, 329 },
328 - mounted(){ 330 + activated(){
329 this.defaultData(); 331 this.defaultData();
330 } 332 }
331 } 333 }
@@ -6,6 +6,9 @@ @@ -6,6 +6,9 @@
6 <el-input size="medium" v-model="queryInfo.ext1" class="" placeholder="客户编码"></el-input> 6 <el-input size="medium" v-model="queryInfo.ext1" class="" placeholder="客户编码"></el-input>
7 </el-form-item> 7 </el-form-item>
8 <el-form-item label=""> 8 <el-form-item label="">
  9 + <el-input size="medium" v-model="queryInfo.ext2" class="" placeholder="主单号"></el-input>
  10 + </el-form-item>
  11 + <el-form-item label="">
9 <el-input size="medium" v-model="queryInfo.orderno" placeholder="订单号"></el-input> 12 <el-input size="medium" v-model="queryInfo.orderno" placeholder="订单号"></el-input>
10 </el-form-item> 13 </el-form-item>
11 <el-form-item label=""> 14 <el-form-item label="">
@@ -58,7 +61,7 @@ @@ -58,7 +61,7 @@
58 <el-form-item> 61 <el-form-item>
59 <el-button size="medium" @click="getList" style="background: none">查询</el-button> 62 <el-button size="medium" @click="getList" style="background: none">查询</el-button>
60 </el-form-item> 63 </el-form-item>
61 - <el-form-item> 64 +<!-- <el-form-item>
62 <el-upload 65 <el-upload
63 class="upload-demo" 66 class="upload-demo"
64 action="" 67 action=""
@@ -67,6 +70,9 @@ @@ -67,6 +70,9 @@
67 :show-file-list="false"> 70 :show-file-list="false">
68 <el-button size="medium" type="primary">导入订单</el-button> 71 <el-button size="medium" type="primary">导入订单</el-button>
69 </el-upload> 72 </el-upload>
  73 + </el-form-item>-->
  74 + <el-form-item>
  75 + <el-button size="medium" @click="batchDelOrderByBeans" type="danger">批量删除</el-button>
70 </el-form-item> 76 </el-form-item>
71 </el-form> 77 </el-form>
72 </div> 78 </div>
@@ -163,6 +169,7 @@ @@ -163,6 +169,7 @@
163 </el-table-column> 169 </el-table-column>
164 <el-table-column type="selection" width="55"></el-table-column> 170 <el-table-column type="selection" width="55"></el-table-column>
165 <el-table-column prop="ext1" label="客户编号" width="180"></el-table-column> 171 <el-table-column prop="ext1" label="客户编号" width="180"></el-table-column>
  172 + <el-table-column prop="ext2" label="主单号" width="180"></el-table-column>
166 <el-table-column prop="orderno" label="订单编号" width="180"></el-table-column> 173 <el-table-column prop="orderno" label="订单编号" width="180"></el-table-column>
167 <el-table-column prop="ordertype" label="订单类型" width="120"> 174 <el-table-column prop="ordertype" label="订单类型" width="120">
168 <template slot-scope="scope"> 175 <template slot-scope="scope">
@@ -210,6 +217,7 @@ @@ -210,6 +217,7 @@
210 <template slot-scope="scope"> 217 <template slot-scope="scope">
211 <el-button type="text" size="small" @click="sendorder(scope.row)">订单申报</el-button> 218 <el-button type="text" size="small" @click="sendorder(scope.row)">订单申报</el-button>
212 <el-button type="text" size="small" @click="sendDeclare(scope.row)">清单申报</el-button> 219 <el-button type="text" size="small" @click="sendDeclare(scope.row)">清单申报</el-button>
  220 + <el-button type="text" size="small" @click="deleteOrderByGuid(scope.row)">删除</el-button>
213 </template> 221 </template>
214 </el-table-column> 222 </el-table-column>
215 </el-table> 223 </el-table>
@@ -228,8 +236,9 @@ @@ -228,8 +236,9 @@
228 </template> 236 </template>
229 237
230 <script> 238 <script>
231 - import {sendOrder,selectLists,batchOrder,batchOrderImport,importExcel,eldhBatchDeclare,eldhImportDeclare,  
232 - eldBatchDeclare,eldImportDeclare,zfeldBatchDeclare,zfeldImportDeclare} from '../../api/consigner/exportOrder' 239 + import {sendOrder,selectLists,batchOrder,batchOrderImport,eldhBatchDeclare,eldhImportDeclare,
  240 + eldBatchDeclare,eldImportDeclare,zfeldBatchDeclare,zfeldImportDeclare,deleteOrderByGuid,
  241 + batchDelOrderByBeans} from '../../api/consigner/exportOrder'
233 export default { 242 export default {
234 data() { 243 data() {
235 return { 244 return {
@@ -272,6 +281,7 @@ @@ -272,6 +281,7 @@
272 orderno:'', 281 orderno:'',
273 ordertype:'', 282 ordertype:'',
274 ext1:'', 283 ext1:'',
  284 + ext2:'',
275 starttime:'', 285 starttime:'',
276 endtime:'', 286 endtime:'',
277 pageNum:1, 287 pageNum:1,
@@ -314,6 +324,7 @@ @@ -314,6 +324,7 @@
314 this.getList(); 324 this.getList();
315 }, 325 },
316 methods: { 326 methods: {
  327 +
317 //运单批量导入申报 328 //运单批量导入申报
318 zfbatchOrderImport({ file, onSuccess, onError }){ 329 zfbatchOrderImport({ file, onSuccess, onError }){
319 // 生成 FormData 对象 330 // 生成 FormData 对象
@@ -501,7 +512,7 @@ @@ -501,7 +512,7 @@
501 return true; // 允许上传 512 return true; // 允许上传
502 513
503 }, 514 },
504 - uploadFile({ file, onSuccess, onError }){ 515 + /*uploadFile({ file, onSuccess, onError }){
505 // 生成 FormData 对象 516 // 生成 FormData 对象
506 const formData = new FormData(); 517 const formData = new FormData();
507 formData.append('file', file); 518 formData.append('file', file);
@@ -518,7 +529,7 @@ @@ -518,7 +529,7 @@
518 this.$message.error(error.toString()) 529 this.$message.error(error.toString())
519 onError(error); // 调用 onError 回调通知上传失败 530 onError(error); // 调用 onError 回调通知上传失败
520 }) 531 })
521 - }, 532 + },*/
522 //订单申报 533 //订单申报
523 sendorder(row){ 534 sendorder(row){
524 sendOrder(row).then((response)=>{ 535 sendOrder(row).then((response)=>{
@@ -532,6 +543,44 @@ @@ -532,6 +543,44 @@
532 this.$message.error(error.toString()) 543 this.$message.error(error.toString())
533 }) 544 })
534 }, 545 },
  546 + // 订单删除
  547 + deleteOrderByGuid(row){
  548 + const guid = row.guid;
  549 + deleteOrderByGuid({guid}).then((response) => {
  550 + const res = response.data;
  551 + const code = res.code;
  552 + const msg = res.msg;
  553 + if (code !== '200'){
  554 + return this.$message.error(msg);
  555 + }
  556 + this.$message.success(`订单删除成功`);
  557 + this.getList();
  558 + }).catch(error => {
  559 + this.$message.error(error.toString())
  560 + })
  561 + },
  562 + // 订单批量删除
  563 + batchDelOrderByBeans(){
  564 + if (this.selectedRows.length!==0){
  565 + batchDelOrderByBeans(this.selectedRows).then((response) => {
  566 + const res = response.data;
  567 + const code = res.code;
  568 + const msg = res.msg;
  569 + const data = res.data;
  570 + if (code !== '200'){
  571 + const errMsg = `${msg}${data}`;
  572 + this.$message.error(errMsg);
  573 + return;
  574 + }
  575 + this.$message.success("订单批量删除成功");
  576 + this.getList();
  577 + }).catch(error => {
  578 + this.$message.error(error.toString());
  579 + })
  580 + }else {
  581 + this.$message.error('请勾选需要删除的订单信息！');
  582 + }
  583 + },
535 //订单列表查询 584 //订单列表查询
536 getList(){ 585 getList(){
537 if(this.value2 !== null && this.value2 !== ""){ 586 if(this.value2 !== null && this.value2 !== ""){
  1 +<template>
  2 + <div>
  3 + <div>
  4 + <el-form :inline="true" :model="queryInfo" class="demo-form-inline">
  5 + <el-form-item label="">
  6 + <el-select size="medium" v-model="queryInfo.clientCode" placeholder="客户编码" clearable>
  7 + <el-option
  8 + v-for="item in customerList"
  9 + :key="item.clientCode"
  10 + :label="item.clientName"
  11 + :value="item.clientCode"
  12 + >
  13 + </el-option>
  14 + </el-select>
  15 + </el-form-item>
  16 + <el-form-item label="">
  17 + <el-select size="medium" v-model="queryInfo.fileStatus" placeholder="文件状态" clearable>
  18 + <el-option
  19 + v-for="item in fileStatus"
  20 + :key="item.value"
  21 + :label="item.label"
  22 + :value="item.value">
  23 + </el-option>
  24 + </el-select>
  25 + </el-form-item>
  26 + <el-form-item label="">
  27 + <el-input size="medium" v-model="queryInfo.fileName" placeholder="文件名称"></el-input>
  28 + </el-form-item>
  29 + <el-form-item>
  30 + <div class="block">
  31 + <el-date-picker
  32 + style="background: none"
  33 + size="medium"
  34 + v-model="value2"
  35 + type="daterange"
  36 + align="right"
  37 + unlink-panels
  38 + range-separator="至"
  39 + start-placeholder="开始日期"
  40 + end-placeholder="结束日期"
  41 + value-format="yyyy-MM-dd HH:mm:ss"
  42 + :picker-options="pickerOptions">
  43 + </el-date-picker>
  44 + </div>
  45 + </el-form-item>
  46 + <el-form-item>
  47 + <el-button type="primary" @click="getList">查询</el-button>
  48 + </el-form-item>
  49 + </el-form>
  50 + </div>
  51 + <div>
  52 + <el-row :gutter="20">
  53 + <el-col :span="3">
  54 + <el-button size="medium" @click="downloadOrderTemplate">模板下载</el-button>
  55 + </el-col>
  56 + <el-col :span="3">
  57 + <el-upload
  58 + class="upload-demo"
  59 + action=""
  60 + :before-upload="beforeUpload"
  61 + :http-request="orderImport"
  62 + :show-file-list="false">
  63 + <el-button size="medium" type="primary">导入订单</el-button>
  64 + </el-upload>
  65 + </el-col>
  66 + </el-row>
  67 + </div>
  68 + <el-row :gutter="20" style="height: 20px;"></el-row>
  69 + <div>
  70 + <el-table
  71 + :data="tableData"
  72 + style="width: 100%"
  73 + row-key="uuid"
  74 + border
  75 + stripe
  76 + >
  77 + <el-table-column prop="clientName" label="客户名称" width="180" show-overflow-tooltip></el-table-column>
  78 + <el-table-column prop="clientCode" label="客户编码" width="180" show-overflow-tooltip></el-table-column>
  79 + <el-table-column prop="fileStatus" label="文件状态" width="180" show-overflow-tooltip>
  80 + <template slot-scope="scope">
  81 + <span v-if="scope.row.fileStatus === 1">入库中</span>
  82 + <span v-else-if="scope.row.fileStatus === 2">入库异常</span>
  83 + <span v-else-if="scope.row.fileStatus === 5">入库成功</span>
  84 + </template>
  85 + </el-table-column>
  86 + <el-table-column prop="fileName" label="文件名称" width="180" show-overflow-tooltip></el-table-column>
  87 + <el-table-column prop="handleRes" label="处理结果" width="180" show-overflow-tooltip></el-table-column>
  88 + <el-table-column prop="createTime" label="创建时间" width="180" show-overflow-tooltip></el-table-column>
  89 + </el-table>
  90 + </div>
  91 + <div class="block">
  92 + <el-pagination
  93 + @size-change="handleSizeChange"
  94 + @current-change="handleCurrentChange"
  95 + :current-page="queryInfo.pageNum"
  96 + :page-sizes="[20, 30, 40, 100]"
  97 + :page-size="queryInfo.pageSize"
  98 + layout="total, sizes, prev, pager, next, jumper"
  99 + :total="total">
  100 + </el-pagination>
  101 + </div>
  102 + </div>
  103 +</template>
  104 +
  105 +<script>
  106 + import {selectAll} from '../../api/consigner/customerconfig'
  107 + import {importExcelToMinio, selectFilePage} from '../../api/consigner/exportOrder'
  108 + export default {
  109 + data() {
  110 + return {
  111 + // 查询条件
  112 + queryInfo: {
  113 + clientCode: '',
  114 + fileStatus: '',
  115 + fileName: '',
  116 + startTime: '',
  117 + endTime: '',
  118 + pageNum: 1,
  119 + pageSize: 20
  120 + },
  121 + // 列表数据
  122 + tableData: [],
  123 + total: 0,
  124 + // 文件状态码
  125 + fileStatus: [
  126 + {
  127 + label: '入库中',
  128 + value: '1'
  129 + },
  130 + {
  131 + label: '入库异常',
  132 + value: '2'
  133 + },
  134 + {
  135 + label: '入库成功',
  136 + value: '5'
  137 + }
  138 + ],
  139 + pickerOptions: {
  140 + shortcuts: [{
  141 + text: '最近一周',
  142 + onClick(picker) {
  143 + const end = new Date();
  144 + const start = new Date();
  145 + start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
  146 + picker.$emit('pick', [start, end]);
  147 + }
  148 + }, {
  149 + text: '最近一个月',
  150 + onClick(picker) {
  151 + const end = new Date();
  152 + const start = new Date();
  153 + start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
  154 + picker.$emit('pick', [start, end]);
  155 + }
  156 + }, {
  157 + text: '最近三个月',
  158 + onClick(picker) {
  159 + const end = new Date();
  160 + const start = new Date();
  161 + start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
  162 + picker.$emit('pick', [start, end]);
  163 + }
  164 + }]
  165 + },
  166 + // 存储从后端获取的客户数据
  167 + customerList: [],
  168 + value2:[],
  169 + }
  170 + },
  171 + mounted() {
  172 + this.getCustomerList();
  173 + this.getList();
  174 + },
  175 + methods: {
  176 + // 查询上传文件信息列表
  177 + getList(){
  178 + if (this.value2 !== null && this.value2 !== ''){
  179 + this.queryInfo.startTime = this.value2[0];
  180 + this.queryInfo.endTime = this.value2[1];
  181 + }
  182 + selectFilePage(this.queryInfo).then((response) => {
  183 + const res = response.data;
  184 + const code = res.code;
  185 + const data = res.data;
  186 + if (code !== '200'){
  187 + return this.$message.error("获取文件列表失败");
  188 + }
  189 + this.tableData = data.list;
  190 + this.total = data.total;
  191 + this.$message.success("获取文件列表成功");
  192 + this.queryInfo.startTime = '';
  193 + this.queryInfo.endTime = '';
  194 + }).catch(error => {
  195 + this.$message.error(error.toString());
  196 + })
  197 + },
  198 + // 获取客户配置列表选项
  199 + getCustomerList(){
  200 + selectAll().then((response) =>{
  201 + const res = response.data;
  202 + const code = res.code;
  203 + if (code !== '200'){
  204 + return this.$message.error("客户信息获取失败");
  205 + }
  206 + this.customerList = res.data;
  207 + }
  208 + ).catch(error => {
  209 + this.$message.error(error.toString())
  210 + })
  211 + },
  212 + //导入订单excel
  213 + beforeUpload(file) {
  214 + // 检查文件类型
  215 + const isExcel = file.type === 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' || file.type === 'application/vnd.ms-excel';
  216 + const fileMaxSize = 10 * 1024 * 1024;
  217 + if (!isExcel) {
  218 + this.$message.error('上传文件只能是 Excel 格式!');
  219 + return false; // 取消文件上传
  220 + }
  221 + // 检查文件大小
  222 + const isLtMaxSize = file.size / 1024 / 1024 < fileMaxSize;
  223 + if (!isLtMaxSize) {
  224 + this.$message.error(`上传文件大小不能超过 ${fileMaxSize / (1024 * 1024)} MB!`);
  225 + return false; // 取消文件上传
  226 + }
  227 + return true; // 允许上传
  228 + },
  229 + // 下载订单模板文件
  230 + downloadOrderTemplate(){
  231 + const fileUrl = '../../static/出口订单导入模板.xlsx';
  232 + // 创建隐藏的<a>元素
  233 + const link = document.createElement('a');
  234 + link.href = fileUrl;
  235 + link.download = '出口订单导入模板.xlsx'; // 设置下载的文件名
  236 + // 将<a>元素添加到DOM中
  237 + document.body.appendChild(link);
  238 + // 触发点击事件
  239 + link.click();
  240 + // 移除<a>元素
  241 + document.body.removeChild(link);
  242 + },
  243 + // 导入订单文件到minio
  244 + orderImport({file, onSuccess, onError}){
  245 + const formData = new FormData();
  246 + formData.append('file', file);
  247 + importExcelToMinio(formData).then((response) => {
  248 + const res = response.data;
  249 + const code = res.code;
  250 + const msg = res.msg;
  251 + if (code !== '200'){
  252 + return this.$message.error(msg);
  253 + }
  254 + this.$message.success(msg);
  255 + this.getList();
  256 + onSuccess(res);
  257 + }).catch(error => {
  258 + this.$message.error(error.toString());
  259 + onError(error);
  260 + })
  261 + },
  262 + //分页
  263 + handleSizeChange(val) {
  264 + this.queryInfo.pageSize=val;
  265 + this.getList();
  266 + },
  267 + //分页
  268 + handleCurrentChange(val) {
  269 + this.queryInfo.pageNum=val;
  270 + this.getList();
  271 + },
  272 + }
  273 + }
  274 +</script>
@@ -2168,7 +2168,7 @@ Handling Information @@ -2168,7 +2168,7 @@ Handling Information
2168 quantity_density:'', 2168 quantity_density:'',
2169 quantity_picecs:'', 2169 quantity_picecs:'',
2170 //体积 2170 //体积
2171 - quantity_volume:'0', 2171 + quantity_volume:'0.0',
2172 quantity_volume_code:'MC', 2172 quantity_volume_code:'MC',
2173 quantity_weight:'', 2173 quantity_weight:'',
2174 quantity_weight_code:'K', 2174 quantity_weight_code:'K',
@@ -2987,7 +2987,7 @@ Handling Information @@ -2987,7 +2987,7 @@ Handling Information
2987 if (totalVolume>0){ 2987 if (totalVolume>0){
2988 totalVolume = Math.floor(totalVolume * 100) / 100; 2988 totalVolume = Math.floor(totalVolume * 100) / 100;
2989 } 2989 }
2990 - 2990 + this.form.bill.quantity_volume=totalVolume;
2991 return { 2991 return {
2992 converted: output.trim(), 2992 converted: output.trim(),
2993 totalVolume: totalVolume 2993 totalVolume: totalVolume
@@ -3110,7 +3110,7 @@ Handling Information @@ -3110,7 +3110,7 @@ Handling Information
3110 this.form.cer.cer_signature=this.fileContent.O34; 3110 this.form.cer.cer_signature=this.fileContent.O34;
3111 this.form.isu.isu_signature=this.fileContent.AF38; 3111 this.form.isu.isu_signature=this.fileContent.AF38;
3112 this.dimension_textarea=this.fileContent.AF23; 3112 this.dimension_textarea=this.fileContent.AF23;
3113 - this.convertAndCalculateVolume(); 3113 + //this.convertAndCalculateVolume();
3114 3114
3115 this.form.isu.isu_day_mounth_year=this.formattedDate(); 3115 this.form.isu.isu_day_mounth_year=this.formattedDate();
3116 }else{ 3116 }else{
@@ -3144,7 +3144,7 @@ Handling Information @@ -3144,7 +3144,7 @@ Handling Information
3144 X38: X38, 3144 X38: X38,
3145 AF38: cleanString(AF38), 3145 AF38: cleanString(AF38),
3146 }; 3146 };
3147 - this.convertAndCalculateVolume(); 3147 + //this.convertAndCalculateVolume();
3148 this.form.bill.waybillNum=this.fileContent.AF1; 3148 this.form.bill.waybillNum=this.fileContent.AF1;
3149 this.form.cvd.cvd_currency_code=this.fileContent.S16; 3149 this.form.cvd.cvd_currency_code=this.fileContent.S16;
3150 this.form.rtg.destinationAirport=this.fileContent.A16; 3150 this.form.rtg.destinationAirport=this.fileContent.A16;
@@ -3165,7 +3165,6 @@ Handling Information @@ -3165,7 +3165,6 @@ Handling Information
3165 this.dimension_textarea=this.fileContent.AF23; 3165 this.dimension_textarea=this.fileContent.AF23;
3166 3166
3167 this.form.isu.isu_day_mounth_year=this.formattedDate(); 3167 this.form.isu.isu_day_mounth_year=this.formattedDate();
3168 -  
3169 } 3168 }
3170 3169
3171 } else { 3170 } else {
@@ -3173,6 +3172,7 @@ Handling Information @@ -3173,6 +3172,7 @@ Handling Information
3173 } 3172 }
3174 }; 3173 };
3175 reader.readAsArrayBuffer(files); 3174 reader.readAsArrayBuffer(files);
  3175 + this.convertAndCalculateVolume();
3176 }, 3176 },
3177 formattedDate() { 3177 formattedDate() {
3178 // 格式化日期为 yyyy-MM-dd 3178 // 格式化日期为 yyyy-MM-dd
  1 +<template>
  2 + <div>
  3 + <el-form :inline="true" :model="formInline" class="demo-form-inline">
  4 + <el-form-item label="">
  5 + <div class="block">
  6 + <el-date-picker
  7 + size="medium"
  8 + v-model="value2"
  9 + type="datetimerange"
  10 + :picker-options="pickerOptions"
  11 + value-format="yyyy-MM-dd HH:mm:ss"
  12 + range-separator="至"
  13 + start-placeholder="开始日期"
  14 + end-placeholder="结束日期"
  15 + align="right">
  16 + </el-date-picker>
  17 + </div>
  18 + </el-form-item>
  19 + <el-form-item>
  20 + <el-button type="primary" size="medium" @click="onSubmit">查询</el-button>
  21 + </el-form-item>
  22 + <el-form-item>
  23 + <el-button type="primary" size="medium" @click="exportToExcel">导出</el-button>
  24 + </el-form-item>
  25 + </el-form>
  26 + <div style="margin-bottom: 10px"><span style="color: red">总计: {{ totalItems }} 主单: {{ emptyAwbhCount }} 分单: {{ nonEmptyAwbhCount }}</span></div>
  27 + <div>
  28 + <el-table
  29 + size="medium"
  30 + :data="tableData"
  31 + border
  32 + style="width: 100%">
  33 + <el-table-column
  34 + prop="awba"
  35 + label="主单号"
  36 + width="180">
  37 + </el-table-column>
  38 + <el-table-column
  39 + prop="awbh"
  40 + label="分单号"
  41 + width="180">
  42 + </el-table-column>
  43 + <el-table-column
  44 + prop="billtype"
  45 + label="单证类型">
  46 + </el-table-column>
  47 + <el-table-column
  48 + prop="costs"
  49 + label="应结费用">
  50 + </el-table-column>
  51 + <el-table-column
  52 + prop="flightdate"
  53 + label="航班日期">
  54 + </el-table-column>
  55 + </el-table>
  56 + </div>
  57 + </div>
  58 +</template>
  59 +<script>
  60 + import {
  61 + selectStatistics
  62 + } from '../../api/remote_interface/byont_import';
  63 + import XLSX from 'xlsx';
  64 + import { saveAs } from 'file-saver';
  65 + import moment from 'moment';
  66 + export default {
  67 + data() {
  68 + return {
  69 + pickerOptions: {
  70 + shortcuts: [{
  71 + text: '最近一周',
  72 + onClick(picker) {
  73 + const end = new Date();
  74 + const start = new Date();
  75 + start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
  76 + picker.$emit('pick', [start, end]);
  77 + }
  78 + }, {
  79 + text: '最近一个月',
  80 + onClick(picker) {
  81 + const end = new Date();
  82 + const start = new Date();
  83 + start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
  84 + picker.$emit('pick', [start, end]);
  85 + }
  86 + }, {
  87 + text: '最近三个月',
  88 + onClick(picker) {
  89 + const end = new Date();
  90 + const start = new Date();
  91 + start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
  92 + picker.$emit('pick', [start, end]);
  93 + }
  94 + }]
  95 + },
  96 + value2: '',
  97 + tableData: [],
  98 + query:{
  99 + starttime:'',
  100 + endtime:''
  101 + },
  102 + formInline:{},
  103 + columns: [
  104 + { prop: 'awba', label: '主单号' },
  105 + { prop: 'awbh', label: '分单号' },
  106 + { prop: 'billtype', label: '单证类型' },
  107 + { prop: 'costs', label: '应结费用' },
  108 + { prop: 'flightdate', label: '航班日期' }
  109 + ]
  110 + };
  111 + },
  112 + computed: {
  113 + totalItems() {
  114 + return this.tableData.length;
  115 + },
  116 + emptyAwbhCount() {
  117 + return this.tableData.filter(item => !item.awbh).length;
  118 + },
  119 + nonEmptyAwbhCount() {
  120 + return this.tableData.filter(item => item.awbh).length;
  121 + }
  122 + },
  123 + methods:{
  124 + onSubmit(){
  125 + if(this.value2 !== null && this.value2 !== ""){
  126 + this.query.starttime = this.value2[0];
  127 + this.query.endtime = this.value2[1];
  128 + }else{
  129 + return this.$message.error('请选取时间段！')
  130 + }
  131 + selectStatistics(this.query).then((response) => {
  132 + const res = response.data
  133 + if (res.code !== '200') {
  134 + return this.$message.error('获取消息收发记录，失败！')
  135 + }
  136 + // 获取列表数据
  137 + this.tableData = res.data;
  138 + this.$message.success('获取消息收发记录，成功！');
  139 + }).catch(error => {
  140 + // 关闭加载
  141 + this.$message.error(error.toString())
  142 + })
  143 + },
  144 + exportToExcel() {
  145 + // 创建一个新的工作簿
  146 + const wb = XLSX.utils.book_new();
  147 +
  148 + // 创建一个自定义的头部数组，按照 columns 中的顺序和 label
  149 + const header = this.columns.map(col => col.label);
  150 +
  151 + // 将 tableData 转换成二维数组，并添加到 worksheet 中
  152 + const data = this.tableData.map(row => this.columns.map(col => row[col.prop]));
  153 +
  154 + // 使用 XLSX.utils.aoa_to_sheet 创建工作表，指定头部
  155 + const ws = XLSX.utils.aoa_to_sheet([header, ...data]);
  156 +
  157 + // 添加 worksheet 到 workbook
  158 + XLSX.utils.book_append_sheet(wb, ws, 'Sheet1');
  159 +
  160 + // 生成 Excel 文件并下载
  161 + const wbout = XLSX.write(wb, { bookType: 'xlsx', type: 'array' });
  162 + const blob = new Blob([wbout], { type: 'application/octet-stream' });
  163 +
  164 + // 计算明天的日期
  165 + const tomorrow = moment().add(1, 'days').format('M月D日');
  166 +
  167 + // 使用 file-saver 保存文件，并使用明天的日期作为文件名
  168 + saveAs(blob, `${tomorrow}航班结算统计.xlsx`);
  169 + }
  170 + }
  171 +
  172 + };
  173 +</script>
不能预览此文件类型