Merge remote-tracking branch 'origin/dev1.6' into dev1.6

src/views/ecw/order/warehousing/components/Warehouse.vue

@@ -518,7 +518,8 @@ export default {
         prodTitleZh: undefined,
         prodType: undefined,
         type: undefined,
-        feeType: undefined
+        feeType: undefined,
+        recordMode: undefined
       },
       form1: {
         table: [],
@@ -535,7 +536,8 @@ export default {
         prodTitleZh: undefined,
         prodType: undefined,
         type: 1,
-        feeType: undefined
+        feeType: undefined,
+        recordMode: undefined
       },
       brandList: [],
       formRules: {
@@ -768,7 +770,6 @@ export default {
           hasCartonsNum += e.cartonsNum
         })
         cartonsNum = this.warehousing.num - hasCartonsNum
-
       }
 
       const form = val === 1 ? this.form1 : this.form