From a7f7503897205cb0e67964a4f602276dfb3befcd Mon Sep 17 00:00:00 2001
From: zzyuan <781948537@qq.com>
Date: Thu, 10 Jul 2025 16:14:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=9D=A1=E4=BB=B6=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/foodManage/stockManage/totalStock/index.vue  | 7 +++----
 src/views/foodManage/stockManage/warehouseIn/index.vue | 6 ++----
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/views/foodManage/stockManage/totalStock/index.vue b/src/views/foodManage/stockManage/totalStock/index.vue
index 55c918a8..914e75ae 100644
--- a/src/views/foodManage/stockManage/totalStock/index.vue
+++ b/src/views/foodManage/stockManage/totalStock/index.vue
@@ -39,14 +39,14 @@
                 style="width: 240px" 
             />
         </el-form-item> 
-        <el-form-item label="条码" prop="barCode">
+        <!-- <el-form-item label="条码" prop="barCode">
             <el-input 
                 v-model="queryParams.barCode"
                 placeholder="请输入条码"
                 clearable maxlength="30"
                 style="width: 240px" 
             />
-        </el-form-item> 
+        </el-form-item>  -->
               
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -227,8 +227,7 @@ export default {
             "areaId": this.queryParams.areaId,
             "warehouseId": this.queryParams.warehouseId,  
             "materialTypeIds": this.queryParams.materialTypeIds,  
-            "materialName": this.queryParams.materialName,  
-            "barCode": this.queryParams.barCode,  
+            "materialName": this.queryParams.materialName
           }
           getStockMaterialListApi(param).then(response => {
               this.tableListData = response.rows;
diff --git a/src/views/foodManage/stockManage/warehouseIn/index.vue b/src/views/foodManage/stockManage/warehouseIn/index.vue
index 7eb37517..97fa90bb 100644
--- a/src/views/foodManage/stockManage/warehouseIn/index.vue
+++ b/src/views/foodManage/stockManage/warehouseIn/index.vue
@@ -285,11 +285,9 @@ export default {
                 "pageSize": this.queryParams.pageSize,  
                 "intoCode": this.queryParams.intoCode,     
                 "areaId": this.queryParams.areaId,  
-                "canteenId": this.queryParams.canteenId,  
-                "stallId": this.queryParams.stallId,  
+                "warehouseId": this.queryParams.warehouseId,   
                 "status": this.queryParams.status,  
-                "supplierConfirmStatus": this.queryParams.supplierConfirmStatus,  
-                // "intoType": this.queryParams.intoType
+                "intoType": this.queryParams.intoType
             }
             if(this.dateRange&&this.dateRange.length>0){
                 param.startDateTime=this.formatDateTime(this.dateRange[0])