From a2cb4ebc089b890318f335fadcd8b48aa3ef60cd Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周二, 20 5月 2025 16:58:21 +0800
Subject: [PATCH] 222
---
PipeLineLems/pipelinelems_web/src/widgets/WorkTask/Views/Pages/WorkTask/WorkTask.tsx | 113 +++++++++++--------------------------
PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/MapperProfiles/WorkPlanAutoMapperProfile.cs | 9 +++
PipeLineLems/pipelinelems_web/src/utils/myHighQueryUtils.ts | 42 ++++++++++++++
PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/MapperProfiles/WorkTaskAutoMapperProfile.cs | 3
4 files changed, 86 insertions(+), 81 deletions(-)
diff --git a/PipeLineLems/pipelinelems_web/src/utils/myHighQueryUtils.ts b/PipeLineLems/pipelinelems_web/src/utils/myHighQueryUtils.ts
new file mode 100644
index 0000000..b9c1f78
--- /dev/null
+++ b/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;
+ }
\ No newline at end of file
diff --git a/PipeLineLems/pipelinelems_web/src/widgets/WorkTask/Views/Pages/WorkTask/WorkTask.tsx b/PipeLineLems/pipelinelems_web/src/widgets/WorkTask/Views/Pages/WorkTask/WorkTask.tsx
index 3a10dad..25fff57 100644
--- a/PipeLineLems/pipelinelems_web/src/widgets/WorkTask/Views/Pages/WorkTask/WorkTask.tsx
+++ b/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
@@ -69,7 +71,7 @@
//瀹氫箟楂樼骇鏌ヨ寮曠敤
const workTaskQueryDrawerRef=ref(null);
-
+
//瀹氫箟鏁翠綋妯＄硦鏌ヨ鐨勫垪鏁扮粍(娉ㄦ剰锛氬繀椤诲ぇ灏忓啓璺熷悗绔殑瀹炰綋绫诲睘鎬у悕涓�鑷达紝鍚﹀垯浼氬鑷村尮閰嶄笉瀵圭殑闂)
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'
@@ -110,86 +112,37 @@
// 缁勪欢鎸傝浇鏃惰幏鍙栨灇涓炬暟鎹�
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;
+ resetQuery();
})
- /*******************************************************[楂樼骇鏌ヨ]寮�濮�********************************************************************************* */
- // 鏂板鐨勬煡璇㈡潯浠�
- 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();
- tableRef.value.getList(_curHighQueryData.value)
- }
- // 鏂扮増鐨勬煡璇㈡柟娉曪紙楂樼骇鏌ヨ涓殑鎸夐挳銆愭煡璇€�戯級
- const handleQuery = async (extraParams = {}) => {
- let filteredData = commonGetHighQueryForm(extraParams);
- commonSaveCurHighQueryData(filteredData);
- 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;
- }
- //鏂扮増鐨勫鍑烘柟娉�
- const handleExport=()=>{
- onExport(_curHighQueryData.value);
- }
- // 鏂扮増鐨勬煡璇㈠脊鍑烘鍏抽棴鏂规硶
- 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;
- }
- /*******************************************************[楂樼骇鏌ヨ]缁撴潫********************************************************************************* */
+ /*******************************************************[楂樼骇鏌ヨ]寮�濮�********************************************************************************* */
+ // 鏂板鐨勬煡璇㈡潯浠�
+ const queryForm = ref({ searchVal: '',str_searchFormInputAttrs:[],searchVal_FilterMode:'' });
+ // 瀹氫箟鍝嶅簲寮忔煡璇㈡暟鎹�
+ const _curHighQueryData = ref({ searchVal: '',str_searchFormInputAttrs:[],searchVal_FilterMode:'' });
+ // 鏂扮増鐨勬煡璇㈡柟娉曪紙涓婚〉闈腑鐨勬寜閽�愭煡璇€�戯級
+ const handleQueryForMain = async () => {
+ setValueForCurHighQueryData(_curHighQueryData,queryForm,_searchFormInputAttrs);
+ tableRef.value.getList(_curHighQueryData.value)
+ }
+ // 鏂扮増鐨勬煡璇㈡柟娉曪紙楂樼骇鏌ヨ涓殑鎸夐挳銆愭煡璇€�戯級
+ const handleQuery = async (extraParams = {}) => {
+ let filteredData = GetFilteredData(extraParams,queryForm,_searchFormInputAttrs,_curHighQueryData);
+ tableRef.value.getList(filteredData)
+ }
+ // 鏂扮増鐨勬煡璇㈤噸缃�
+ const resetQuery = () => {
+ initQueryForm(queryForm,_searchFormInputAttrs,FILTER_MODE_OPTIONS_STRING);
+ setValueForCurHighQueryData(_curHighQueryData,queryForm,_searchFormInputAttrs);
+ }
+ //鏂扮増鐨勫鍑烘柟娉�
+ const handleExport=()=>{
+ onExport(_curHighQueryData.value);
+ }
+ // 鏂扮増鐨勬煡璇㈠脊鍑烘鍏抽棴鏂规硶
+ const closeQuery = (extraParams={}) => {
+ GetFilteredData(extraParams,queryForm,_searchFormInputAttrs,_curHighQueryData);
+ }
+ /*******************************************************[楂樼骇鏌ヨ]缁撴潫********************************************************************************* */
/**
* @returns 琛ㄦ牸
diff --git a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/MapperProfiles/WorkPlanAutoMapperProfile.cs b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/MapperProfiles/WorkPlanAutoMapperProfile.cs
index e097131..0ad52a1 100644
--- a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/MapperProfiles/WorkPlanAutoMapperProfile.cs
+++ b/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);
}
}
diff --git a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/MapperProfiles/WorkTaskAutoMapperProfile.cs b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/MapperProfiles/WorkTaskAutoMapperProfile.cs
index 404ee5a..23855aa 100644
--- a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/MapperProfiles/WorkTaskAutoMapperProfile.cs
+++ b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/MapperProfiles/WorkTaskAutoMapperProfile.cs
@@ -27,6 +27,7 @@
CreateMap<WorkTaskImportModel, WorkTaskCreateDto>(MemberList.None);
CreateMap<WorkTaskImportModel, WorkTaskUpdateDto>(MemberList.None);
- CreateMap<WorkTaskImportModel, WorkTask>(MemberList.None);
+ CreateMap<WorkTaskImportModel, WorkTask>(MemberList.None);
+
}
}
--
Gitblit v1.9.3