From b35c56538472ace1ec442202c65711387124c031 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B6=85=E5=93=A5?= Date: Wed, 3 Jul 2024 17:15:05 +0800 Subject: [PATCH] =?UTF-8?q?{"Message":"1","MessageType":2,"Modules":[{"Sta?= =?UTF-8?q?te":1,"Type":1,"Name":"PCPage/=E4=BB=BB=E5=8A=A1-=E5=9F=BA?= =?UTF-8?q?=E6=9C=AC=E4=BF=A1=E6=81=AF"},{"State":1,"Type":15,"Name":"Serv?= =?UTF-8?q?erCommand/=E4=BF=AE=E6=94=B9=E4=BB=BB=E5=8A=A1=E9=A2=84?= =?UTF-8?q?=E7=AE=97=E5=B7=A5=E6=97=B6"},{"State":1,"Type":15,"Name":"Serv?= =?UTF-8?q?erCommand/=E5=88=86=E9=85=8D=E4=BB=BB=E5=8A=A1=E5=B7=A5?= =?UTF-8?q?=E6=97=B6"},{"State":1,"Type":23,"Name":"TableView/=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E5=B9=B3=E8=A1=8C=E8=A7=86=E5=9B=BE"}],"Version":"v1"?= =?UTF-8?q?}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .collaboration | 45 ++-------------- .../任务容器页面/任务-基本信息.json | 10 ++-- ServerCommands/任务/修改任务预算工时.json | 54 +++++++++---------- ServerCommands/工时/分配任务工时.json | 30 +++++------ Tables/项目/项目平行视图.json | 17 +----- 5 files changed, 52 insertions(+), 104 deletions(-) diff --git a/.collaboration b/.collaboration index 51a3e76b..7f198eb6 100644 --- a/.collaboration +++ b/.collaboration @@ -662,17 +662,7 @@ }, { "ModuleName": "PCPage/任务-基本信息", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-07-03T17:09:53.2413331+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\任务-基本信息.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\任务-基本信息.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务-任务信息", @@ -936,16 +926,7 @@ }, { "ModuleName": "ServerCommand/修改任务预算工时", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-07-03T17:14:00.4302764+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\任务\\修改任务预算工时.json" - ] + "ModuleType": 15 }, { "ModuleName": "ServerCommand/移除任务成员", @@ -977,16 +958,7 @@ }, { "ModuleName": "ServerCommand/分配任务工时", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-07-03T17:13:34.8052321+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\工时\\分配任务工时.json" - ] + "ModuleType": 15 }, { "ModuleName": "ServerCommands/项目", @@ -1850,16 +1822,7 @@ }, { "ModuleName": "TableView/项目平行视图", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-07-03T17:12:21.5967361+08:00", - "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\项目\\项目平行视图.json" - ] + "ModuleType": 23 }, { "ModuleName": "TableView/任务成员视图", diff --git a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-基本信息.json b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-基本信息.json index 5416a9d7..babfba38 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-基本信息.json +++ b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-基本信息.json @@ -2061,7 +2061,7 @@ } } ], - "ID": "df0353ca-5dd7-4803-a8b7-c78e3ca51ab3" + "ID": "9d35de19-e1bf-4e60-9be0-c6edb4e16a79" } ] }, @@ -2100,7 +2100,7 @@ ] } ], - "ID": "b7e9357f-2c84-4c68-8edd-474372dda158" + "ID": "c29d5717-01a5-433b-8a26-57f813a0efbe" }, { "CommandList": [ @@ -2117,7 +2117,7 @@ ] } ], - "ID": "c47a2052-ed2f-4f15-9b90-6ad84ba83a50" + "ID": "3e7286ad-4e02-45fe-b73b-eeb2adc5bda3" } ] } @@ -2177,7 +2177,7 @@ "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon", "Formula": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=AND('任务-基本信息'!工时分配方式<>4,'任务-基本信息'!任务ID<>\"\",'任务-基本信息'!任务状态码=2,OR('任务-基本信息'!父任务负责人='任务-基本信息'!当前用户,'任务-基本信息'!项目经理='任务-基本信息'!当前用户))" + "SerializeProperty": "=AND('任务-基本信息'!工时分配方式<>4,OR('任务-基本信息'!父任务负责人='任务-基本信息'!当前用户,'任务-基本信息'!项目经理='任务-基本信息'!当前用户))" }, "Priority": 6, "GUID": "f7c3f6d5-8b51-481e-abe2-d1a7b9beee5e", @@ -2320,4 +2320,4 @@ "Formula": "'任务-基本信息'!$C$8" } ] -}//e7T0zhg4ru63M9EtiMQ0v0r1y3Ex2BMP7xiWYDMWGZH39KuUw9Oxx6RON2bpyy+J9iROU13z83VsvdLEhSpDRBUgzFC7bdCPqa/xFUf7oN44Voh4gqRoXSSBSfwpuU4IWKveE59LF1DurXIh8SXe9DWIK/M6V2LArBG0WUQccyeToMrl0LvhNLjgZDIyUM+SJBpC7wjbjjHOAkqKgHdjLCuG6GHeHEtO+tWftpLhFFBBaYVZntTmY16far43slLDtwnU8Meeznx1LYEOqzDF+j7XWeJjVU7bGAZUB70DAmsHGarXrb+4svIzECIcyBOcxidROq0eHuIW+rEfB3/jUUASh5vx4BCukn9lHm06kYLRfoRwwqQOz+Aw7AiM3Hiuo+9ybHHNWu0uZ48gR9hIJ2l8IgR69dfrzDvsEzgCloK6+BD7LmI4wFZ7yLugKyU2SLVzcnQZgkPwPPC1MHX7X+LNFv0ibKlW70Va2MaYoVzPToOMojJlND7GmHNJ4r5OqgfLGs/pjYjgckhCv7DVcXJaeprCvc8F0Fdaj6ZmOGfCKqqzFrhJmuRq/UNeQS2RLE3C4SJ8/0CXJX/sPf7/B0z86i6iC/sRGcjm5oJ5vfPUP2/bDs10IJ8s+6QUax3w5yPU5UD1QXZA4o2wZma3bqj3PN583eZGo5drRWTCILc9jhxPgcfQNSTyictTiM9TXv1eQ/aBiw9dOP/VCXTMgRTzLt3S8ZvfmQmKA+OAAqqElhSvDYMX4fZx41PkDKF61OvToi3KBAMGAJQPtDJBYKvuHi6JM8KDF9fubOWjzu0ImYbCxrPf3xWvEajxgiJqOS099R5HzrYuPysnZ4a8Cu12/BgOp0o6KT7gGwp+XmBQZgRHZzwPCyZL/9Z/yV/CIGoSi1VGBlRzJT07DpP/hw==|920 \ No newline at end of file +}//q8+ghnHCmMJAjgoO68lv1wT2P74xaqldy6QpJ6OvNZX7ytsWbPeQ1SLWjQg9bx8WXCtV8wuJ3etWS8ib12k5/SCdaSYkWWldY5AEg3C35saUHFWbflmL9yI3UIWq6sDf4uPqjYaumS63OaAJEQCxNkFWB2QlmKG2AWIQ6hyOstTDuZjCiQrK0dcvoeOIvXj366aBmryu96OPBbwft+3A60Svqu2Bz8U1Aa7NIUK20opbpRD66vME5DNfq7A6kNtXX7rQuVn4z+r02nJsV9KktifanB/1WsBR5JrRW+YnZcyRxWy+UrmKgt9WgwPAUej8Rr95Sol2naRGhfRhBwJMwmKGpHPPhIBicU4tDA4Fkyji8WV9cefVAvGdQsz9YNlT6QQ2YK/YQNfM8xF5BRvKtf6L/UDkxLb4tL0nZBxzeaH156UKrT/2V5TTEJWc5Cu0L0KCUtnxivUsRnC1FVKxrQSLvtLEaLe9WV5LknPFyE7WXIZt455GYrYRBn/Igj40O4kTUj5rleQRMH2q/oWQ8N2dQ1pRlK7FDEUDmohihiaXT5M0MDmsV4BNzLENSIgROpY+/T1ElK8e7BeK+KUCC3xnh+7ASppe+d0tONrHt5xmcp5VODVPZxOtWxr8OUwp5b+viAbWunkMoEP9A3k+0AdiZlcLbCq+zdINywCTrNdZa9x0AY3sbRlYetXWoHF+xdxe0Q/IxcUsaJr+S9514Int4jIlVmsXQG9L0yrpoHmL9Oh2M+Hwa83QTvC8sFBAgOJMIgi8gID/r1tGLCXxeC8TNxA/W7j2s9rtqJYotShqk7/ioDygh853Y86mwz13tCE+nDBLhFeAmVMCeuw3QYnSLiqBMzGWLBbj3s0RmqUY5+MfOT5GCtzqoL3gC4mMcUOOkxKr3XkVwwgLBrVomA==|920 \ No newline at end of file diff --git a/ServerCommands/任务/修改任务预算工时.json b/ServerCommands/任务/修改任务预算工时.json index d4eb3134..e5c29409 100644 --- a/ServerCommands/任务/修改任务预算工时.json +++ b/ServerCommands/任务/修改任务预算工时.json @@ -45,7 +45,7 @@ "TableValueType": 1, "BindingInfos": [ { - "GUID": "b41170ef-8882-411d-bf6c-3590f4ec537b", + "GUID": "8ae71a3c-cf69-473a-ae00-6751f83ffbaf", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "项目ID", @@ -54,7 +54,7 @@ "ColumnName": "项目ID" }, { - "GUID": "abc4fdee-b86b-4311-9850-1e04eefce172", + "GUID": "2e9728f5-488a-47ea-bf17-cd9ef4cf18ac", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "项目ID", @@ -68,7 +68,7 @@ "ColumnName": "严格模式" }, { - "GUID": "8be7c72a-0bbe-4013-9fa2-793cdab46361", + "GUID": "80b2199d-fb04-40e5-9cec-315fbc336501", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "项目ID", @@ -82,21 +82,21 @@ "ColumnName": "项目预算工时" }, { - "GUID": "31914297-58ea-48e9-bde6-f442ea43940b", + "GUID": "8144b500-8d9d-4b70-be04-04188301ac21", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "项目ID", - "GUID": "09bc90b5-976b-41f9-ac1d-235435d37d0b", + "GUID": "1366e55d-d61b-46c8-af9e-7fc4cb7a53bf", "RelationBinding": { "RelatedTable": "项目平行视图", "RelatedColumn": "ID", - "DisplayColumn": "项目总分配工时" + "DisplayColumn": "项目已分配工时" } }, - "ColumnName": "项目总分配工时" + "ColumnName": "项目已分配工时" }, { - "GUID": "1ccf9321-bb0f-4b36-b882-91fddac00857", + "GUID": "ac6d4ceb-a9b0-445d-a442-1c8066efb55a", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "项目ID", @@ -110,7 +110,7 @@ "ColumnName": "工时分配方式" }, { - "GUID": "e92d4545-3b50-4c38-b871-f02a7403c6d2", + "GUID": "e46119ab-e2d6-4e46-b6f6-f656d42945a5", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "任务名称", @@ -119,7 +119,7 @@ "ColumnName": "任务名称" }, { - "GUID": "83c3fc51-0e13-4e4f-bb13-e87cee55450c", + "GUID": "27803d1a-1157-4fc5-bd29-5fb879c9c090", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "总分配工时", @@ -128,7 +128,7 @@ "ColumnName": "总分配工时" }, { - "GUID": "866e108f-0e48-41a8-8d08-ccbbccb87ced", + "GUID": "468c6d6f-2fcb-4124-b00c-c0dfd1ae8a56", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "已分配工时", @@ -137,7 +137,7 @@ "ColumnName": "已分配工时" }, { - "GUID": "cef7b6e7-62ce-4273-b3c9-27cc7eccc50e", + "GUID": "d8338b96-f7ba-4ff0-929b-c48608ee35f8", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "父任务ID", @@ -146,7 +146,7 @@ "ColumnName": "父任务ID" }, { - "GUID": "44fce238-52b6-4279-8349-67ead4cdde00", + "GUID": "6b521b64-8243-4b17-bf58-ab74ea5fb79e", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "父任务ID", @@ -160,7 +160,7 @@ "ColumnName": "父任务可分配工时" }, { - "GUID": "54aac56a-a596-4bd4-972d-51b7ac2cba6a", + "GUID": "8cea6bce-e2d8-47f4-bc65-8c5bc316a6a2", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "本任务已分配工时", @@ -183,7 +183,7 @@ }, "TopCount": "1" }, - "ID": "a451c4f01e354cd397cdcdd6487450e8" + "ID": "21865ad1962c44d4be6d805cd19daf8f" }, { "$type": "Forguncy.Model.CatchExceptionCommand, ServerDesignerCommon", @@ -211,9 +211,9 @@ "ParameterName": "项目可分配工时", "ParameterValue": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务表.项目预算工时-任务表.项目总分配工时" + "SerializeProperty": "=任务表.项目预算工时-任务表.项目已分配工时" }, - "ID": "2b08b895ad5b4f2697d6045bcb03f0c1" + "ID": "21e229bfb2074ecf90faf763e18d1362" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -269,7 +269,7 @@ ] } ], - "ID": "6b0aa3aa-56a9-4239-9cf8-a7cbd1c4bb6c" + "ID": "274cc540-2ecd-4032-8615-50cde88a6a39" } ] }, @@ -296,11 +296,11 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=项目可分配工时" }, - "ID": "31c222793f824eb3a84d00f1e0e3811f", + "ID": "dc415d50f13c4b6d910deebb8f01c7c3", "Comments": "如果没有父任务，则将项目可分配工时+任务当前的总分配工时 （相当于这个任务没有分）" } ], - "ID": "6e74a7be-eb9a-4408-b67b-ca21492fd483" + "ID": "a29b22a1-3a16-4819-a5a3-2e8348db48f1" }, { "CommandList": [ @@ -311,11 +311,11 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=任务表.父任务可分配工时" }, - "ID": "56a7d8ee803449268e0e8eccd66dc689", + "ID": "2e69cbc7c4ef4ea889efb06c58f96f73", "Comments": "如果没有父任务，则将项目可分配工时+任务当前的总分配工时 （相当于这个任务没有分）" } ], - "ID": "c4efc85f-e4f2-44b5-b1e6-fbce69f5de0e" + "ID": "cf25b05b-9b46-428c-8a33-816542cbeb21" } ], "Comments": "严格模式下，根据是否有父任务来计算本次预算工时的上限" @@ -327,7 +327,7 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=上级剩余工时+任务表.总分配工时" }, - "ID": "bf6bea055267461f804613fa476f0ea0", + "ID": "1272d321f1664c3b9ff24c5dcedb5d2e", "Comments": "上级任务剩余可用的工时+当前任务的总工时，相当于没有分给它" }, { @@ -364,12 +364,12 @@ ] } ], - "ID": "759b97cb-3f2d-4ea1-9ebd-d16964c057bb" + "ID": "848dff63-ab7f-4d6e-b558-7a64cce16605" } ] } ], - "ID": "8465578f-e102-4c1d-91d3-7b1323ae3650" + "ID": "13ead9e6-b053-4a77-a117-ea8951ddda84" } ] }, @@ -463,7 +463,7 @@ ] } ], - "ID": "7bbbfcd6-8aa3-4496-8b2d-e803f0ec9fd1" + "ID": "2d04e62a-3dcf-4f77-a465-828437ab541e" }, { "CommandList": [ @@ -482,7 +482,7 @@ ] } ], - "ID": "1a41098e-e66a-4c90-8be9-02aa7e59efa8" + "ID": "7b9cf683-17ed-4f49-bbf5-d3a39cecacba" } ] } diff --git a/ServerCommands/工时/分配任务工时.json b/ServerCommands/工时/分配任务工时.json index 67e7d034..30dfea64 100644 --- a/ServerCommands/工时/分配任务工时.json +++ b/ServerCommands/工时/分配任务工时.json @@ -475,7 +475,7 @@ "ParamNameToSaveNewRowValue": "" } ], - "ID": "57248cd4-2838-4f18-a187-2040ad1ce0b6" + "ID": "86dbbcf8-0bb2-4ba6-affd-96fd73bee31a" } ] }, @@ -530,7 +530,7 @@ "ID": "f1babee3af9a4401b69d66a5728facf3" } ], - "ID": "d243eecb-bdef-4cb6-8560-9a34f370378e" + "ID": "c29c68b6-a325-4dc6-89d7-b177048f0c29" }, { "Condition": { @@ -564,7 +564,7 @@ "ID": "aaefe8a951624a449e45823a45627c18" } ], - "ID": "ce8b08de-2dc8-4063-a813-84cff33d9a44" + "ID": "620e83c6-a8a7-4c67-84a5-cff9cc96172c" } ], "Comments": "如果是按人分配，则把计划工时分到一天中" @@ -700,7 +700,7 @@ "ID": "954da7d900d44d068c49c0775cbb66ad" } ], - "ID": "6c34f9eb-9039-4cdd-8bcd-caeafe3003d5" + "ID": "d6e7f057-528c-4730-af7b-c91a33bef2dc" }, { "CommandList": [ @@ -714,7 +714,7 @@ "ID": "bd03cd955f4449cf9d84c422471b58ac" } ], - "ID": "fa2e70eb-89ff-442e-b63d-7acc531ba781" + "ID": "1e9e5ea9-d60a-4574-abc4-f3136b9e9634" } ] }, @@ -932,7 +932,7 @@ } ], "Comments": "如果不是按人分配，且分配后的工时超过负荷，则报错", - "ID": "5bcefe86-54b7-42c9-a36d-9937ae264dd7" + "ID": "f88523b4-518f-45a1-8c78-56b71d28f090" }, { "CommandList": [ @@ -945,7 +945,7 @@ } } ], - "ID": "5bafb462-cbc7-4fbd-a9f8-e934a1118945" + "ID": "6f2ec644-79e9-4693-8816-15247cacf24e" } ] } @@ -959,7 +959,7 @@ "Message": "分配计划工时成功" } ], - "ID": "52c76946-b751-42dc-b52d-517bd444faa4" + "ID": "f3dec0ab-8e66-4e3b-b153-1fa2124ac133" }, { "CommandList": [ @@ -972,12 +972,12 @@ } } ], - "ID": "bf83c604-28e7-4994-9167-33ff6931935c" + "ID": "2fcf769e-b928-42a7-9592-f8e71a1c9851" } ] } ], - "ID": "1f129fa8-f603-46ef-bde1-8ca87368c489" + "ID": "0ea32738-b00b-4e56-8393-525dd18deffc" }, { "CommandList": [ @@ -987,13 +987,13 @@ "Message": "该用户不是项目成员" } ], - "ID": "79e2ea95-deb1-4260-9805-43f190ef789d" + "ID": "a648e6b1-ae5c-4313-ba67-ede3cbdfc77b" } ], "Comments": "如果任务成员中没有，则自动加一个" } ], - "ID": "8f799997-03ea-43ed-8434-a36d3e109de6" + "ID": "99e49225-55d3-4c11-bd64-13ac022fae89" }, { "CommandList": [ @@ -1003,12 +1003,12 @@ "Message": "您提交的工时超过任务预算工时，请修改后重新提交" } ], - "ID": "e5d63a8d-12d3-4288-842a-238ae431f6c0" + "ID": "49fb9e8a-3777-4fa7-b8ee-2e22c33bc943" } ] } ], - "ID": "ec92978b-9d8f-49c2-83ce-6b57b0e83a14" + "ID": "8a76f746-659a-4947-9d28-556b0ada48df" }, { "CommandList": [ @@ -1018,7 +1018,7 @@ "Message": "任务不存在" } ], - "ID": "0439b829-1a9b-4b3b-b8c7-caa2a070e7d7" + "ID": "f761ebb1-2ed5-4a34-8c9a-46a9473fa465" } ] } diff --git a/Tables/项目/项目平行视图.json b/Tables/项目/项目平行视图.json index 9dcf3982..057a281e 100644 --- a/Tables/项目/项目平行视图.json +++ b/Tables/项目/项目平行视图.json @@ -120,8 +120,7 @@ "operationTypes": 13, "dataFilter": { "$type": "Forguncy.RbacPermission.Core.Impl.Data.RowFilter, Forguncy.RbacPermission.Core", - "userFieldName": "项目经理", - "filterType": 1 + "userFieldName": "项目经理" } }, "dataPermissionType": 2, @@ -131,20 +130,6 @@ "财务" ] }, - { - "$type": "Forguncy.RbacPermission.Core.Impl.Data.DataPermissionBinding, Forguncy.RbacPermission.Core", - "config": { - "$type": "Forguncy.RbacPermission.Core.Impl.Data.RowBindingConfig, Forguncy.RbacPermission.Core", - "operationTypes": 13, - "dataFilter": { - "$type": "Forguncy.RbacPermission.Core.Impl.Data.RowFilter, Forguncy.RbacPermission.Core" - } - }, - "dataPermissionType": 2, - "roleNames": [ - "FGC_LoginUser" - ] - }, { "$type": "Forguncy.RbacPermission.Core.Impl.Data.DataPermissionBinding, Forguncy.RbacPermission.Core", "config": {