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

.env.production

@@ -2,8 +2,8 @@ ENV = 'production'
 
 # 如果使用 Nginx 代理后端接口，那么此处需要改为 '/'，文件查看 Docker 部署篇，Nginx 配置
 # 接口地址，注意协议，如果你没有配置 ssl，需要将 https 改为 http
-# VUE_APP_BASE_API  = 'https://cashieradmin.sxczgkj.cn'
-VUE_APP_BASE_API  = 'https://admintestpapi.sxczgkj.cn'
+VUE_APP_BASE_API  = 'https://cashieradmin.sxczgkj.cn'
+# VUE_APP_BASE_API  = 'https://admintestpapi.sxczgkj.cn'
 # VUE_APP_BASE_API  = 'http://192.168.2.98:8000'
 # 如果接口是 http 形式， wss 需要改为 ws
 VUE_APP_WS_API = 'wss://123.56.110.252

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()
         }