Merge branch 'master' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into dwb

src/views/invoicing/goods_stoks.vue

@@ -95,7 +95,7 @@ export default {
             query: {
                 name: '',
                 isStock: '',
-                query: ''
+                num: ''
             },
             downloadLoading: false,
             uploadLoading: false,
@@ -109,11 +109,6 @@ export default {
             }
         }
     },
-    filters: {
-        typeEnum(m) {
-            return settings.typeEnum.find(item => item.typeEnum == m).label
-        }
-    },
     mounted() {
         this.getTableData()
     },
@@ -139,7 +134,8 @@ export default {
                 this.downloadLoading = true;
                 const file = await stockdownload({
                     name: this.query.name,
-                    isStock: this.query.isStock
+                    isStock: this.query.isStock,
+                    num: this.query.num
                 })
                 downloadFile(file, "商品库存", "xlsx");
                 this.downloadLoading = false;
@@ -168,6 +164,7 @@ export default {
                     size: this.tableData.size,
                     name: this.query.name,
                     isStock: this.query.isStock,
+                    num: this.query.num,
                     shopId: localStorage.getItem('shopId')
                 })
                 this.tableData.loading = false
@@ -185,6 +182,8 @@ export default {
         // 重置查询
         resetHandle() {
             this.query.name = ''
+            this.query.num = ''
+            this.query.isStock = ''
             this.tableData.page = 0;
             this.getTableData()
         }