From 8d1e157bd290ec8fa637d02f08959bd363c8d4a3 Mon Sep 17 00:00:00 2001
From: zzyuan <781948537@qq.com>
Date: Fri, 11 Jul 2025 10:27:40 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=86=E6=96=99=E5=8D=95=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pickManage/materialPicking/index.vue      | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/views/foodManage/pickManage/materialPicking/index.vue b/src/views/foodManage/pickManage/materialPicking/index.vue
index 03876ab2..712a5857 100644
--- a/src/views/foodManage/pickManage/materialPicking/index.vue
+++ b/src/views/foodManage/pickManage/materialPicking/index.vue
@@ -15,8 +15,8 @@
                 :picker-options="pickerOptions" >
             </el-date-picker>
         </el-form-item> 
-        <el-form-item label="关键字" prop="searchValue">
-            <el-input v-model="queryParams.searchValue" placeholder="请输入领料单号,标题" maxlength="20" clearable style="width: 240px"/>
+        <el-form-item label="关键字" prop="fetchMaterialId">
+            <el-input v-model="queryParams.fetchMaterialId" placeholder="请输入领料单号,标题" maxlength="20" clearable style="width: 240px"/>
         </el-form-item>
         <el-form-item label="提交状态" prop="commitStatus"> 
             <el-select v-model="queryParams.commitStatus" placeholder="请选择提交状态" style="width: 240px;">
@@ -301,6 +301,7 @@ export default {
             let param = {
                 "pageNum": this.queryParams.pageNum, 
                 "pageSize": this.queryParams.pageSize,  
+                "fetchMaterialId": this.queryParams.fetchMaterialId,  
                 "fetchMaterialCode": this.queryParams.fetchMaterialCode,     
                 "areaId": this.queryParams.areaId,  
                 "canteenId": this.queryParams.canteenId,  
@@ -308,13 +309,13 @@ export default {
                 "commitStatus": this.queryParams.commitStatus,   
                 // "approveStatus": this.queryParams.approveStatus
             }
-            // if(this.dateRange&&this.dateRange.length>0){
-            //     param.startTime=this.formatDate(this.dateRange[0])
-            //     param.endTime=this.formatDate(this.dateRange[1])
-            // }else{
-            //     param.startTime=undefined;
-            //     param.endTime=undefined;
-            // } 
+            if(this.dateRange&&this.dateRange.length>0){
+                param.startTime=this.formatDate(this.dateRange[0])
+                param.endTime=this.formatDate(this.dateRange[1])
+            }else{
+                param.startTime=undefined;
+                param.endTime=undefined;
+            } 
             fetchMaterialPageApi(param).then(response => {
                 this.tableListData = response.rows;
                 this.total = Number(response.total);