分单BUG修复：

主单取舍问题；
分单付费方式取舍问题

@@ -2554,7 +2554,7 @@ export default {
           cvd_value_for_carriage:'NVD',
           cvd_value_for_carriage:'NVD',
           cvd_value_for_customs:'NCV',
           cvd_value_for_customs:'NCV',
           cvd_amount_of_insurance:'XXX',
           cvd_amount_of_insurance:'XXX',
-          cvd_charge_prepaid:'CC',
+          cvd_charge_prepaid:'PP',
           cvd_charge_code:'',
           cvd_charge_code:'',
           cvd_currency_code:'CNY',
           cvd_currency_code:'CNY',
         },
         },
@@ -2633,6 +2633,8 @@ export default {
         const worksheetName = workbook.SheetNames[0];
         const worksheetName = workbook.SheetNames[0];
         const worksheet = workbook.Sheets[worksheetName];
         const worksheet = workbook.Sheets[worksheetName];
         if (worksheet) {
         if (worksheet) {
+          const A1 = (worksheet['A1'] && worksheet['A1'].v) || '';
+          const D1 = (worksheet['D1'] && worksheet['D1'].v) || '';
           const AF1 = (worksheet['AF1'] && worksheet['AF1'].v) || '';
           const AF1 = (worksheet['AF1'] && worksheet['AF1'].v) || '';
           const A16 = (worksheet['A16'] && worksheet['A16'].v) || '';
           const A16 = (worksheet['A16'] && worksheet['A16'].v) || '';
           const C16 = (worksheet['C16'] && worksheet['C16'].v) || '';
           const C16 = (worksheet['C16'] && worksheet['C16'].v) || '';
@@ -2642,16 +2644,18 @@ export default {
           const A22 = (worksheet['A22'] && worksheet['A22'].v) || '';
           const A22 = (worksheet['A22'] && worksheet['A22'].v) || '';
           const C22 = (worksheet['C22'] && worksheet['C22'].v) || '';
           const C22 = (worksheet['C22'] && worksheet['C22'].v) || '';
           const AE22 = (worksheet['AE22'] && worksheet['AE22'].v) || '';
           const AE22 = (worksheet['AE22'] && worksheet['AE22'].v) || '';
+          const Z16 = (worksheet['Z16'] && worksheet['Z16'].v) || '';
           const A3_ShipInfo = (worksheet['A3'] && worksheet['A3'].v) || '';
           const A3_ShipInfo = (worksheet['A3'] && worksheet['A3'].v) || '';
           const A7_CNEInfo = (worksheet['A7'] && worksheet['A7'].v) || '';
           const A7_CNEInfo = (worksheet['A7'] && worksheet['A7'].v) || '';
 
 
-          this.addForm.fhl.waybillNum = AF1;
+          this.addForm.fhl.waybillNum = A1+"-"+D1;;
           this.addForm.hbs.hbs_serial_number = AF1;
           this.addForm.hbs.hbs_serial_number = AF1;
           if (AF1) {
           if (AF1) {
             this.blur();
             this.blur();
           }
           }
           this.addForm.hbs.hbs_origin = A16;
           this.addForm.hbs.hbs_origin = A16;
           this.addForm.cvd.cvd_currency_code = S16;
           this.addForm.cvd.cvd_currency_code = S16;
+          this.addForm.cvd.cvd_charge_prepaid= Z16;
           this.addForm.hbs.hbs_destination = K16;
           this.addForm.hbs.hbs_destination = K16;
           this.addForm.hbs.hbs_pieces = A22;
           this.addForm.hbs.hbs_pieces = A22;
           this.addForm.hbs.hbs_weight = parseFloat(C22).toFixed(2);
           this.addForm.hbs.hbs_weight = parseFloat(C22).toFixed(2);
@@ -2733,6 +2737,8 @@ export default {
             const worksheetName = workbook.SheetNames[0];
             const worksheetName = workbook.SheetNames[0];
             const worksheet = workbook.Sheets[worksheetName];
             const worksheet = workbook.Sheets[worksheetName];
             if (worksheet) {
             if (worksheet) {
+              const A1 = (worksheet['A1'] && worksheet['A1'].v) || '';
+              const D1 = (worksheet['D1'] && worksheet['D1'].v) || '';
               const AF1 = (worksheet['AF1'] && worksheet['AF1'].v) || '';
               const AF1 = (worksheet['AF1'] && worksheet['AF1'].v) || '';
               const A16 = (worksheet['A16'] && worksheet['A16'].v) || '';
               const A16 = (worksheet['A16'] && worksheet['A16'].v) || '';
               const S16 = (worksheet['S16'] && worksheet['S16'].v) || '';
               const S16 = (worksheet['S16'] && worksheet['S16'].v) || '';
@@ -2740,16 +2746,18 @@ export default {
               const A22 = (worksheet['A22'] && worksheet['A22'].v) || '';
               const A22 = (worksheet['A22'] && worksheet['A22'].v) || '';
               const C22 = (worksheet['C22'] && worksheet['C22'].v) || '';
               const C22 = (worksheet['C22'] && worksheet['C22'].v) || '';
               const AE22 = (worksheet['AE22'] && worksheet['AE22'].v) || '';
               const AE22 = (worksheet['AE22'] && worksheet['AE22'].v) || '';
+              const Z16 = (worksheet['Z16'] && worksheet['Z16'].v) || '';
               const A3_ShipInfo = (worksheet['A3'] && worksheet['A3'].v) || '';
               const A3_ShipInfo = (worksheet['A3'] && worksheet['A3'].v) || '';
               const A7_CNEInfo = (worksheet['A7'] && worksheet['A7'].v) || '';
               const A7_CNEInfo = (worksheet['A7'] && worksheet['A7'].v) || '';
 
 
-              this.addForm.fhl.waybillNum = AF1;
+              this.addForm.fhl.waybillNum =A1+"-"+D1;
               this.addForm.hbs.hbs_serial_number = AF1;
               this.addForm.hbs.hbs_serial_number = AF1;
               if (AF1) {
               if (AF1) {
                 this.blur();
                 this.blur();
               }
               }
               this.addForm.hbs.hbs_origin = A16;
               this.addForm.hbs.hbs_origin = A16;
               this.addForm.cvd.cvd_currency_code = S16;
               this.addForm.cvd.cvd_currency_code = S16;
+              this.addForm.cvd.cvd_charge_prepaid = Z16;
               this.addForm.hbs.hbs_destination = K16;
               this.addForm.hbs.hbs_destination = K16;
               this.addForm.hbs.hbs_pieces = A22;
               this.addForm.hbs.hbs_pieces = A22;
               this.addForm.hbs.hbs_weight = parseFloat(C22).toFixed(2);
               this.addForm.hbs.hbs_weight = parseFloat(C22).toFixed(2);
@@ -2904,7 +2912,7 @@ export default {
           quantity_weight: '',
           quantity_weight: '',
           quantity_picecs: '',
           quantity_picecs: '',
           origin: '',
           origin: '',
-          destination: '',
+          destination: ''
         },
         },
         shp: {
         shp: {
           shp_detail_identifier: 'TE',
           shp_detail_identifier: 'TE',
@@ -2931,7 +2939,7 @@ export default {
           cvd_value_for_carriage: 'NVD',
           cvd_value_for_carriage: 'NVD',
           cvd_value_for_customs: 'NCV',
           cvd_value_for_customs: 'NCV',
           cvd_amount_of_insurance: 'XXX',
           cvd_amount_of_insurance: 'XXX',
-          cvd_charge_prepaid: 'CC',
+          cvd_charge_prepaid: 'PP',
           cvd_charge_code: '',
           cvd_charge_code: '',
           cvd_currency_code: 'CNY',
           cvd_currency_code: 'CNY',
         },
         },