222

schangxiang@126.com

2025-05-20 a2cb4ebc089b890318f335fadcd8b48aa3ef60cd

222

 PipeLineLems/pipelinelems_web/src/utils/myHighQueryUtils.ts

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,42 @@

//高级查询工具文件

 //保存查询值 
 export const commonSaveCurHighQueryData=(filteredData,_curHighQueryData,queryForm,_searchFormInputAttrs)=>{ 
  _curHighQueryData.value = { ..._curHighQueryData.value, ...filteredData }; 
  setValueForCurHighQueryData(_curHighQueryData,queryForm,_searchFormInputAttrs); 
} 
    //给响应式查询数据赋值 
export const setValueForCurHighQueryData=(_curHighQueryData,queryForm,_searchFormInputAttrs)=>{ 
      _curHighQueryData.value.searchVal = queryForm.value.searchVal;  
      _curHighQueryData.value.searchVal_FilterMode = queryForm.value.searchVal_FilterMode;   
      _curHighQueryData.value.str_searchFormInputAttrs = _searchFormInputAttrs.value;  
    }
        //初始化 queryForm
export const initQueryForm=(queryForm,_searchFormInputAttrs,arr)=>{ 
  queryForm.value.searchVal = '' 
        queryForm.value.searchVal_FilterMode = arr[0]?.value || ''; 
        queryForm.value.str_searchFormInputAttrs=_searchFormInputAttrs.value; 
}
    //获取高级查询弹出框的查询值 
    export   const commonGetHighQueryForm=(extraParams,queryForm,_searchFormInputAttrs)=>{ 
      // è¿‡æ»¤æŽ‰ undefined çš„值 
      let filteredData = Object.assign( 
        {}, 
        ...Object.entries(extraParams).map(([key, value]) => 
          value !== undefined ? { [key]: value } : {} 
        ) 
      ) 
      //组合模糊查询 
      filteredData.searchVal = queryForm.value.searchVal 
      filteredData.searchVal_FilterMode = queryForm.value.searchVal_FilterMode  
      filteredData.str_searchFormInputAttrs =_searchFormInputAttrs.value; 
      return filteredData; 
    }  

    // æ–°ç‰ˆçš„查询弹出框关闭方法 
    export   const GetFilteredData = (extraParams,queryForm,_searchFormInputAttrs,_curHighQueryData) => { 
      let filteredData = commonGetHighQueryForm(extraParams,queryForm,_searchFormInputAttrs); 
      commonSaveCurHighQueryData(filteredData,_curHighQueryData,queryForm,_searchFormInputAttrs); 
      return filteredData;
    } 

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

@@ -27,6 +27,8 @@
import {   
  FILTER_MODE_OPTIONS_STRING 
} from '@/components/DyFormForHighQuery/DyFormForHighQueryOptions';  
// å¼•å…¥å…¬å…±é«˜çº§æŸ¥è¯¢å·¥å…·æ–‡ä»¶   
import { commonSaveCurHighQueryData,setValueForCurHighQueryData,commonGetHighQueryForm,initQueryForm,GetFilteredData } from '@/utils/myHighQueryUtils';  
 
interface RenderTableType { 
  url?: string 
@@ -111,48 +113,26 @@
    onMounted(() => {  
      fetchEnumData()  
      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 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; 
      //我今天新加的
      setValueForCurHighQueryData();
      setValueForCurHighQueryData(_curHighQueryData,queryForm,_searchFormInputAttrs);  
      tableRef.value.getList(_curHighQueryData.value) 
    } 
    // æ–°ç‰ˆçš„查询方法（高级查询中的按钮【查询】） 
    const handleQuery = async (extraParams = {}) => { 
      let filteredData = commonGetHighQueryForm(extraParams); 
      commonSaveCurHighQueryData(filteredData); 
      let filteredData = GetFilteredData(extraParams,queryForm,_searchFormInputAttrs,_curHighQueryData); 
      tableRef.value.getList(filteredData) 
    } 
    // æ–°ç‰ˆçš„查询重置 
    const resetQuery = () => { 
      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; 
      initQueryForm(queryForm,_searchFormInputAttrs,FILTER_MODE_OPTIONS_STRING); 
      setValueForCurHighQueryData(_curHighQueryData,queryForm,_searchFormInputAttrs);  
    }
     //新版的导出方法 
     const handleExport=()=>{ 
@@ -160,34 +140,7 @@
    } 
    // æ–°ç‰ˆçš„查询弹出框关闭方法 
    const closeQuery = (extraParams={}) => { 
      let filteredData = commonGetHighQueryForm(extraParams); 
      // 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; 
       //我今天新加的
       setValueForCurHighQueryData();
    } 
     //获取高级查询弹出框的查询值 
     const commonGetHighQueryForm=(extraParams={})=>{ 
      // è¿‡æ»¤æŽ‰ undefined çš„值 
      let filteredData = Object.assign( 
        {}, 
        ...Object.entries(extraParams).map(([key, value]) => 
          value !== undefined ? { [key]: value } : {} 
        ) 
      ) 
      //组合模糊查询 
      filteredData.searchVal = queryForm.value.searchVal 
      filteredData.searchVal_FilterMode = queryForm.value.searchVal_FilterMode  
      filteredData.str_searchFormInputAttrs =_searchFormInputAttrs.value; 
      return filteredData; 
      GetFilteredData(extraParams,queryForm,_searchFormInputAttrs,_curHighQueryData); 
    } 
    /*******************************************************[高级查询]结束********************************************************************************* */
 

 PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/MapperProfiles/WorkPlanAutoMapperProfile.cs

@@ -1,8 +1,11 @@
using AutoMapper;
using CMS.Plugin.PipeLineLems.Application.Contracts.Dtos.WorkPlan;
using CMS.Plugin.PipeLineLems.Application.Contracts.Dtos.WorkTask;
using CMS.Plugin.PipeLineLems.Domain.WorkPlan;
using CMS.Plugin.PipeLineLems.Domain.WorkTask;
using Volo.Abp.ObjectExtending;
using static CMS.Plugin.PipeLineLems.Application.Contracts.Dtos.WorkPlan.WorkPlansImportModel;
using static CMS.Plugin.PipeLineLems.Application.Contracts.Dtos.WorkTask.WorkTasksImportModel;

namespace CMS.Plugin.PipeLineLems.Application.MapperProfiles;

@@ -26,5 +29,11 @@

        CreateMap<WorkPlanImportModel, WorkPlanCreateDto>(MemberList.None);
        CreateMap<WorkPlanImportModel, WorkPlanUpdateDto>(MemberList.None);

        CreateMap<WorkPlanCreateDto, WorkTaskCreateDto>(MemberList.None);

        CreateMap<WorkPlanImportModel, WorkPlanCreateDto>(MemberList.None);
        CreateMap<WorkPlanImportModel, WorkPlanUpdateDto>(MemberList.None);
        CreateMap<WorkPlanImportModel, WorkPlan>(MemberList.None);
    }
}

 PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/MapperProfiles/WorkTaskAutoMapperProfile.cs

@@ -28,5 +28,6 @@
        CreateMap<WorkTaskImportModel, WorkTaskCreateDto>(MemberList.None); 
        CreateMap<WorkTaskImportModel, WorkTaskUpdateDto>(MemberList.None); 
        CreateMap<WorkTaskImportModel, WorkTask>(MemberList.None); 
      
    } 
}