Merge remote-tracking branch 'origin/release/2.0' into release/2.0

@@ -59,7 +59,6 @@
         name: 'TabDone',
         name: 'TabDone',
         data() {
         data() {
             return {
             return {
-                self: this,
                 filters: {},
                 filters: {},
                 page: {},
                 page: {},
                 table: {},
                 table: {},

@@ -53,8 +53,8 @@
             const params = {
             const params = {
                 pageNo: 1,
                 pageNo: 1,
                 pageSize: 20,
                 pageSize: 20,
-                statusList: [2, 3],
-                sellTypes: [7]
+                sellTypes: [7],
+                statusList: [2, 3]
             };
             };
 
 
             this.page = store.page;
             this.page = store.page;
@@ -97,13 +97,14 @@
                 const data = {
                 const data = {
                     pageNo: 1,
                     pageNo: 1,
                     pageSize: 20,
                     pageSize: 20,
+                    sellTypes: [7],
                     statusList: [2, 3]
                     statusList: [2, 3]
                 };
                 };
                 const mapKeys = {
                 const mapKeys = {
-                    expressNumber: 'expressNo',
                     skn: 'prodCode',
                     skn: 'prodCode',
-                    skuFactoryCode: 'prodBarCode',
-                    proReqFormId: 'orderNo'
+                    proReqFormId: 'orderNo',
+                    expressNumber: 'expressNo',
+                    skuFactoryCode: 'prodBarCode'
                 };
                 };
 
 
                 if (!this.useFilter) {
                 if (!this.useFilter) {