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

src/views/basic/UdiInfoManage.vue

@@ -959,7 +959,6 @@ export default {
 
         handleDetail(row) {
             this.editQuery = row;
-            console.log(row);
         },
         selectVersion() {
             this.selectVersionVisible = true;
@@ -1125,7 +1124,6 @@ export default {
             this.relId = val.id;
             this.isImportUdi = true;
             this.thisData = val;
-            console.log("-----" + this.uuid + "-2222--" + this.relId);
             this.selectLocalVisible = true;
         },
 
@@ -1137,7 +1135,6 @@ export default {
 
 
         handleSelectionChange(val) {
-            console.log("----" + val);
             this.multipleSelection = val;
         },
 
@@ -1170,7 +1167,6 @@ export default {
                 page: 1,
                 limit: 10,
             };
-            console.log("this.editQuery.isUseDy = " + this.editQuery.isUseDy);
 
             this.getDetailList(ttquery);
             this.getThirdSysDetail();

src/views/inventory/InvProducts.vue

@@ -265,6 +265,7 @@ export default {
     },
     getList() {
       this.loading = true;
+      this.filterQuery.page = 1;
       this.filterQuery.customerId = store.getters.customerId;
       filterProducts(this.filterQuery)
           .then((response) => {