朱兆平 / vue_cli · 提交

转到一个项目

作者 朱兆平
提交 6dcd5550a0c99d49fad9e0681dededb44b73bd0c 1 个父辈 1f43944b

buf-fix 

1. C6的AI批量处理中bug修复.
1.1 修复 批量处理时尺寸数组会包含上一个文件的尺寸信息并合并成处理文件的尺寸列表.
1.2 修复批量处理时,文件特货代码数组累加的问题.
内嵌 并排对比
正在显示 1 个修改的文件 包含 184 行增加 和 5 行删除
@@ -2358,17 +2358,17 @@ Handling Information @@ -2358,17 +2358,17 @@ Handling Information
2358 shp_postcode:'', 2358 shp_postcode:'',
2359 }, 2359 },
2360 ssr:{ 2360 ssr:{
2361 - ssr_request_content:["NO SOLID WOODEN PACKING MATERIALS"], 2361 + ssr_request_content:[""],
2362 }, 2362 },
2363 cer:{ 2363 cer:{
2364 - cer_signature:' DHL GLOBAL' 2364 + cer_signature:''
2365 }, 2365 },
2366 sph:{ 2366 sph:{
2367 sph_code:[] 2367 sph_code:[]
2368 } 2368 }
2369 }, 2369 },
2370 sphCodes: "", 2370 sphCodes: "",
2371 - ssr_content:"NO SOLID WOODEN PACKING MATERIALS", 2371 + ssr_content:"",
2372 cne_contact:{ 2372 cne_contact:{
2373 contact_id:'TE', 2373 contact_id:'TE',
2374 contact_number:'', 2374 contact_number:'',
@@ -3479,6 +3479,8 @@ Handling Information @@ -3479,6 +3479,8 @@ Handling Information
3479 //添加调度记录信息,失败 3479 //添加调度记录信息,失败
3480 if (res.code === '200'){ 3480 if (res.code === '200'){
3481 this.$message.success(res.msg); 3481 this.$message.success(res.msg);
  3482 + // Object.assign(this.$data, this.$options.data());
  3483 + //初始化表单
3482 // 返回成功结果 3484 // 返回成功结果
3483 resolve({ success: true, code: '200' }); 3485 resolve({ success: true, code: '200' });
3484 }else { 3486 }else {
@@ -3524,6 +3526,7 @@ Handling Information @@ -3524,6 +3526,7 @@ Handling Information
3524 3526
3525 for(const [index, item] of fileList.entries()){ 3527 for(const [index, item] of fileList.entries()){
3526 try { 3528 try {
  3529 + this.initialize_Master_Bill_form();
3527 // 更新当前处理文件名 3530 // 更新当前处理文件名
3528 this.uploadProgress.currentFile = `正在处理第 ${index + 1} 个文件: ${item.name}`; 3531 this.uploadProgress.currentFile = `正在处理第 ${index + 1} 个文件: ${item.name}`;
3529 3532
@@ -3547,7 +3550,7 @@ Handling Information @@ -3547,7 +3550,7 @@ Handling Information
3547 this.uploadProgress.percent = Math.round( 3550 this.uploadProgress.percent = Math.round(
3548 (this.uploadProgress.processed / this.uploadProgress.total) * 100 3551 (this.uploadProgress.processed / this.uploadProgress.total) * 100
3549 ); 3552 );
3550 - alert('总进度:'+this.uploadProgress.percent+'/当前已处理:'+this.uploadProgress.processed +"/总文件数量:"+ this.uploadProgress.total) 3553 + _this.$message('总进度:'+this.uploadProgress.percent+'/当前已处理:'+this.uploadProgress.processed +"/总文件数量:"+ this.uploadProgress.total)
3551 } 3554 }
3552 3555
3553 // 清空当前处理文件名 3556 // 清空当前处理文件名
@@ -3562,7 +3565,183 @@ Handling Information @@ -3562,7 +3565,183 @@ Handling Information
3562 const month = String(date.getMonth() + 1).padStart(2, '0'); 3565 const month = String(date.getMonth() + 1).padStart(2, '0');
3563 const day = String(date.getDate()).padStart(2, '0'); 3566 const day = String(date.getDate()).padStart(2, '0');
3564 return `${year}-${month}-${day}`; 3567 return `${year}-${month}-${day}`;
  3568 + },
  3569 + // 重新初始化所有表单变量
  3570 + initialize_Master_Bill_form(){
  3571 + this.dimension_textarea= '';
  3572 + this.form= {
  3573 + acc:[],
  3574 + agt:{
  3575 + agt_ADR:'',
  3576 + agt_IATA_number:'',
  3577 + agt_account_number:'',
  3578 + agt_name:'',
  3579 + agt_participant_id:'',
  3580 + },
  3581 + bill:{
  3582 + destination:'',
  3583 + origin:'CGO',
  3584 + quantity_density:'',
  3585 + quantity_picecs:'',
  3586 + //体积
  3587 + quantity_volume:'0.0',
  3588 + quantity_volume_code:'MC',
  3589 + quantity_weight:'',
  3590 + quantity_weight_code:'K',
  3591 + waybillNum:'',
  3592 + },
  3593 + cne:{
  3594 + cne_contacts:[],
  3595 + cne_account_number:'',
  3596 + cne_adr:'',
  3597 + cne_country:'',
  3598 + cne_loc_place:'',
  3599 + cne_loc_province:'',
  3600 + cne_name:'',
  3601 + cne_postcode:'',
  3602 + },
  3603 + cvd:{
  3604 + cvd_amount_of_insurance:'XXX',
  3605 + cvd_charge_code:'PP',
  3606 + cvd_charge_prepaid:'PP',
  3607 + cvd_currency_code:'',
  3608 + cvd_value_for_carriage:'NVD',
  3609 + cvd_value_for_customs:'NCV',
  3610 + },
  3611 + flt:{
  3612 + cariier:"",
  3613 + day:'',
  3614 + flightNumber:'',
  3615 + cariier2:"",
  3616 + day2:'',
  3617 + flightNumber2:'',
  3618 + cariier3:"",
  3619 + day3:'',
  3620 + flightNumber3:'',
  3621 + },
  3622 + isu:{
  3623 + isu_day_mounth_year:'',
  3624 + isu_place_or_airport_code:'ZHENGZHOU',
  3625 + isu_signature:'CHINA',
  3626 + },
  3627 + nfy:{
  3628 + nfy_contacts:[],
  3629 + nfy_ADR:'',
  3630 + nfy_LOC_city:'',
  3631 + nfy_LOC_province:'',
  3632 + nfy_country:'',
  3633 + nfy_name:'',
  3634 + nfy_postcode:''
  3635 + },
  3636 + oci:[
  3637 + // {
  3638 + // oci_country_code:'',
  3639 + // oci_csrc_id:'',
  3640 + // oci_csrc_info:'',
  3641 + // oci_information_id:''
  3642 + // }
  3643 + ],
  3644 + osi:[{
  3645 + osi_text:[],
  3646 + }],
  3647 + oth:{
  3648 + oth_amount:'',
  3649 + oth_charge_code:'',
  3650 + oth_charges:'',
  3651 + oth_entitlement_code:''
  3652 + },
  3653 + ppd:{
  3654 + ppd_charge_summary_total:'',
  3655 + ppd_other_charges_due_agent:'',
  3656 + ppd_other_charges_due_carrier:'',
  3657 + ppd_taxes_amount:'',
  3658 + ppd_valuation_amount:'',
  3659 + ppd_weight_amount:'',
  3660 + },
  3661 + ref:{
  3662 + ref_address:'CGOFD1E',
  3663 + ref_file_reference:'',
  3664 + ref_participant_airport:'',
  3665 + ref_participant_code:'',
  3666 + ref_participant_id:'',
  3667 + },
  3668 + rtd:
  3669 + {
  3670 + dimensions:[],
  3671 + rtd_charge_weight:'',
  3672 + rtd_combination_point:'',
  3673 + rtd_commodity_NUM:'',
  3674 + rtd_goods_DES:'',
  3675 + rtd_goods_consol_DES:'',
  3676 + rtd_gross_weight:'',
  3677 + rtd_number_pieces:'',
  3678 + rtd_rate_charge:'',
  3679 + rtd_rate_class:'Q',
  3680 + rtd_total:'',
  3681 + //体积
  3682 + rtd_volume:'',
  3683 + rtd_volume_code:'MC',
  3684 + }
  3685 + ,
  3686 + rtg:{
  3687 + destinationAirport:'',
  3688 + destinationCarrier:'',
  3689 + onwardAirport:'',
  3690 + onwardCarrier:'',
  3691 + onwardAirport3:'',
  3692 + onwardCarrier3:'',
  3693 + },
  3694 + shp:{
  3695 + shp_contacts:[],
  3696 + shp_account_number:'',
  3697 + shp_adr:'',
  3698 + shp_country:'',
  3699 + shp_loc_place:'',
  3700 + shp_loc_province:'',
  3701 + shp_name:'',
  3702 + shp_postcode:'',
  3703 + },
  3704 + ssr:{
  3705 + ssr_request_content:[""],
  3706 + },
  3707 + cer:{
  3708 + cer_signature:''
  3709 + },
  3710 + sph:{
  3711 + sph_code:[]
  3712 + }
  3713 + };
  3714 + this.sphCodes="";
  3715 + this.ssr_content="";
  3716 + this.cne_contact={
  3717 + contact_id:'TE',
  3718 + contact_number:'',
  3719 + };
  3720 + this.shp_contact={
  3721 + contact_id:'TE',
  3722 + contact_number:'',
  3723 + };
  3724 + this.nfy_contact={
  3725 + contact_id:'TE',
  3726 + contact_number:''
  3727 + };
  3728 + this.shp_oci={
  3729 + oci_country_code: "",
  3730 + oci_csrc_id: "T",
  3731 + oci_information_id: "SHP",
  3732 + oci_csrc_info: ""
  3733 + };
  3734 + this.cne_oci={
  3735 + oci_country_code: "",
  3736 + oci_csrc_id: "T",
  3737 + oci_information_id: "CNE",
  3738 + oci_csrc_info: ""
  3739 + };
  3740 + this.acc_info={
  3741 + acc_info:'FREIGHT PREPAID',
  3742 + acc_info_id:'GEN',
3565 } 3743 }
  3744 + }
3566 }, 3745 },
3567 activated(){ 3746 activated(){
3568 if(jsutil.checkNull(this.$route.query.id)){ 3747 if(jsutil.checkNull(this.$route.query.id)){
@@ -3647,7 +3826,7 @@ Handling Information @@ -3647,7 +3826,7 @@ Handling Information
3647 this.form.flt.cariier2 = cleanedValue.slice(0, 2); 3826 this.form.flt.cariier2 = cleanedValue.slice(0, 2);
3648 this.form.flt.flightNumber2 = cleanedValue.slice(2); 3827 this.form.flt.flightNumber2 = cleanedValue.slice(2);
3649 } 3828 }
3650 - }, 3829 + }
3651 }, 3830 },
3652 watch:{ 3831 watch:{
3653 ssr_content: { 3832 ssr_content: {