From 04bd127b957f8bcc73cda153173bca114d1b2161 Mon Sep 17 00:00:00 2001
From: gyq <875626088@qq.com>
Date: Fri, 21 Jun 2024 17:43:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.production                     |  4 ++--
 src/views/invoicing/goods_stoks.vue | 13 ++++++-------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/.env.production b/.env.production
index 3b02e74..ffc2fc2 100644
--- a/.env.production
+++ b/.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
diff --git a/src/views/invoicing/goods_stoks.vue b/src/views/invoicing/goods_stoks.vue
index fcfb2ab..56dfa57 100644
--- a/src/views/invoicing/goods_stoks.vue
+++ b/src/views/invoicing/goods_stoks.vue
@@ -89,7 +89,7 @@ export default {
             query: {
                 name: '',
                 isStock: '',
-                query: ''
+                num: ''
             },
             downloadLoading: false,
             uploadLoading: false,
@@ -103,11 +103,6 @@ export default {
             }
         }
     },
-    filters: {
-        typeEnum(m) {
-            return settings.typeEnum.find(item => item.typeEnum == m).label
-        }
-    },
     mounted() {
         this.getTableData()
     },
@@ -133,7 +128,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;
@@ -162,6 +158,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
@@ -179,6 +176,8 @@ export default {
         // 重置查询
         resetHandle() {
             this.query.name = ''
+            this.query.num = ''
+            this.query.isStock = ''
             this.tableData.page = 0;
             this.getTableData()
         }