From 5a149d626ae8bc3fa4bddbb53f8caf40f51f6da6 Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周三, 04 6月 2025 17:42:13 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo

---
 PipeLineLems/pipelinelems_web/src/widgets/CallMaterialOrderRecord/Views/Pages/CallMaterialOrderRecord/CallMaterialOrderRecord.tsx |   46 ++++++++++++++++++++++++++++++++++++----------
 1 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/PipeLineLems/pipelinelems_web/src/widgets/CallMaterialOrderRecord/Views/Pages/CallMaterialOrderRecord/CallMaterialOrderRecord.tsx b/PipeLineLems/pipelinelems_web/src/widgets/CallMaterialOrderRecord/Views/Pages/CallMaterialOrderRecord/CallMaterialOrderRecord.tsx
index 540bcd8..42e4ad1 100644
--- a/PipeLineLems/pipelinelems_web/src/widgets/CallMaterialOrderRecord/Views/Pages/CallMaterialOrderRecord/CallMaterialOrderRecord.tsx
+++ b/PipeLineLems/pipelinelems_web/src/widgets/CallMaterialOrderRecord/Views/Pages/CallMaterialOrderRecord/CallMaterialOrderRecord.tsx
@@ -23,6 +23,10 @@
   ElFormItem, 
 } from 'element-plus' 
 import { injectModel } from '@/libs/Provider/Provider' 
+// 寮曞叆鍏叡閫夐」閰嶇疆  
+import {   
+  FILTER_MODE_OPTIONS_STRING_KEY 
+} from '@/components/DyFormForHighQuery/DyFormForHighQueryOptions';  
  
 interface RenderTableType { 
   url?: string 
@@ -68,13 +72,14 @@
     // 鏂板鐨勬煡璇㈡潯浠� 
     const queryForm = ref({ 
       searchVal: '', 
-      str_searchFormInputAttrs:[] 
+      str_searchFormInputAttrs:[], 
+      searchVal_FilterMode:'' 
     }) 
     //瀹氫箟鏁翠綋妯＄硦鏌ヨ鐨勫垪鏁扮粍(娉ㄦ剰锛氬繀椤诲ぇ灏忓啓璺熷悗绔殑瀹炰綋绫诲睘鎬у悕涓�鑷达紝鍚﹀垯浼氬鑷村尮閰嶄笉瀵圭殑闂) 
     const _searchFormInputAttrs = ref([ 
-     'DataIdentifier','MaterialMode','WmsRetResult','WmsTaskNo','CreatorName','Remark' 
+     'DataIdentifier','MaterialMode','MaterialBatch','WmsRetResult','WmsTaskNo','CreatorName','Remark' 
     ]); 
-    const searchFormInputAttrs_Placeholder = ref('璇疯緭鍏ュ師鏂欐爣璇�/鍘熸枡鍨嬪彿/WMS杩斿洖缁撴灉/WMS浠诲姟鍙�/鍒涘缓浜�/澶囨敞'); 
+    const searchFormInputAttrs_Placeholder = ref('璇疯緭鍏ュ師鏂欐爣璇�/鍘熸枡鍨嬪彿/鍘熸枡鎵规/WMS杩斿洖缁撴灉/WMS浠诲姟鍙�/鍒涘缓浜�/澶囨敞'); 
      
  
     // 鍔ㄦ�佹灇涓鹃�夐」 
@@ -98,16 +103,20 @@
       } 
     } 
  
-    // 缁勪欢鎸傝浇鏃惰幏鍙栨灇涓炬暟鎹� 
-    onMounted(() => { 
-      fetchEnumData() 
-    }) 
+    // 瀹氫箟鍝嶅簲寮忔煡璇㈡暟鎹�  
+    const _curHighQueryData = ref({ searchVal: '',str_searchFormInputAttrs:[],searchVal_FilterMode:'' });   
+    // 缁勪欢鎸傝浇鏃惰幏鍙栨灇涓炬暟鎹�  
+    onMounted(() => {  
+      fetchEnumData()  
+      queryForm.value.searchVal_FilterMode = FILTER_MODE_OPTIONS_STRING_KEY[0]?.value || '';  
+      _curHighQueryData.value.searchVal_FilterMode = queryForm.value.searchVal_FilterMode;   
+      _curHighQueryData.value.str_searchFormInputAttrs = _searchFormInputAttrs.value;  
+    })  
  
-    // 瀹氫箟鍝嶅簲寮忔煡璇㈡暟鎹� 
-    const _curHighQueryData = ref({ searchVal: '',str_searchFormInputAttrs:[] }); 
     // 鏂扮増鐨勬煡璇㈡柟娉曪紙涓婚〉闈腑鐨勬寜閽�愭煡璇€�戯級 
     const handleQueryForMain = async () => { 
       _curHighQueryData.value.searchVal = queryForm.value.searchVal; 
+      _curHighQueryData.value.searchVal_FilterMode = queryForm.value.searchVal_FilterMode;  
       _curHighQueryData.value.str_searchFormInputAttrs = _searchFormInputAttrs.value; 
       tableRef.value.getList(_curHighQueryData.value) 
     } 
@@ -120,6 +129,7 @@
     // 鏂扮増鐨勬煡璇㈤噸缃� 
     const resetQuery = () => { 
       queryForm.value.searchVal = '' 
+      queryForm.value.searchVal_FilterMode = FILTER_MODE_OPTIONS_STRING_KEY[0]?.value || ''; 
       queryForm.value.str_searchFormInputAttrs=_searchFormInputAttrs.value; 
     } 
      //鏂扮増鐨勫鍑烘柟娉� 
@@ -137,6 +147,7 @@
     const commonSaveCurHighQueryData=(filteredData={})=>{ 
       _curHighQueryData.value = { ..._curHighQueryData.value, ...filteredData }; 
       _curHighQueryData.value.searchVal = queryForm.value.searchVal 
+      _curHighQueryData.value.searchVal_FilterMode = queryForm.value.searchVal_FilterMode  
       _curHighQueryData.value.str_searchFormInputAttrs =_searchFormInputAttrs.value; 
     } 
      //鑾峰彇楂樼骇鏌ヨ寮瑰嚭妗嗙殑鏌ヨ鍊� 
@@ -150,6 +161,7 @@
       ) 
       //缁勫悎妯＄硦鏌ヨ 
       filteredData.searchVal = queryForm.value.searchVal 
+      filteredData.searchVal_FilterMode = queryForm.value.searchVal_FilterMode  
       filteredData.str_searchFormInputAttrs =_searchFormInputAttrs.value; 
       return filteredData; 
     } 
@@ -281,7 +293,6 @@
               </IconButton> 
               <el-divider direction="vertical" /> 
  
-              <el-divider direction="vertical" /> 
               <el-upload 
                 v-permission="callMaterialOrderRecord-import" 
                 name="file" 
@@ -320,6 +331,21 @@
                 /> 
                 </el-tooltip> 
               </ElFormItem> 
+              <ElFormItem label="" style="width:100px;">  
+                   <ElSelect 
+                                v-model={queryForm.value.searchVal_FilterMode} 
+                                placeholder="璇烽�夋嫨" 
+                                class={styles.formItem} 
+                              > 
+                                {FILTER_MODE_OPTIONS_STRING_KEY.map((option) => ( 
+                                  <ElOption 
+                                    key={option.value} 
+                                    label={option.label} 
+                                    value={option.value} 
+                                  /> 
+                                ))} 
+                              </ElSelect> 
+              </ElFormItem>  
               <IconButton type="primary" icon="search" onClick={handleQueryForMain}> 
                 鏌ヨ 
               </IconButton> 

--
Gitblit v1.9.3