diff --git a/.collaboration b/.collaboration index e3f5340a..f7649de8 100644 --- a/.collaboration +++ b/.collaboration @@ -558,19 +558,7 @@ }, { "ModuleName": "PCPage/任务列表", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-24T09:58:02.4385659+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务列表.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务列表.rd", - "Pages\\a3c94948c8a24e6a9d63fc05ebfd71f.json", - "Pages\\a3c94948c8a24e6a9d63fc05ebfd71f.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目工时", @@ -1948,16 +1936,7 @@ }, { "ModuleName": "TableView/任务平行视图", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-24T10:01:54.4014825+08:00", - "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\任务\\任务平行视图.json" - ] + "ModuleType": 23 }, { "ModuleName": "Pages/任务/任务类型管理", diff --git a/Pages/a3c94948c8a24e6a9d63fc05ebfd71f.json b/Pages/a3c94948c8a24e6a9d63fc05ebfd71f.json index ff2efbfe..05c2873d 100644 --- a/Pages/a3c94948c8a24e6a9d63fc05ebfd71f.json +++ b/Pages/a3c94948c8a24e6a9d63fc05ebfd71f.json @@ -155,7 +155,7 @@ ] } ], - "ID": "7bbc15e5-9723-43f2-b0e9-0855ebdb53d8" + "ID": "53c3e748-c72f-4493-9e1d-5fcb70b51b5a" } ] } @@ -229,7 +229,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "5394bd4e-f3c1-4c2c-b6b7-110f55816864" + "ID": "2e59aeb9-2f3e-43b7-8e5b-5b2c85adbc09" }, { "Condition": { @@ -259,7 +259,7 @@ "Message": "复制成功" } ], - "ID": "d545ea15-018e-497c-9029-fcefa9050bc9" + "ID": "55d71f46-eb42-4521-810e-17aefb2a28b9" }, { "Condition": { @@ -336,7 +336,7 @@ "Message": "操作成功" } ], - "ID": "837f7d8f-02f1-4a32-9ee1-f951742fe849" + "ID": "6b9ff526-ef15-4ffe-949e-10318e07d9de" }, { "CommandList": [ @@ -351,17 +351,17 @@ "BtnText": "知道了" } ], - "ID": "bd3c5342-5e2f-4c60-8041-c266f3340fc0" + "ID": "8be80438-9b71-473b-9039-54d11eafed55" } ] } ], - "ID": "7005d222-c1e5-46d8-aa55-4a37482fd8e3" + "ID": "93299333-7f50-41c0-833e-dd40c4056ba1" } ] } ], - "ID": "4a171751-6333-4d5f-bb47-b3dc8f0ac92e" + "ID": "7886f22e-e7aa-45a9-9b41-5f2f5ba2c21c" } ] } @@ -456,4 +456,4 @@ "Size": "24,24" } ] -}//USPbZQLEZHOe+DlxWBpfB1bKDmdjFqad1TM2/xaAOxWV4TQf6dNDw+SVeflr0+ow1tv8owSFmhUcs1uP8zM4PmVBB46GXdx7SC6aad0Q6CF3Dk4nA6/aNkbYnp8htfsSydAMpNDeXq0HSdqwzQl8518LUUQfcR6t2BZ2SEqwVhtZwmhB5nuKUsXpOO2tKeRyMoQeqljaX3o88KZMBqwpOnJkTFH/3NT5PbNGeylLDJVQjfFm3fmWKhs/hyUIZZjgu9TdkUgtHyq4XrDm0NhwgFoi50ep6lKz1+STehCerWyu3Xl7IwfcCLKlWvT2ANtAducy97STU/dJPZtxuIJPSEQxWwLR8CEii/+yjPPqB56CkSjq3zFa2nf0kUTnNTmDCIY1YVQl57jGp3BsirvTI3Q5kScQbRgdBwdBtqXLb43pyYuwnfGaEIz8x2arWDwjyQCCmy0XY0r9dKNjL3x8Vc/kyqAVVyNWpZ5BkE6XMOyZWL1Osu7e49OYv4PW1qvSnpM/k15G4O4ujZi7YLw8iBlBCYklT4fxgkzW0aacfvKBssjP+dE8SMJ2fTKtaCejzYOV4MViJ2KswDHrS7LXp3nt6yuJc0KVWby1nzf68uo5e2/mN3QXmSx5SUVlqKtt+plfX/tWoCyCzdpTqpqBj2qvKq98zdROUZH0faDzGdaSS0nCxXhXB6WUU+8T2qq6ckNQmBPphIitdI9lrgQXgORHTb6DvFUJ2V74NZTM1fTpPWO/TYyo079rwfNzOkJrF2QmNi1rdGZdMXzAT8R7vIRo6nGSFZIMdF/K8kjczrCaej7J1tA7uD8g1pXPfvs1xB4vA7m24R6yHE9nfahasWiDRh6Y9Pr3qd+oG1Vmsg/ygkLQ334Zrf29ZWNr3GlkaNyXCEs+X5TJp5vK6MEe5g==|920 \ No newline at end of file +}//wcj3dSbuCcyaq01xugFkQbXiNh0GPJuxVm26qNRPkD9LI3pk/gNfNj7//0ZIFITkbdqSgbwSQJdYSmHHPtwZVPeJ6rtGCRaNfostW12nfPSCNb5M2OGJLPoLWbzswIuH0VVAW+SJInK03QsOAkWW58swKezKyJMD7AFtOHmC59COV6oP7VdMEK7+twh1XCODoxk+Fwuewbcu+0v8MwVrB7ZNavNCTi3yHrbAqRbQeSSOdEJFG+Aj8O95J+COh9RbjTLpLLEI+E6CpLQ5zGTXzz/JoVyrs6y/TAnohPpAQd1zM2mvH3HbyUw/txroMfTzPEapTY63FcX8jSTIF5PpiRYlgryq3hZnYqgLLZsVdirNycJvAVsWBHdnXdkz92PO7O1x5ONnG6W5zSLYQiiN6Md2jtAkFYkv/ZylIVhI8ks5VgNGWeQElaEOaSccEQtH87Sy7NHFaMFL3EL36hpcj4W+jcXpdtfDPJF0gzturx4GS6kdPxqr9oMsqUIjtSzV+BInQuwlm9JQ8tEriuVB0mb8cEUkad+fz2VbCv4ZMG42gQvfG0vYcel0nujn/3u2+5qlg7fH2eCgPdsdmCwFquLl8nE8urJTxheKfJRQS0LZJyIK0OdcCloSWhbkjzq7bsvN5NjAgtkzUSoMGDXnJ5CEPdECsUl+r1siQiYSA0P9DhZ3L4XmXDFGCEkWFTXsP4MWHNdKFvPeYZTfCiaMNbDnqMN1qdL/VVvQQ8H35LNtrkjIqCzzuJ4L6LgWDrqk2wZtPwzFvjmm+l2unnnHLE/J5Hdt1pjGzopk/op6DQdvPcUOLRqarMutCTDHTcWkOjQj0EDlqwj4hOYu58ExxTz+Z3f5c1xnIoWInUnJoGFW4Gw6c72SJ3i9WlmE9nfws5xdAM/58jbLHdC94CtbbA==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/任务列表.json b/Pages/项目/项目首页/项目首页-容器页面/任务列表.json index 41c242d5..473042f4 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/任务列表.json +++ b/Pages/项目/项目首页/项目首页-容器页面/任务列表.json @@ -495,7 +495,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "5ccb9ccc-4529-4c6a-a0e2-8687f8ac08ed" + "ID": "33ba2ba5-fc71-4652-a6c2-c4ea10d54cf8" }, { "Condition": { @@ -529,7 +529,7 @@ ] } ], - "ID": "5c4bfd77-8023-411c-8d1e-7434178e25ab" + "ID": "acc2fa43-4c34-4a0c-a518-d8571be59ead" }, { "CommandList": [ @@ -705,7 +705,7 @@ } } ], - "ID": "55d9cac8-780e-4bf1-8fa5-20f51ec49c12" + "ID": "dffe8149-4fe8-4ec8-a4fd-3c1f331bf795" }, { "CommandList": [ @@ -717,12 +717,12 @@ } } ], - "ID": "65600ab6-7ccb-4634-87d1-b4c56e8d64a9" + "ID": "e088bda2-bc85-42cb-a913-f40756cf8115" } ] } ], - "ID": "63b97945-1ce4-416c-99c5-a355398658a5" + "ID": "6d092aec-3290-42b1-b06f-a256c2b18308" } ] }, @@ -763,7 +763,7 @@ "LoadBindingDataOption": 2 } ], - "ID": "915bbaf3-61a0-4005-b2ad-0a3dccfb1e80" + "ID": "fc797c92-fae1-4cb8-8edd-66e27584bd1e" }, { "CommandList": [ @@ -778,17 +778,17 @@ "BtnText": "知道了" } ], - "ID": "5eb7d3da-06fa-4493-90fb-37bc1d1679ac" + "ID": "df339f25-8757-4d6d-8b6b-74d3c000e75e" } ] } ], - "ID": "730d3490-09c7-4e2d-b8b5-c87a95dad068" + "ID": "9bddf94a-e75b-4e9c-80e8-dfb117154acc" } ] } ], - "ID": "e00d60a1-83e5-48cd-a695-d710cdbbba25" + "ID": "92b9d58e-d550-41bd-9c8a-b231a1fcbcc5" } ] } @@ -1273,7 +1273,6 @@ "$type": "ElementUI.VirtualizedTableActionButton, ElementUI", "Type": "button", "Name": "报工", - "StyleType": "Accent 1 0", "Shape": "default", "Commands": { "$type": "GrapeCity.Forguncy.Commands.CustomCommandObject, Forguncy.Commands", @@ -1320,12 +1319,21 @@ "TargetCell": { "SerializeProperty": "=新增报工!工时类型" } + }, + { + "Source": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务列表!行数据.value" + }, + "TargetCell": { + "SerializeProperty": "=新增报工!任务ID" + } } ], "LoadBindingDataOption": 1 } ], - "ID": "e4e1771d-aa31-4ea8-b239-990dd3ee4942" + "ID": "9dce24f4-bd40-43f1-a2bd-111618b51c5c" }, { "Condition": { @@ -1351,7 +1359,7 @@ } } ], - "ID": "ed8c3c2e-b9d0-487a-ac2f-92302498c535" + "ID": "f00f9b9a-a02c-4b76-8768-4a33dad8fef6" }, { "CommandList": [ @@ -1390,12 +1398,12 @@ "LoadBindingDataOption": 1 } ], - "ID": "ee70116e-271f-45a3-a1e2-9098700b3609" + "ID": "84d5c3cc-5cf1-4817-9eb5-55fdde69266b" } ] } ], - "ID": "e732691c-eb9d-45da-947e-9a65a2af751d" + "ID": "b358541d-67cd-421c-802b-32580fa729f0" } ] } @@ -1404,10 +1412,54 @@ "dataRow": "行数据" } } + }, + { + "$type": "ElementUI.VirtualizedTableActionButton, ElementUI", + "Type": "button", + "Name": "详情", + "Shape": "default", + "Commands": { + "$type": "GrapeCity.Forguncy.Commands.CustomCommandObject, Forguncy.Commands", + "Commands": [ + { + "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", + "Title": "加载中" + }, + { + "$type": "Forguncy.Model.ShareCommand, ServerDesignerCommon", + "ShareCommandContainerRefer": { + "ShareCommandContainerID": "fb580c25-10dd-4f22-8d8b-580f1b78aab8" + }, + "Params": [ + { + "ParamReferObject": { + "ParamID": "6a721307-5546-48b1-944e-d04195469758", + "ShareCommandContainerReferObject": { + "ShareCommandContainerID": "fb580c25-10dd-4f22-8d8b-580f1b78aab8" + } + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务列表!行数据.value" + } + } + ], + "ResultErrorCodeTo": { + "SerializeProperty": "code" + }, + "ResultMessageTo": { + "SerializeProperty": "msg" + } + } + ], + "ParamProperties": { + "dataRow": "行数据" + } + } } ], "Label": "操作", - "Width": 120, + "Width": 180, "Align": "right", "Fixed": "right", "HeaderAlign": "center" @@ -1793,4 +1845,4 @@ "Formula": "任务列表!$I$13" } ] -}//7Z98gC/K7YY98X7Fsq+oHFXwCnckRKwih773fLEhnuuBYIQCroP1V3R7rcpoMxf3Ww609n0Sbz9rhhLILRPewCe/ehnFdSPRZsJN6o1YSRRlKhF4bxW0avMFyxKh1Vzx5aCLP2sd6bq7QKAR1yY1lfqR7YyecdwHnD4R3M0gtWahrKewNeYdpYpFofsgP0PxySmsnnoi+POyJP6Bcm2pTWxdrfpa17RJPIluynLesdNrRckiYK9Fp+aXvAfk6evJc8bm66CnUti4YU9LsyK+QNXFU23wAAP+TocRtztWoPoJ+RmJ3llWgChQGMMhqmEW4Z/fDFIEhRcwAbrKjUsrRQ+8j4KUwD2qbATFKKkT0iRCtMjd8+o7SiSl/Yykh0Nj8IKLz+to0UOgIsyLVh3l/v6Krn12lu3NeDL6YquV1ICkHYQjvrwzHlGblc6blJAlapoUlXlyMDOnzzK9j+ieQv92UBZLaEcRAHBBXzZjBMsSfHdAXHl7mU3LdcGdOK8LOhyxXHehXKz+qfO8RCZQuODrf4lw88issGxvQE7zCd1Bok++ZsxlaOCIrBtdzw2llr/yfbQ2da8AY+IxHUfMs5bEcEeO/eRT4Cld1jxxC3uXgRId274JqYhimeWK7CFf0gWivpMf1Ap+aQSjoWOotqWB+CZd1dj5v2dfUbMzHco15lBn3iOyg0gtenQYOmnqedTSfhaMafCJCWWJfzZ5mDcZRt9x8EQLN44e5jO3Z1j3QGlxLXp4yRAwCcHpLiCy2tyVdwCSap+9M5o6EAVyK5aB7ayV3Y8kuAb79H5QvXMj5V7ClOLrqO86N1Cg20+7PXSRl4L9ZwBIN3tBZona+tKe0Zrh1SKz9j7wiP0kX3IdKfbyzAMgMtvbu1cS7OT6QSyffVkq9A7cemhw01p5Pg==|920 \ No newline at end of file +}//DnHhgra3fjulTW64QT9hvfi3wRDc+eS0oggYRwI+4SHb7Ptgjh0WTqEOi7jiIOEpC1ULdyjMqeftocIMrcObpg+MnXoZHrrcNJLg4gttmzRkLuhEiNU2yPldcG2LFsqhHIX6LqpKxS17IwvqxOkurU2DgSb1PSLQKMNYW9B9ioXbK/rui5JoKPksrZ8AM83LOVTMwj3UK6IPEZp3p8UVpTUCl7ffvDC1tx5Dsm3EWES9qmQ4s7FXj6lLA7XK15A9mE6fvg2inWXK7VLCOCSUbsdRrg9YJNxAFvqhIidP6riNJA8LMFdgZbYLmIv3ziQJjh3M139tWhe0BlsitE/iCgpStPhhBLK/BS+dUywb3tIy1o5YuOUsL3T/mZvw7wzgUkImCg6+369BA/J66/ayyYv4wKSjfYg8jNSu+PxZRiX/tZMb53uGjHPkr/8dBNd0r4vBVliDIrpoFYi/E4wdgZqFh2mlMtVhJ/w6plR3Uc3enJBP8JJTdH6gK1aZcDQYyj7VmJDLY87DshdpTwjrjboTC4DcjqIBI6+a+mRJn0pMlREisHN9UyuYV3wWFVr+cQfg6YtM+Ob4UCjg+lwZRuu9NBfPBbkezi89ww4EQO846e9lER7H/ri/1G6Tz6S7a5O51DA6Cnscvw3srA+rtJsh003f5qO4ZGSUcSoo5xO62tcKvgOOIz5c+tpMPoD04xcovptodj3KTxfXOJvPkQXlof79doUCdxrxsJ1HR92d8esZjWnSjj5Tp9MiF9Pv3FMWa29hBeX3WgkyU/RlUrFmHl+h7Htihp3KX9y5AuSd/iLCxAVv9E73YG84ySJ0gZj5hjBiS2P9ioIifjIascW1tCpVtiJPaSCvM131dNrYnm/663It5Cz6wGctoTzWggL1i+MzSdJHxwLZa5pMTw==|920 \ No newline at end of file diff --git a/Tables/任务/任务平行视图.json b/Tables/任务/任务平行视图.json index 139c8da4..8b9f1728 100644 --- a/Tables/任务/任务平行视图.json +++ b/Tables/任务/任务平行视图.json @@ -69,10 +69,10 @@ "$type": "Forguncy.RbacPermission.Core.Impl.Data.DataPermissionBinding, Forguncy.RbacPermission.Core", "config": { "$type": "Forguncy.RbacPermission.Core.Impl.Data.RowBindingConfig, Forguncy.RbacPermission.Core", - "operationTypes": 5, + "operationTypes": 13, "dataFilter": { "$type": "Forguncy.RbacPermission.Core.Impl.Data.RowFilter, Forguncy.RbacPermission.Core", - "filterType": 1 + "userFieldName": "任务负责人" } }, "dataPermissionType": 2, @@ -86,7 +86,7 @@ "$type": "Forguncy.RbacPermission.Core.Impl.Data.DataPermissionBinding, Forguncy.RbacPermission.Core", "config": { "$type": "Forguncy.RbacPermission.Core.Impl.Data.RowBindingConfig, Forguncy.RbacPermission.Core", - "operationTypes": 1, + "operationTypes": 13, "dataFilter": { "$type": "Forguncy.RbacPermission.Core.Impl.Data.RowFilter, Forguncy.RbacPermission.Core", "userFieldName": "任务负责人", @@ -140,6 +140,21 @@ } }, "Value": "%CurrentUser.UserName%" + }, + { + "$type": "ForguncyDataAccess.TextCESqlCondition, ForguncyDataAccess", + "CompareType": 6, + "ColumnBindingInfo": { + "TableName": "任务平行视图", + "ColumnName": "流程实例ID", + "GUID": "38eaecb8-945c-4256-8814-5a1f0efc24f3", + "RelationBinding": { + "RelatedTable": "ACT_HI_PROCINST_View", + "RelatedColumn": "ID_", + "DisplayColumn": "当前负责人" + } + }, + "Value": "%CurrentUser.UserName%" } ], "RelationType": 1 @@ -182,9 +197,15 @@ "前置任务": 5, "功能名称": 5, "功能描述": 5, + "动态可核定工时": 5, "可分配工时": 5, "可核定工时": 5, "备注": 5, + "子任务可核定工时": 5, + "子任务实际工时": 5, + "子任务已分配工时": 5, + "子任务数": 5, + "子任务核定工时": 5, "实际工时": 5, "层级": 5, "工期": 5, @@ -196,6 +217,10 @@ "总核定工时_已分配工时": 5, "成员数量": 5, "收集反馈": 5, + "本任务可核定工时": 5, + "本任务实际工时": 5, + "本任务已分配工时": 5, + "本任务核定工时": 5, "次序": 5, "流程实例ID": 5, "父任务ID": 5, @@ -203,16 +228,7 @@ "结束时间": 5, "进度": 5, "里程碑": 5, - "项目ID": 5, - "本任务已分配工时": 5, - "子任务已分配工时": 5, - "本任务核定工时": 5, - "子任务核定工时": 5, - "本任务可核定工时": 5, - "子任务可核定工时": 5, - "本任务实际工时": 5, - "子任务实际工时": 5, - "动态可核定工时": 5 + "项目ID": 5 }, "subTableOperations": { "View_任务工时统计": 5, @@ -251,9 +267,15 @@ "前置任务": 5, "功能名称": 5, "功能描述": 5, + "动态可核定工时": 5, "可分配工时": 5, "可核定工时": 5, "备注": 5, + "子任务可核定工时": 5, + "子任务实际工时": 5, + "子任务已分配工时": 5, + "子任务数": 5, + "子任务核定工时": 5, "实际工时": 5, "层级": 5, "工期": 5, @@ -265,6 +287,10 @@ "总核定工时_已分配工时": 5, "成员数量": 5, "收集反馈": 5, + "本任务可核定工时": 5, + "本任务实际工时": 5, + "本任务已分配工时": 5, + "本任务核定工时": 5, "次序": 5, "流程实例ID": 5, "父任务ID": 5, @@ -272,16 +298,7 @@ "结束时间": 5, "进度": 5, "里程碑": 5, - "项目ID": 5, - "本任务已分配工时": 5, - "子任务已分配工时": 5, - "本任务核定工时": 5, - "子任务核定工时": 5, - "本任务可核定工时": 5, - "子任务可核定工时": 5, - "本任务实际工时": 5, - "子任务实际工时": 5, - "动态可核定工时": 5 + "项目ID": 5 }, "subTableOperations": { "View_任务工时统计": 5, @@ -320,9 +337,15 @@ "前置任务": 5, "功能名称": 5, "功能描述": 5, + "动态可核定工时": 5, "可分配工时": 5, "可核定工时": 5, "备注": 5, + "子任务可核定工时": 5, + "子任务实际工时": 5, + "子任务已分配工时": 5, + "子任务数": 5, + "子任务核定工时": 5, "实际工时": 5, "层级": 5, "工期": 5, @@ -334,6 +357,10 @@ "总核定工时_已分配工时": 5, "成员数量": 5, "收集反馈": 5, + "本任务可核定工时": 5, + "本任务实际工时": 5, + "本任务已分配工时": 5, + "本任务核定工时": 5, "次序": 5, "流程实例ID": 5, "父任务ID": 5, @@ -341,16 +368,7 @@ "结束时间": 5, "进度": 5, "里程碑": 5, - "项目ID": 5, - "本任务已分配工时": 5, - "子任务已分配工时": 5, - "本任务核定工时": 5, - "子任务核定工时": 5, - "本任务可核定工时": 5, - "子任务可核定工时": 5, - "本任务实际工时": 5, - "子任务实际工时": 5, - "动态可核定工时": 5 + "项目ID": 5 }, "subTableOperations": { "View_任务工时统计": 5,