Merge remote-tracking branch 'origin/dev' into dev

src/views/ecw/order/components/PackHistory.vue

@@ -59,6 +59,12 @@ export default {
         if(this.order && this.orderItemId){
           this.queryParams.orderId = this.order.orderId;
           this.queryParams.orderItemId = this.orderItemId;
+          this.getList()
+        }
+
+    },
+    methods:{
+      getList(){
           orderItemPackLogPage(this.queryParams).then(res => {
             this.packData = []
             this.$nextTick(() => {
@@ -66,12 +72,6 @@ export default {
             })
             this.total = res.data.total;
           })
-        }
-
-    },
-    methods:{
-      getList(){
-
       },
       closeDialog(){
           this.show = false