Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-pc

src/views/warehousenew/inventoryCheck.vue

@@ -350,7 +350,7 @@
         this.getList()
     },
       warehousefocus() {
-      getposition({ baseId: this.form.baseId, flag: 1 }).toPromise()
+      getposition({ baseId: this.form.baseId, flag: 0 }).toPromise()
         .then((response) => {
           // row.weightedit=false
           this.options = response