22

schangxiang@126.com

2025-05-20 88602280d3b1146f03655dc023918c8104919379

22

 PipeLineLems/pipelinelems_web/src/widgets/CallMaterialOrder/Views/Pages/CallMaterialOrder/CallMaterialOrder.tsx

@@ -14,6 +14,10 @@
import { 
  getWmsEnumData 
} from '@/widgets/CallMaterialOrder/Models/Service/CallMaterialOrderDrawer' 
// 引入公共选项配置  
import {   
  FILTER_MODE_OPTIONS_STRING 
} from '@/components/DyFormForHighQuery/DyFormForHighQueryOptions';  
import { 
  ElInput, 
  ElSelect, 
@@ -69,7 +73,8 @@
    // 新增的查询条件 
    const queryForm = ref({ 
      searchVal: '', 
      str_searchFormInputAttrs:[] 
      str_searchFormInputAttrs:[],
      searchVal_FilterMode:'' 
    }) 
    //定义整体模糊查询的列数组(注意：必须大小写跟后端的实体类属性名一致，否则会导致匹配不对的问题) 
    const _searchFormInputAttrs = ref([ 
@@ -98,14 +103,17 @@
        console.error('获取枚举数据失败:', error) 
      } 
    } 
 
 // 定义响应式查询数据  
 const _curHighQueryData = ref({ searchVal: '',str_searchFormInputAttrs:[],searchVal_FilterMode:'' });   
    // 组件挂载时获取枚举数据 
    onMounted(() => { 
      fetchEnumData() 
      queryForm.value.searchVal_FilterMode = FILTER_MODE_OPTIONS_STRING[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; 
@@ -335,6 +343,21 @@
                /> 
                </el-tooltip> 
              </ElFormItem> 
              <ElFormItem label="" style="width:100px;">  
                   <ElSelect 
                                v-model={queryForm.value.searchVal_FilterMode} 
                                placeholder="请选择" 
                                class={styles.formItem} 
                              > 
                                {FILTER_MODE_OPTIONS_STRING.map((option) => ( 
                                  <ElOption 
                                    key={option.value} 
                                    label={option.label} 
                                    value={option.value} 
                                  /> 
                                ))} 
                              </ElSelect> 
              </ElFormItem>  
              <IconButton type="primary" icon="search" onClick={handleQueryForMain}> 
                查询 
              </IconButton> 

 PipeLineLems/pipelinelems_web/src/widgets/WorkTask/Views/Pages/WorkTask/WorkTask.tsx

@@ -69,12 +69,7 @@
 
    //定义高级查询引用 
   const workTaskQueryDrawerRef=ref(null); 
    // 新增的查询条件 
    const queryForm = ref({ 
      searchVal: '', 
      str_searchFormInputAttrs:[], 
      searchVal_FilterMode:'' 
    }) 
   
    //定义整体模糊查询的列数组(注意：必须大小写跟后端的实体类属性名一致，否则会导致匹配不对的问题) 
    const _searchFormInputAttrs = ref([ 
     'Son_TaskCode','TaskCode','DataIdentifier','MaterialMode','MarkingContent','WeldingHeatInput','PipeAllowableStress','FactoryCode','ProductCode','WorkstationCode','EquipmentCode','ProdLineCode','ShipNumber','ProjectNumber','ProcessName','PipeFittingCode','PreSerialNumber','PipeSpecCode','PipeSectionName','Material','ProcessRouteNumber','TeamInfo','Timestamp','CreatorName','LastModifierName','Remark' 
@@ -111,21 +106,31 @@
      } 
    } 
 
    // 定义响应式查询数据  
    const _curHighQueryData = ref({ searchVal: '',str_searchFormInputAttrs:[],searchVal_FilterMode:'' });   
    
    // 组件挂载时获取枚举数据  
    onMounted(() => {  
      fetchEnumData()  
      queryForm.value.searchVal_FilterMode = FILTER_MODE_OPTIONS_STRING[0]?.value || '';  
      _curHighQueryData.value.searchVal_FilterMode = queryForm.value.searchVal_FilterMode;   
      _curHighQueryData.value.str_searchFormInputAttrs = _searchFormInputAttrs.value;  
      resetQuery();
      //queryForm.value.searchVal_FilterMode = FILTER_MODE_OPTIONS_STRING[0]?.value || '';  
      // _curHighQueryData.value.searchVal_FilterMode = queryForm.value.searchVal_FilterMode;   
      // _curHighQueryData.value.str_searchFormInputAttrs = _searchFormInputAttrs.value;  
    })  
 
    /*******************************************************[高级查询]开始********************************************************************************* */
     // 新增的查询条件 
     const queryForm = ref({ 
      searchVal: '', 
      str_searchFormInputAttrs:[], 
      searchVal_FilterMode:'' 
    }) 
    // 定义响应式查询数据  
    const _curHighQueryData = ref({ searchVal: '',str_searchFormInputAttrs:[],searchVal_FilterMode:'' });   
    // 新版的查询方法（主页面中的按钮【查询】） 
    const handleQueryForMain = async () => { 
      _curHighQueryData.value.searchVal = queryForm.value.searchVal; 
      _curHighQueryData.value.searchVal_FilterMode = queryForm.value.searchVal_FilterMode;  
      _curHighQueryData.value.str_searchFormInputAttrs = _searchFormInputAttrs.value; 
      // _curHighQueryData.value.searchVal = queryForm.value.searchVal; 
      // _curHighQueryData.value.searchVal_FilterMode = queryForm.value.searchVal_FilterMode;  
      // _curHighQueryData.value.str_searchFormInputAttrs = _searchFormInputAttrs.value; 
      //我今天新加的
      setValueForCurHighQueryData();
      tableRef.value.getList(_curHighQueryData.value) 
    } 
    // 新版的查询方法（高级查询中的按钮【查询】） 
@@ -139,6 +144,15 @@
      queryForm.value.searchVal = '' 
      queryForm.value.searchVal_FilterMode = FILTER_MODE_OPTIONS_STRING[0]?.value || ''; 
      queryForm.value.str_searchFormInputAttrs=_searchFormInputAttrs.value; 

      //我今天新加的
      setValueForCurHighQueryData();
    } 
    //给响应式查询数据赋值
    const setValueForCurHighQueryData=()=>{
      _curHighQueryData.value.searchVal = queryForm.value.searchVal; 
      _curHighQueryData.value.searchVal_FilterMode = queryForm.value.searchVal_FilterMode;  
      _curHighQueryData.value.str_searchFormInputAttrs = _searchFormInputAttrs.value; 
    } 
     //新版的导出方法 
     const handleExport=()=>{ 
@@ -147,16 +161,18 @@
    // 新版的查询弹出框关闭方法 
    const closeQuery = (extraParams={}) => { 
      let filteredData = commonGetHighQueryForm(extraParams); 
      console.log("closeQuery方法"); 
      console.log(filteredData); 
      // console.log("closeQuery方法"); 
      // console.log(filteredData); 
      commonSaveCurHighQueryData(filteredData); 
    } 
    //保存查询值 
    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; 
      // _curHighQueryData.value.searchVal = queryForm.value.searchVal 
      // _curHighQueryData.value.searchVal_FilterMode = queryForm.value.searchVal_FilterMode  
      // _curHighQueryData.value.str_searchFormInputAttrs =_searchFormInputAttrs.value; 
       //我今天新加的
       setValueForCurHighQueryData();
    } 
     //获取高级查询弹出框的查询值 
     const commonGetHighQueryForm=(extraParams={})=>{ 
@@ -173,7 +189,7 @@
      filteredData.str_searchFormInputAttrs =_searchFormInputAttrs.value; 
      return filteredData; 
    } 
    
    /*******************************************************[高级查询]结束********************************************************************************* */
 
    /** 
     * @returns 表格