Merge remote-tracking branch 'origin/master'

@@ -1287,47 +1287,47 @@
             }
             }
         },
         },
         mounted() {
         mounted() {
-            this.addForm = {
-                        area: '',
-                        feeweight: 22.68,
-                        custel: '',
-                        customer: '',
-                        custcode: 'APX',
-                        goodstype: '运单',
-                        house:'',
-                        ietype:'I',
-                        location:'hx001',
-                        opter:'wuliu',
-                        opttime: '',
-                        pcs: 17,
-                        totalpcs:113,
-                        serialnumber: '',
-                        station: '',
-                        status: '',
-                        licenseplate: '豫A61CR7',
-                        transtype:'销售入库',
-                        goodssize:'120x230x78x17',
-                        goodsvol:36.60,
-                        waybill:'172-12345678',
-                        billfhl:'FILE788',
-                        //随货文件
-                        hasFiles:false,
-                        hasUnusual:false,
-                        unusuals:[],
-                        files:[],
-                        damages:[],
-                        sphCodes:[],
-                        billweight:12.34,
-                        totalweight:2573,
-                        packingid:'PK',
-                        remark:'',
-                        remark1:'备注',
-                        remark2:'',
-                        remark3:'',
-                        remark4:'',
-                        remark5:'',
-                        annex:''
-            }
+            // this.addForm = {
+            //             area: '',
+            //             feeweight: 22.68,
+            //             custel: '',
+            //             customer: '',
+            //             custcode: 'APX',
+            //             goodstype: '运单',
+            //             house:'',
+            //             ietype:'I',
+            //             location:'hx001',
+            //             opter:'wuliu',
+            //             opttime: '',
+            //             pcs: 17,
+            //             totalpcs:113,
+            //             serialnumber: '',
+            //             station: '',
+            //             status: '',
+            //             licenseplate: '豫A61CR7',
+            //             transtype:'销售入库',
+            //             goodssize:'120x230x78x17',
+            //             goodsvol:36.60,
+            //             waybill:'172-12345678',
+            //             billfhl:'FILE788',
+            //             //随货文件
+            //             hasFiles:false,
+            //             hasUnusual:false,
+            //             unusuals:[],
+            //             files:[],
+            //             damages:[],
+            //             sphCodes:[],
+            //             billweight:12.34,
+            //             totalweight:2573,
+            //             packingid:'PK',
+            //             remark:'',
+            //             remark1:'备注',
+            //             remark2:'',
+            //             remark3:'',
+            //             remark4:'',
+            //             remark5:'',
+            //             annex:''
+            // }
 
 
             this.getAreaList();
             this.getAreaList();
             this.getLocationList();
             this.getLocationList();