From dd84af267fb3ab58b9bad3fdd1293373059c83a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B6=85=E5=93=A5?= Date: Thu, 20 Jun 2024 17:52:56 +0800 Subject: [PATCH] =?UTF-8?q?{"Message":"=E6=A0=A1=E9=AA=8C=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E6=95=B0=E6=8D=AE=E7=BB=9F=E8=AE=A1\r\n=E6=95=B4?= =?UTF-8?q?=E7=90=86=E4=BB=BB=E5=8A=A1=E5=88=97=E8=A1=A8=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E6=98=BE=E7=A4=BA\r\n=E6=B5=8B=E8=AF=95=E5=B7=A5=E6=97=B6?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=E3=80=81=E4=BF=AE=E6=94=B9=E5=B7=A5=E6=97=B6?= =?UTF-8?q?=E3=80=81=E5=AD=90=E4=BB=BB=E5=8A=A1=E6=A0=A1=E9=AA=8C","Messag?= =?UTF-8?q?eType":2,"Modules":[{"State":1,"Type":7,"Name":"Table/=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E6=88=90=E5=91=98=E8=A1=A8"},{"State":1,"Type":7,"Nam?= =?UTF-8?q?e":"Table/=E4=BB=BB=E5=8A=A1=E8=A1=A8"},{"State":1,"Type":1,"Na?= =?UTF-8?q?me":"PCPage/=E4=BB=BB=E5=8A=A1=E5=88=97=E8=A1=A8"},{"State":1,"?= =?UTF-8?q?Type":1,"Name":"PCPage/=E4=BB=BB=E5=8A=A1-=E5=9F=BA=E6=9C=AC?= =?UTF-8?q?=E4=BF=A1=E6=81=AF"},{"State":1,"Type":1,"Name":"PCPage/?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1-=E5=B7=A5=E6=97=B6"},{"State":1,"Type":1,"Na?= =?UTF-8?q?me":"PCPage/=E6=96=B0=E5=A2=9E=E6=8A=A5=E5=B7=A5"},{"State":1,"?= =?UTF-8?q?Type":15,"Name":"ServerCommand/=E4=BF=AE=E6=94=B9=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E9=A2=84=E7=AE=97=E5=B7=A5=E6=97=B6"},{"State":1,"Typ?= =?UTF-8?q?e":15,"Name":"ServerCommand/=E4=B8=8A=E6=8A=A5=E5=AE=9E?= =?UTF-8?q?=E9=99=85=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":15,"Name":"ServerCommand/?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=8F=91=E8=B5=B7=E6=B5=81=E7=A8=8B=E5=89=8D?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C"},{"State":1,"Type":23,"Name":"TableView/?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=B9=B3=E8=A1=8C=E8=A7=86=E5=9B=BE"},{"Stat?= =?UTF-8?q?e":1,"Type":31,"Name":"UserControlPage/=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E4=BF=A1=E6=81=AF"}],"Version":"v1"}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .collaboration | 141 +----- Pages/任务/任务-基本信息.json | 54 +- Pages/任务/任务-工时.json | 7 +- Pages/任务/工时/新增报工.json | 19 +- .../项目首页/项目首页-容器页面/任务列表.json | 48 +- ServerCommands/任务/任务发起流程前校验.json | 54 +- ServerCommands/任务/修改任务预算工时.json | 92 +++- ServerCommands/工时/上报实际工时.json | 474 ++++++++++++------ ServerCommands/工时/分配任务工时.json | 40 +- Tables/任务/任务平行视图.json | 442 +++++++++++++++- Tables/任务/任务成员表.json | 3 + Tables/任务/任务表.json | 1 - UserControlPages/任务统计信息.json | 132 ++--- UserControlPages/任务统计信息.rd | 2 +- 14 files changed, 995 insertions(+), 514 deletions(-) diff --git a/.collaboration b/.collaboration index 57519e6c..1eae0b16 100644 --- a/.collaboration +++ b/.collaboration @@ -84,16 +84,7 @@ }, { "ModuleName": "Table/任务成员表", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-20T15:14:42.5261835+08:00", - "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\任务\\任务成员表.json" - ] + "ModuleType": 7 }, { "ModuleName": "Table/任务状态", @@ -101,16 +92,7 @@ }, { "ModuleName": "Table/任务表", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-20T15:09:58.5529662+08:00", - "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\任务\\任务表.json" - ] + "ModuleType": 7 }, { "ModuleName": "Table/任务进展", @@ -576,19 +558,7 @@ }, { "ModuleName": "PCPage/任务列表", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-20T17:19:10.7982588+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务列表.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务列表.rd", - "Pages\\a3c94948c8a24e6a9d63fc05ebfd71f.json", - "Pages\\a3c94948c8a24e6a9d63fc05ebfd71f.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目工时", @@ -712,17 +682,7 @@ }, { "ModuleName": "PCPage/任务-基本信息", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-20T16:57:52.7237262+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\任务-基本信息.json", - "Pages\\任务\\任务-基本信息.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务-任务信息", @@ -738,19 +698,7 @@ }, { "ModuleName": "PCPage/任务-工时", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-20T15:06:27.9459214+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\任务-工时.json", - "Pages\\任务\\任务-工时.rd", - "Pages\\94f8bae36aee4ae7aec2a063ca731b1.json", - "Pages\\94f8bae36aee4ae7aec2a063ca731b1.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务-进展", @@ -798,17 +746,7 @@ }, { "ModuleName": "PCPage/新增报工", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-20T15:05:54.0019352+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\工时\\新增报工.json", - "Pages\\任务\\工时\\新增报工.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/分配计划工时", @@ -1048,16 +986,7 @@ }, { "ModuleName": "ServerCommand/修改任务预算工时", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-20T16:54:42.1477853+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\任务\\修改任务预算工时.json" - ] + "ModuleType": 15 }, { "ModuleName": "ServerCommand/移除任务成员", @@ -1085,29 +1014,11 @@ }, { "ModuleName": "ServerCommand/上报实际工时", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-20T15:41:25.544767+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\工时\\上报实际工时.json" - ] + "ModuleType": 15 }, { "ModuleName": "ServerCommand/分配任务工时", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-20T16:03:02.9739071+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\工时\\分配任务工时.json" - ] + "ModuleType": 15 }, { "ModuleName": "ServerCommands/项目", @@ -1998,16 +1909,7 @@ }, { "ModuleName": "ServerCommand/任务发起流程前校验", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-20T17:30:46.8678894+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\任务\\任务发起流程前校验.json" - ] + "ModuleType": 15 }, { "ModuleName": "ProcessItem/新增任务流程", @@ -2059,16 +1961,7 @@ }, { "ModuleName": "TableView/任务平行视图", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-20T15:10:08.4476818+08:00", - "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\任务\\任务平行视图.json" - ] + "ModuleType": 23 }, { "ModuleName": "Pages/任务/任务类型管理", @@ -2256,16 +2149,6 @@ }, { "ModuleName": "UserControlPage/任务统计信息", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-20T15:48:01.6901234+08:00", - "ModuleType": 31, - "ToRemoveFiles": [ - "UserControlPages\\任务统计信息.json", - "UserControlPages\\任务统计信息.rd" - ] + "ModuleType": 31 } ] \ No newline at end of file diff --git a/Pages/任务/任务-基本信息.json b/Pages/任务/任务-基本信息.json index 9c8fe380..de7c78c3 100644 --- a/Pages/任务/任务-基本信息.json +++ b/Pages/任务/任务-基本信息.json @@ -1038,42 +1038,6 @@ }, "Title": "校验中" }, - { - "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", - "ServerCommandName": "修改任务预算工时", - "Parameters": [ - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "任务ID", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-基本信息'!任务ID" - } - }, - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "新预算工时", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-基本信息'!L8" - } - } - ], - "ResultErrorCodeTo": { - "SerializeProperty": "code" - }, - "ResultMessageTo": { - "SerializeProperty": "msg" - }, - "ReturnPropertiesTo": [ - { - "ResultPropertyName": "新工时" - } - ], - "RefreshAfterFinish": true, - "CheckDataValidation": true, - "Disabled": true - }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", "ConditionAndCommandPairList": [ @@ -1103,7 +1067,7 @@ "BtnText": "知道了" } ], - "ID": "dc4329a0-ffc9-41bc-b3af-3fe09dc5001b" + "ID": "34ee0cf3-9956-4704-b50d-d02e85b383ef" } ] }, @@ -1117,7 +1081,7 @@ "Title": "计算中" } ], - "ID": "03f935c4-b172-48d9-aaf3-2bd9fb76e6de" + "ID": "aa050c91-0932-4a1a-a4b7-542dac6d02bd" }, { "CommandList": [ @@ -1143,23 +1107,23 @@ { "BindingInfo": { "TableName": "任务表", - "ColumnName": "分组ID", - "GUID": "21493c92-e8db-4eb4-b5d8-200b3ade5cf0" + "ColumnName": "父任务ID", + "GUID": "30596874-c8b9-489b-9a9a-605c4820def2" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-基本信息'!任务分组" + "SerializeProperty": "='任务-基本信息'!父任务ID" } } ] } ], - "ID": "4ab90d43-cb0a-4542-9e22-612da17423e0" + "ID": "1a1295b0-8429-4b8c-bcb8-157000bc7f81" } ] } ], - "ID": "0917de94-db17-43c7-b175-5b3dc6657009" + "ID": "bf422bbd-6f26-4b7a-9321-0c487e9274d7" } ] } @@ -2031,7 +1995,7 @@ } } ], - "ID": "53468bbc-91cc-4c9f-8b20-7473594156e7" + "ID": "9f60fe32-2ef8-4ae7-94e9-96fd1c1c9034" } ] } @@ -2170,4 +2134,4 @@ "Formula": "'任务-基本信息'!$C$12" } ] -}//1gjL0f5n9/FUPRNXPZWOIbaVcpyvAXsovBwCrvfimp2OxaCWJT4B/3ki+c35gHukbzsqbNaQFQ5yOodQflg0tUGlINk20YHcKy25byVWT0iavxGzvta5Bllhn44BoROyZ51OYjDwvudtDIcoCZLBEhJAMqDiYxussWVBrk4/3ZumX7WqPqzXwedsz34yyY8o/zpP3cqpoCABJtEjjJYAzBjowruJ9OUODOUXtWdL40hygkxsmyxqGxPJdgE9xCG1hNuHh5pETtnzGZ9Oap2z5kdtHXuSC2I+/TnnCWaRwtgyGJ863rKg1deWkdXNb1LQWrt4IecKgiGohI7LvO8j98juJeVyurrwSTjMXmuwMRltLm7aGwaKgVRT3Mb/hgysObozroAG25HGzaa5J08h1/vvhrh9xcIBTpMFBUiDMqBu6Tmw98m+z9qK1GNXzu0XxqCex16Gh//SQPJo5nOqaWwu9Zvh02YaZUICyhNveSJeqPAfbO8VpqcWXZ87rx7ojLLlssa3aopVX80cidcowpwr8KQ9RdLai4hc9EUdNtffgIj2JyHYPXnCa4E+iy10+B6Y2XBXWBhTOjuxFcy9nXSKsI8fWXp2Gx8X1yDBZB1hjBSlNC5xvCMLbo4hOd9o9jsbjPWO7uwQ1xT6Yrzw/xy0uQNIcg1JaXmRwEW0oB/z0d8crzjwIN4depxhrgDzIuc2XuamivUMa9bvE5byxe7MjlB4EUzxncX1FwjrPKUAEO6r4MNuFIPVmXuR5Te6Bu0FALU4/MZuEpz8ophHUi5ipJdl31S2bhGm288sJJPWwh5wk+ssWfyyfPB4/drJgIOLaz+y8hnkZGhbAj6yQ/013ry1puXK1FgRu8zo8TqDZpnxU34aWg5HkHMj+wK/YtcvLOP9X5pkGvXrJkUTUw==|920 \ No newline at end of file +}//U4Yf0OqwWVKiigJ4VonhDxMMUTLyUaUlWbZD7kqoYxh+aIPm0yL5Y12D/xO5xfq+fkQQxWP5u529ewS7Cw/8CujKGc1fEy3kvvK79Q3n1oC1kZ5RjxXzoXPgmBkspFudEC5nX/nKwP9rLjJy9Jfxbdlph09W/hFOwAs4O+Xr6T/U6+OjFW6C88YHPYsC98ksBo6jEUgAVosYnm/+04Qt8dtlI4SugUIbw0KAcurppegA9m11su15el7VqrpsgRRaYjKV3XgbAICsSHxhVKIwIadnHdFgOHbt6OHYb971kVMgMARS1aHn7/R2mg/JaLVNG1zHNeDUOtf8PeuuMWQIKdjE46/3lxcdx+ScYLijUtfe9/6+2DhFzPegA9zrnKy5WcF01S0wnr83QJd/mnq7VVA1JALjT6h5JL//sZ27xX+ZwwugfaC6cs02LVFuCScL/iceUHw/x1Tu1YADCHaoMyBpHdqYyg6MZa/7ckdG24Z/iTW669qGv7FEz/tWhxYKCFFHby2nIpOB5W3AP4549P7/1sV28TSdxIuLbjrAMCgUwNt630sOLFgCTFCCAdCdVui5LNxj+uxAHckeW0LEl45r8rqTZeNpVcJ7Gb/iFrQHR1k6yT6pxsn1TntBDPRSKBX8KF4aVw9ZpjYgsDOEVOKmjA3EgqFGmrHk1MLqscJFcrwgV/pPCcwLZUZhMyIjhdjvyGXngJosBbE+FT34KtlFQWn8qGXtf3bqsIXcH+6UMYiNHGQHgi0bBA56M32RxkAG1zRaCZmw8vAceuT/fda5DFm0KkW+MaDQnMRJ6/ao7QsiMkOPlekK1ZjUJLE5ywfVNHWRmg++FjRqlLtIhCoICDRa9yz3yGctLcDZEMt7LA7eNij6SKqddESnJMgVsOMgY5llLwrjM2xB0q6GoA==|920 \ No newline at end of file diff --git a/Pages/任务/任务-工时.json b/Pages/任务/任务-工时.json index ff262efc..38201a34 100644 --- a/Pages/任务/任务-工时.json +++ b/Pages/任务/任务-工时.json @@ -1057,7 +1057,6 @@ "5,18": 6, "8,2": 5, "8,4": 8, - "8,19": 3, "8,20": 2, "8,21": 3, "8,22": 3, @@ -1151,8 +1150,8 @@ "13,21,1,3", "1,1,1,6", "1,20,1,3", - "4,4,1,6", - "8,4,1,6" + "4,4,1,16", + "8,4,1,16" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -1261,4 +1260,4 @@ "Formula": "'任务-工时'!$V$14" } ] -}//2x+40Y4Tc3FuP0RmX3gPAKagDlKHUsxfSOEQocjSz/cr4W3kZzJXYbnm8WH3ke6/5rUh9utFKE8/xN962rLREreS6vsF+q0Hg8PaqBLJ1UmJPKBdB0Jo3tmEmXXyt6rgOBgQcvgN/9Jn5DSeHv4dhbv14g/RLLV8okG/IQ+9uWEw3utkstIKDbx4SmE/stuAFq7P0xVoO8uW2Xx1sLyeTFUp9DD9xqBAlfuJ758+NUCKQm+TzB1PF0CJZt8kFE4Lwww+FqfBzgHdoQQZ7qC5ORRIWtZ5ocR5egqGDqSs6ggkpimMlkV+gRRk/UITHAghA9MkFdJ2vCtLkohZxlRi2ErgoSFgDsCx8YtYPog45f267jHg+PrNmK2kEe57olyJ7qg/tzKaK7HpY+onQMYM2JiNTIr517keAfNCwdWVNvhWAP7y5Obo5gPmLuAt87guq0rlnn+XzAFHYbqcxCoVfmnq6dbgGztY50OMi7LZpCLnEQx1DpZKN5qEMWXiA+7wkZgaoYfrNOF2QxGibVlfO5vUO7uW4cpXCBnmVytFiOQy8Q8JvaqaO35ceFdEV0FgWfcn2SjaEHu8VBmQkRZ8sjcR4QlGs6AkgaZEdWsQ0AA5CbIVxzql4eNxmCusL/u988p0+rks2pr8ILrxZeOIw+u0COi1mPf4uH1f3FhY+HlDmLxkAQEt+Opq3jvUv3bJqMffAxSgJd2/fCWEkMBstS9F4AjoHdMJ/cvdl0LFbYFtq47tvbVwNTpip4BpgDaEZ1LKrrQWXecU4Sr3m0Ju650kqzXrHTAgPYIXWoo0fj22IuF5mW3PWucXHAguLEt+fhUmuoa6hifWqGrKr9hJjkf59MVhFyUWELYSJkiViciD0qAn2Up64Qa3OCJRiT1jYxRuMe0sY9IhzMSElRCrMQ==|920 \ No newline at end of file +}//9zLuxTHVdLB7AL/YSUS7D42It0cjGET8XFX8iZQiQ93wHZq4WD8CLg5NNN7TsAfsydfMfe7/K3eFIVaIoDsis6sxofo/ZV8Zuz4quRxK8W2W8jx4TqVIBpNw+p67FEJ9lY8VyfkKOyCagJF4QerU6Fg+w2T6TbSg7o45/XzjJ64RP5aCNTHilJYRrufjtbdGRqh1/6gUCl45waIMFcnTt29CVZraRyo+T7BeEq0on1bSixMD1F0ANqRBbJ+0V1e50q9w3N3JsZb6U5IyaL0aM2lG76p5hOpT/ZXrkEQjg4Sq2rmGKF6uZeXXL4izQc+xvzyaeC9p3deESiqvPXvkiHabo8ZKPsrklb9pb924nl9ipEy9G/PZDsERZP2pckD5S1EvieVhcPYiIzQ7Dk6YurJJc94l2IU4zaG+2KaCax0J/TOYBblo08jdaOl7lItRUG81RftNNoGTiBb24XAj4EkAzbeSY1b8PG1K987617jEmFI/4HejgWB3unH+TlDH6gBGcwkbP7hC4nvBDB87OL0z+4/6solV1AkHdpjABfmzefA2J8PunWzMBVh5elJsJtKWn1WGYcJQ3iHmVYXQ244JmLaowkNcA1NnHez5TWZttOAiKkbI+dgl2I9gogRw4dXLJkFwHFJpQce8E46lp1uQpSFj0ZSiZ7vmwJpX2tKguYHNfPmCbEi7ubMXyrO16Yjocom9olob6RY6EqUC/0mp/sVzIi61NW1EhH749onbrqgzpIsFTIl9URYNCaqNvh+WeT+4JLkzOnJaoHAPNdtcE8VoH778oZ7D2QbWx/jASQxIJg3i2FftOBN8j0pf95MlqQj0Yq8aHVR25p0jzkgA8M1aSOAujCfVXyUSKPYlbkA7lkNMBNm165F83G7Op/hC89meVKPjH5Uvp0x/fw==|920 \ No newline at end of file diff --git a/Pages/任务/工时/新增报工.json b/Pages/任务/工时/新增报工.json index c16efdef..53fc2679 100644 --- a/Pages/任务/工时/新增报工.json +++ b/Pages/任务/工时/新增报工.json @@ -277,6 +277,11 @@ }, "AttachInfos": { "2,1": { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "ID", + "GUID": "019e3811-0e54-4954-a930-a2a1a42ae526" + }, "CellType": { "$type": "ElementUI.SelectCellType, ElementUI", "CommandList": [], @@ -322,7 +327,7 @@ "TableName": "任务表", "BindingInfos": [ { - "GUID": "0d12b43d-6d98-4e6d-af5a-dcc86fe91b6e", + "GUID": "97c2655c-89f5-4a44-a037-566ea2030de0", "BindingInfo": { "TableName": "任务表", "ColumnName": "ID", @@ -331,7 +336,7 @@ "ColumnName": "value" }, { - "GUID": "bb7a15e2-b562-47d4-8a08-80db1654ae9c", + "GUID": "9f64faac-2146-46ef-85c8-7d8d88a96d55", "BindingInfo": { "TableName": "任务表", "ColumnName": "任务名称", @@ -359,8 +364,8 @@ "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", "ColumnBindingInfo": { "TableName": "任务表", - "ColumnName": "进度", - "GUID": "f1df6e65-db3e-4d71-8f3e-24958a07ec65" + "ColumnName": "任务状态", + "GUID": "a57def10-6e47-40cd-ac82-9c8b20a66dde" }, "Value": "2" } @@ -1665,7 +1670,7 @@ ] } ], - "ID": "b3259605-824b-4955-8c52-d863e2092362" + "ID": "e4c8b3e1-5d76-400f-9265-bce0e9deba1d" }, { "CommandList": [ @@ -1682,7 +1687,7 @@ ] } ], - "ID": "4a3ed7b8-6e28-4362-9591-f0495e6ece3d" + "ID": "d36f801e-e273-47fd-8939-400188a3e644" } ] } @@ -1751,4 +1756,4 @@ "Formula": "新增报工!$B$30" } ] -}//TldC9z1L/ikiCEHdYRtj40FpWMz4HZcEW6OGxZ5N76mZbORH3etFGk8Snq/OsZycYRaUlpeupXFRngNUOLs9DqxHeCpz7CpPrLUdhruxt+hK4AvpiOPfe+y/j1URpXGgfbwyWQ7Y4MtjQwTUK5wtvIBTykcnMhBZnM8PU+33thLkHHykjAP620CWBMnvhQEC7s5AUMH7/Rja2gm3rWPv/XrM4zvS3cYGzTZ7BzI/NkE/W+GJiMQ28Oyz1IVupAzRElyNQ/vmHxAyDDnTN+HIn1YuEI5lxpAMYnL/ixNaQ2ecc7WdSJw1/7NPXh4KpbvRXi5xfPQ1A7VC61Jc95bZ5cv4LX1Lv/HpTB6XX2ry6KvYhHvJdkr5v8oybg4Beb930Id65yZUtVGApUVETDtUThGIYGANE4vOiTEYcgHK8MIHjF7iEY/wthjUERrESidLT15IQUjXUzeITC1eV0t8168yTdfOKyCHNHFNGzR1VNY1271pJbLBsSUtBeyOFFqH0FyCFactuSVfFgNTeCdbPZDlzzI0UKipl22AeFJnF+b9Yp5MG2XE7jL2zqgRgi1u9EszzayU7nu5K8g1HcwbSLE6+LhQhM43D0n3cBlZ7AjMfbYfvZlQz0LfdRF2y3is88HsU02j9EzTCkEmmg8sey4Xeaxwa251ZsSm3hKAao7+7uzkw2zUE1mljRYOoPrJj5JB4GemN84uA1QNHDcUxnWtB0mTOrg0XtbjrTrl1oQWyIqjlrFFgJJkcyrnCiigQeGQpcx7t+ytWRn6DDrH5ViDlNw1bTFoSxACOVv0jl8hy1ZV8IB7poS9Y6iDL1asVrz/YMpKAqfex+ybg+NK8/pyMz6M2X7q9XQuv/W8aUvWwTI2hae/m9I1WGtBLwPZRC5VHJYrGZUFV1TOfEAmoQ==|920 \ No newline at end of file +}//H9euG2JZx9J972MAq3JCplMuR5w0VFwUT931LJWI5HbUB/0aKqRl11XKWHJfvtXX3X0kYDgEo7dx/Fo28+eSO7ku3Q9WTDWWuiH91Sn2bXZU0kLlqoZ6hEzUXDOvc8NWw4vgDlvWjRgxZkyKAviiMIeCyJ+fDg2IAvy7zDV9D+2EQaPLO5p81Dh3J9eQlGu+cDq0yO/HINezNJWhUdQZ594duLqMhhTufBmpGdfQJvrEi3v1hMh+N99UBnlZkoU4O8TsQ8GMHfaovDG4dlZ26YmtFQbwwmtDkeW19xmfoId/tXuNKE78qtPIfQy6A6bwL6ls4kRuVeVxo9zJVnNCQcIySGNSEm8eVyCQd6UePMWal8EDDrVpbwc/2MNFiJdnn8MuAxdncKbDHpOrX6k9nxHhYA/xAopH5f2G+6mz+k6jZaIj2ku9JQWys+475LT01Jr0WFvqBsoy+cRovqBbhXO7dpn5ROxBQtLGK24kAR7EGHbQ1z5+qiJRs9iyeuOxhnOnq2qY+2DoSNSqvO/fybOsKV/1IeK/lPpNTiCI2qqdJdrAx/l5JDD1/RSYXYl6FTp1KW/KHEwhnLY7ZjMS4/hnbn3U7KFmhKMo+VPadht99o/1etYjSliacLVfHEJpSXVWgAt9YfwnYq9dZqMkgTnJp5sN3m8BFBhc9arEUQgiXdDT1i8YVE3DEmvaB22CWXgW9E0io19XEYBSTLhY8/5URQPguY0uJpu6BF4ucuqXd6/4a6088rRMxnyVytbRryiire5kgasHcsQsnnvioLGbTdv31WJy79ImAWJPbknyyxqDvkD0jIcLB4hFSXwCRl0rLPItvAKv3P/3q/wkTRcGCBWN3jMJraUt0d2X5FlcbX3Kvfmet1l/oXdJEYv1EBv9ZmkjDruZzCE4c3EBSQ==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/任务列表.json b/Pages/项目/项目首页/项目首页-容器页面/任务列表.json index 2d1bc406..814c6121 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/任务列表.json +++ b/Pages/项目/项目首页/项目首页-容器页面/任务列表.json @@ -842,7 +842,7 @@ "TableName": "任务平行视图", "BindingInfos": [ { - "GUID": "d7ed0f9c-4001-4ede-a5a6-96eab431e5dc", + "GUID": "e2370d2d-25e8-432d-871f-72c15d39d495", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "ID", @@ -851,7 +851,7 @@ "ColumnName": "value" }, { - "GUID": "b60ed274-ef2f-44b1-92cb-e219c2ca5ddc", + "GUID": "c406a1c2-fdf3-4465-b517-5f9c8a3dbee6", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "父任务ID", @@ -860,7 +860,7 @@ "ColumnName": "parentValue" }, { - "GUID": "fe47ca99-f8fe-46ab-9862-67a2c93ee296", + "GUID": "64e866ed-b4f5-4f0e-9eac-d5be0f3c7963", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "任务状态", @@ -874,7 +874,7 @@ "ColumnName": "状态" }, { - "GUID": "6dd8b80c-ccc5-43cb-ac97-b8cc419057cd", + "GUID": "74e90e08-ed97-4f46-b84f-d532be4b10f7", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "任务名称", @@ -883,7 +883,7 @@ "ColumnName": "任务名称" }, { - "GUID": "8ecf96d2-8fad-44b4-8bb9-2802422fc5b1", + "GUID": "87a49a06-37af-4927-a38f-ef899eeff696", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "任务负责人", @@ -896,7 +896,7 @@ "ColumnName": "执行者" }, { - "GUID": "d90f1c6e-887e-4d2e-83c2-d6ecc43e75f7", + "GUID": "c62dabad-5ed2-476f-8900-13b11082a9ac", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "开始时间", @@ -905,7 +905,7 @@ "ColumnName": "开始时间" }, { - "GUID": "c0ac1142-da7f-4621-a726-a62a137f8215", + "GUID": "3abba67a-cebe-4049-9942-c7a86e02421a", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "结束时间", @@ -914,25 +914,25 @@ "ColumnName": "结束时间" }, { - "GUID": "a413be4b-5b46-49e4-bba6-545b1e71fccb", + "GUID": "534a7107-43fd-46d5-be78-db032339ea23", "BindingInfo": { "TableName": "任务平行视图", - "ColumnName": "已分配工时_总分配工时", - "GUID": "3cc97be0-d9e6-4d8c-8917-9deab5db5201" + "ColumnName": "任务预算工时", + "GUID": "05964686-6f47-45f3-8630-1823762134d1" }, - "ColumnName": "已分配工时_总分配工时" + "ColumnName": "总计划" }, { - "GUID": "27181efb-41fa-408f-a565-e04aee5da537", + "GUID": "d255211e-f6db-4254-a7b7-a5927e6e9067", "BindingInfo": { "TableName": "任务平行视图", - "ColumnName": "总核定工时_已分配工时", - "GUID": "0014444c-201a-4d2e-88b1-57a0264fbbc9" + "ColumnName": "动态可核定工时", + "GUID": "9cf417f9-ee6f-4f0f-91f4-b658f5668dd8" }, - "ColumnName": "总核定工时_已分配工时" + "ColumnName": "剩余" }, { - "GUID": "f61ade6f-6499-4f27-ba63-984e4eced8a6", + "GUID": "7d3089d9-b27e-4d84-94f3-bbcebf2c4eb9", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "成员数量", @@ -1031,8 +1031,8 @@ "执行者", "开始时间", "结束时间", - "已分配工时_总分配工时", - "总核定工时_已分配工时", + "总计划", + "剩余", "成员数量" ] }, @@ -1083,16 +1083,18 @@ }, { "$type": "ElementUI.VirtualizedTableColumnSetting, ElementUI", - "DataColumnName": "已分配工时_总分配工时", - "Label": "已分配/总分配", + "DataColumnName": "总计划", + "Label": "总计划", + "FormatStr": "0.0 \"小时\"", "Fixed": "none", "Align": "center", "HeaderAlign": "center" }, { "$type": "ElementUI.VirtualizedTableColumnSetting, ElementUI", - "DataColumnName": "总核定工时_已分配工时", - "Label": "总核定/已分配", + "DataColumnName": "剩余", + "Label": "剩余", + "FormatStr": "0.0 \"小时\"", "Fixed": "none", "Align": "center", "HeaderAlign": "center" @@ -1617,4 +1619,4 @@ "Formula": "任务列表!$K$6" } ] -}//3v3mLrQW/hzONktvYrVMjYYR43MEyV5uWPAEZ6Vbo5S1fzbdF2fLKfPW72AhmFM4FeIDGpsHtvgjjIYP4YeSWLuW5lsZizwB9SOLhSHkFCkSFwD+nm4plE48YX+Fj0wqERER7R9PG6KCZzzi5BPTEAH1zd3MGHfyPmvbtd+krRqRmMV3E05Oi6tfXgzCyvw6z4f4426QhRGkW1j7hkdgbJG3SfSSNIwL2r7r6GLEdxgWN0alwhFwUEs5o2L7y8HoXUcrNmFRh7cpqZxul6x0A6DV5MaKzwBmWf9nJcA+f6NX2C5pl2M4nxU2/gTwHce967YRx/wTDP8SS2Yrz6nRpBbnDWJAd3B6O7Xo3N0/iX1RlBr1n3fZF2IMRx92MV00idXS7ubvTAeONgNHy7/Yvg47rpGGe3WGwyRkEkN2p9XEjr087q5Tj4uyXTxK8ISh+sekPHJYdyoToMk9iE1/NjGCX9NuWfuj7VPukLfFmMXizF327rsnxzqtOB+IQfqAEBtKwnq7DHxG7vfVNDzEFo9o7x7kYIcOOIttUkppiKM1r9PmPk2K+QRUJoTLDqzzChCnDYpdfOudhbGTS/5hxoZ3Bj4uWAXdP+HQnzUCAJApR9A7zo3n7K5aCRZL/XcMYcG9kjHyWse5aPv4kQyJehZaoG56Y13DtibwMB/G9lPmiLnB34LJCNM1y273yBwLaxLBDu++QyBLtN8tUDTTCJcJPr4eEP/1pWXbUwaNImZnyIfQ6X1aUjFwI9Q9ZY5izb81gyd72gnO4gfRsCmEK0LywqA/G22MREdrZsfBUDF8jWidE8H2gPAmfiRp+n+SwfdmfCIvr0A9dKR8coWfM8zyBzV1xCiZLi83gUhxqGtzYxFM26QpNsNnS3bZztYOdvklljj8CXDiJAumpwLIiA==|920 \ No newline at end of file +}//+I9k+q5uoLJfH4B5cns+TI+sAjiTNAhFhwzDiwFoT1l6a3eyXXX2GhwN/OgynyVnWMAq0kwWzzwbFTJ18nsXx3exPE86qYIHSL+zdINHGS3vPLv1K+2I5VNH5npf2DZUdEPRu1lcz4OUFo0dW9d6GH9k0cLhJ2s0VB1uqK7L7GSGqLatNDTCCBytJ2n4iPfr9Z/02rMtvMEYdm430q6DKx+SdbHzuI0hRVaHitQun66yEGWJqHZKQukyxKEuKS7POiRolfSVn92pARzOCliNs7aNqdUAWvkWKxNuq3CYsgglU0H0ByQnf8t67iVcQWyMQ2y6T9z6EQ6eN6tXo0avDDIFgBU/az8/Ounj4SE8gjcmBRxu1x/AcF/y1csIjxFYUp669qV7U98Z1TSnflrIdy7kiIbzo3uS9Pw8skryEAa17Ign7/GolS2RbOY01JMB0GjgxYaS2w41v8amZVvPSS5IH4FuZnK2v7J5nCnS2Fa+v+AYXBH5ARjY/CDtuTQUsTtHG0qI6vzaZVN9QXwrpXafrQhz5dh9WkRoarpHldxM1CN/QLpab5h6xdtWaxG+HfUEdGKOyacumkDWS75qtA1NzHfKSXlqI4Bm7Rm01RNXYVn96sfe0+VD3i4KTijiEW5kJ9XBjDb1ywkyUdhj1v+BFOEsA1w707kEuB1g769iIWPd4drrbVc37incOK+ZZdf0laVCK0olt4uVrbksOKrPCwPesAdPFE04OhIUz5QYv6ChKf5tVunMyIfPkU5f1DZJZi2k8V6b0GhjmeKB0wL+Bfj/VXFZ9fAbsDmPyii9ZuObwxXb+gpV/Gzm2oDPL6G8ejfnqvKhpB9Oiw5uy52QsjgjgA0KQak2zkfz3KRHEq2pOetz+eUHT3u9NNc5XvSlGUR+ld56JiZqcrUr7A==|920 \ No newline at end of file diff --git a/ServerCommands/任务/任务发起流程前校验.json b/ServerCommands/任务/任务发起流程前校验.json index f8a5f21c..10217ddd 100644 --- a/ServerCommands/任务/任务发起流程前校验.json +++ b/ServerCommands/任务/任务发起流程前校验.json @@ -43,7 +43,7 @@ "TableValueType": 1, "BindingInfos": [ { - "GUID": "cc7c64c9-d547-44f8-a74c-d809c42cf5f6", + "GUID": "f2d81556-ab55-4731-87c8-2ef6dc3b8390", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "项目ID", @@ -52,7 +52,7 @@ "ColumnName": "项目ID" }, { - "GUID": "fa36557e-c629-4282-9a76-ec532265aff8", + "GUID": "6b5a65e5-2d38-4552-8325-29978f5bf07c", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "项目ID", @@ -66,7 +66,7 @@ "ColumnName": "严格模式" }, { - "GUID": "7bbe0367-afcc-4774-b788-a5b7f4992c13", + "GUID": "3b6b6225-a8f2-4428-ac2b-5bacc8aeff24", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "项目ID", @@ -80,7 +80,7 @@ "ColumnName": "项目可分配工时" }, { - "GUID": "ebbc1500-2450-4da6-a039-432646d2a57d", + "GUID": "93b3deac-ce8a-4163-b369-da71413992d3", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "项目ID", @@ -94,7 +94,7 @@ "ColumnName": "项目经理" }, { - "GUID": "b0a82edb-12b8-469b-b9fb-e43874e280b8", + "GUID": "f416e1d1-3931-4f6e-9b99-28911cb1368b", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "任务名称", @@ -103,7 +103,7 @@ "ColumnName": "任务名称" }, { - "GUID": "2cf83bd0-7a9b-49ec-9cf9-d93af702d011", + "GUID": "395821a1-25a2-45e1-9bf6-e701c2d97ef6", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "任务负责人", @@ -112,7 +112,7 @@ "ColumnName": "任务负责人" }, { - "GUID": "02e3c579-ae91-4da8-b60a-3200dd4753fd", + "GUID": "02361f6b-cdca-423f-8e4d-3db1023d8c65", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "任务负责人", @@ -125,7 +125,7 @@ "ColumnName": "任务负责人_全名" }, { - "GUID": "205ad391-8767-4d08-a3de-a11add4eb703", + "GUID": "25f0ac07-cd61-4518-a914-9e0a3f2b97b0", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "任务预算工时", @@ -134,7 +134,7 @@ "ColumnName": "任务预算工时" }, { - "GUID": "3352d607-f8ee-4059-bc16-8393a33c3db4", + "GUID": "f26bf7ca-95bf-4f22-9095-489d2762c417", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "任务类型", @@ -143,7 +143,7 @@ "ColumnName": "任务类型" }, { - "GUID": "d6d1da58-1e04-4af9-9854-6a786b9c61fb", + "GUID": "9dba06cb-c256-4b07-b09d-ab48d689fb3b", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "版本", @@ -152,7 +152,7 @@ "ColumnName": "版本" }, { - "GUID": "e9452e89-1aad-458d-89ce-f61679398c07", + "GUID": "1f550c76-91e1-4716-8b59-7db72099ff34", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "任务状态", @@ -161,7 +161,7 @@ "ColumnName": "任务状态" }, { - "GUID": "5783df06-a66a-4418-950d-dfd0642fea8b", + "GUID": "d1c1cddf-db47-4d81-9165-54a2f2a0b974", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "流程实例ID", @@ -170,7 +170,7 @@ "ColumnName": "流程实例ID" }, { - "GUID": "f0e8274f-9608-4778-9d66-eb8d36aa8b90", + "GUID": "6be8e55b-4f64-4b06-9512-cb11970c3541", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "父任务ID", @@ -179,7 +179,7 @@ "ColumnName": "父任务ID" }, { - "GUID": "2dcd075c-85a3-4a82-bbbb-ad88cd31deb6", + "GUID": "4207d524-41af-48ee-8e0a-9e7bbd3153b1", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "父任务ID", @@ -193,7 +193,7 @@ "ColumnName": "父任务可分配工时" }, { - "GUID": "3befa333-23eb-4d29-a85d-b245af4f64c9", + "GUID": "c3efe081-b843-4300-9b80-5f55da0f8e34", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "父任务ID", @@ -221,7 +221,7 @@ }, "TopCount": "1" }, - "ID": "eb8bc078107346f9835e245f468fb303" + "ID": "e8265f2c785c461b936a8cf4271090f0" }, { "$type": "Forguncy.Model.ProcessInstanceCommand, ServerDesignerCommon", @@ -275,7 +275,7 @@ "Message": "请等待父任务审批后方可发起！" } ], - "ID": "f7a26904-1155-4d52-ba96-aeee4148bbe9" + "ID": "0be8de78-c7c0-414b-9ea8-21bf727c7826" } ] }, @@ -301,7 +301,7 @@ "Message": "当前项目未指定项目经理，请指定后再试" } ], - "ID": "06c623ed-8d18-4376-868e-dd67dba49938" + "ID": "fbf23b28-53c3-4c6e-b04d-8fd2a22e6ff8" } ] }, @@ -327,7 +327,7 @@ "Message": "请指定任务负责人" } ], - "ID": "f51ef549-d53c-49d6-8b0e-e5ccb959508d" + "ID": "d0460f18-1d55-4c08-a921-b6e7b1a9fc0e" } ] }, @@ -353,7 +353,7 @@ "Message": "请指定任务类型" } ], - "ID": "21b2883d-3fc7-4742-9836-55c06e5d6a44" + "ID": "3a2ec4ad-512f-4ee6-93fd-b25226907433" } ] }, @@ -379,7 +379,7 @@ "Message": "请为任务指定版本" } ], - "ID": "f8d8b0c5-49fd-44f0-9e7d-e11c92dc30ee" + "ID": "f50a279e-15ee-4d37-82b6-25f971f78c6f" } ] }, @@ -422,10 +422,10 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=任务信息.项目可分配工时" }, - "ID": "b866a42a1fd14b288e0fa63d199220a7" + "ID": "0d5ac7332bf942d1998fe6e03c20481e" } ], - "ID": "1848cdd5-1953-445b-a507-e05cd778f940" + "ID": "1510307d-3f0e-4506-a698-da76ba49d1a3" }, { "CommandList": [ @@ -436,10 +436,10 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=任务信息.父任务可分配工时" }, - "ID": "bac8fd9431a640f4836d285d9ecbd597" + "ID": "b1aff090a96e4e618b49838429706ff5" } ], - "ID": "f089826f-d44e-49bf-bc54-10568e049f17" + "ID": "f620c048-3338-49db-99c9-19ab316aa4d1" } ], "Comments": "严格模式下，根据是否有父任务来计算本次预算工时的上限" @@ -473,12 +473,12 @@ } } ], - "ID": "99facc91-cdee-49ee-a352-553cf939e45c" + "ID": "8bd11489-d35c-4d5c-bd1f-dc8767600961" } ] } ], - "ID": "51e1b7bb-21be-4bbb-8c1c-480c746a9e36" + "ID": "743e50f1-e5d4-4c01-9c28-f609accef155" } ], "Comments": "校验工时情况是否通过" diff --git a/ServerCommands/任务/修改任务预算工时.json b/ServerCommands/任务/修改任务预算工时.json index 73753c42..bd8db74c 100644 --- a/ServerCommands/任务/修改任务预算工时.json +++ b/ServerCommands/任务/修改任务预算工时.json @@ -45,7 +45,7 @@ "TableValueType": 1, "BindingInfos": [ { - "GUID": "be2a7c85-71fb-4976-9af2-507b573c92d6", + "GUID": "fcf545b1-38fb-4a2e-b3e3-1f4af870ac2f", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "项目ID", @@ -54,7 +54,7 @@ "ColumnName": "项目ID" }, { - "GUID": "4a1fe1bc-8729-4b6a-881f-bd2eb810527b", + "GUID": "6835a1c1-53c9-4289-8d3f-dc5985f34647", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "项目ID", @@ -68,21 +68,35 @@ "ColumnName": "严格模式" }, { - "GUID": "af5ce581-9c03-4823-a5f7-e60ba0f56d62", + "GUID": "ef21deed-1d60-41be-ae93-47447bc963f8", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "项目ID", - "GUID": "589e85bb-a515-4946-bbba-0fd990283805", + "GUID": "4e99fa55-723f-48b8-955c-5595ae187aa6", "RelationBinding": { "RelatedTable": "项目平行视图", "RelatedColumn": "ID", - "DisplayColumn": "项目可分配工时" + "DisplayColumn": "项目预算工时" } }, - "ColumnName": "项目可分配工时" + "ColumnName": "项目预算工时" }, { - "GUID": "2f207def-1824-4e7e-9d3c-d85442d4ada5", + "GUID": "d677bdc0-525e-4549-a8cb-4c982387db0d", + "BindingInfo": { + "TableName": "任务平行视图", + "ColumnName": "项目ID", + "GUID": "09bc90b5-976b-41f9-ac1d-235435d37d0b", + "RelationBinding": { + "RelatedTable": "项目平行视图", + "RelatedColumn": "ID", + "DisplayColumn": "项目总分配工时" + } + }, + "ColumnName": "项目总分配工时" + }, + { + "GUID": "4c2824d0-cb98-4b5b-b05c-09e82046f1da", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "任务名称", @@ -91,7 +105,7 @@ "ColumnName": "任务名称" }, { - "GUID": "a4e87092-f4a7-463a-bfd8-49784aee4291", + "GUID": "60d2bc6f-c3b0-45f0-bbab-2dec192067ba", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "总分配工时", @@ -100,7 +114,7 @@ "ColumnName": "总分配工时" }, { - "GUID": "f2e98909-a670-46b0-96d5-48fcbc7f404f", + "GUID": "05d16810-fc64-4712-8fb4-0836a53b995c", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "已分配工时", @@ -109,7 +123,7 @@ "ColumnName": "已分配工时" }, { - "GUID": "f751f581-8165-4008-9483-6a81f235fb1f", + "GUID": "8fd091d2-15b2-4d23-b8ef-7527ff211841", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "父任务ID", @@ -118,11 +132,11 @@ "ColumnName": "父任务ID" }, { - "GUID": "99d812f4-55d1-4297-b6f6-37ea4cf3097e", + "GUID": "288b89c9-f815-4a07-b151-9d4959a1712f", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "父任务ID", - "GUID": "7fa493a6-7867-4a57-bc91-7c846e7a4b76", + "GUID": "982feecb-8da9-46e9-99a4-0e7a4e599de3", "RelationBinding": { "RelatedTable": "任务平行视图", "RelatedColumn": "ID", @@ -130,11 +144,41 @@ } }, "ColumnName": "父任务可分配工时" + }, + { + "GUID": "55d60ec7-dfc4-4ef1-8341-43476395b337", + "BindingInfo": { + "TableName": "任务平行视图", + "ColumnName": "本任务已分配工时", + "GUID": "d0b307f8-9206-4597-a5cf-4ecb4e3c27ea" + }, + "ColumnName": "本任务已分配工时" } ], + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务平行视图", + "ColumnName": "ID", + "GUID": "8ed8daac-ea2a-4392-86e2-4c91c582a7b1" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务ID" + } + }, "TopCount": "1" }, - "ID": "7106ec79fbd74d16a4200f5775065b5a" + "ID": "f9f427e2e0a249908d9c7ebc509143a3" + }, + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "项目可分配工时", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务表.项目预算工时-任务表.项目总分配工时" + }, + "ID": "23a8904191ab4dc486ac16c1ba70cd5b" }, { "$type": "Forguncy.Model.CatchExceptionCommand, ServerDesignerCommon", @@ -171,7 +215,7 @@ }, "value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务表.已分配工时" + "SerializeProperty": "=任务表.本任务已分配工时" }, "compareType": 4 }, @@ -181,7 +225,7 @@ "ErrorCode": "400", "Message": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=\"任务已被分配消耗\"&任务表.已分配工时&\"小时，修改后工时，不可低于此值。\"" + "SerializeProperty": "=\"任务已被分配消耗\"&任务表.本任务已分配工时&\"小时，修改后工时，不可低于此值。\"" }, "CustomReturns": [ { @@ -194,7 +238,7 @@ ] } ], - "ID": "026c2ec7-65d0-4edf-b63f-f4811efbbbce" + "ID": "79242b1f-9c33-4caf-aebc-9ba3ba7eba3d" } ] }, @@ -219,13 +263,13 @@ "ParameterName": "上级剩余工时", "ParameterValue": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务表.项目可分配工时" + "SerializeProperty": "=项目可分配工时" }, - "ID": "a3983825d9f2443291e18e51a11fb868", + "ID": "0ef5c7f20704410eabf21c4b868fe64b", "Comments": "如果没有父任务，则将项目可分配工时+任务当前的总分配工时 （相当于这个任务没有分）" } ], - "ID": "e6a81e42-cfe2-4679-aedd-095c2e63bbd7" + "ID": "8caee967-34b5-40d2-bc46-63dce90f29de" }, { "CommandList": [ @@ -236,11 +280,11 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=任务表.父任务可分配工时" }, - "ID": "7178f06751f243fabad088261b05e67a", + "ID": "37e3b8c29aa54194a07548cd3ba217ce", "Comments": "如果没有父任务，则将项目可分配工时+任务当前的总分配工时 （相当于这个任务没有分）" } ], - "ID": "569ab419-0803-49c9-b7bd-e781ae76f27a" + "ID": "581e89a0-73f9-4549-b3e3-3f43273374a7" } ], "Comments": "严格模式下，根据是否有父任务来计算本次预算工时的上限" @@ -252,7 +296,7 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=上级剩余工时+任务表.总分配工时" }, - "ID": "8dffb4efb5bf4fac85b5b1e0b20a83f6", + "ID": "fc23623d44294e18935812304bbb80ee", "Comments": "上级任务剩余可用的工时+当前任务的总工时，相当于没有分给它" }, { @@ -289,12 +333,12 @@ ] } ], - "ID": "1013396d-e163-4e74-ba8b-802635b85aac" + "ID": "2b0f5f20-95fb-4a4e-ad23-a151636a3b61" } ] } ], - "ID": "09e64e05-f637-4227-a9cd-b0037d52dd86" + "ID": "91aec6fc-2961-4d7f-b928-44110700caba" } ] }, diff --git a/ServerCommands/工时/上报实际工时.json b/ServerCommands/工时/上报实际工时.json index 2f1b815c..f0701e5f 100644 --- a/ServerCommands/工时/上报实际工时.json +++ b/ServerCommands/工时/上报实际工时.json @@ -308,7 +308,16 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=核定工时" }, - "ID": "c1be037a352d4956b4a3e8ec240b20fe" + "ID": "3e3182753b7c4738ba3b1677f0a33da2" + }, + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "待分配上报工时", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=工时数" + }, + "ID": "04b93773b7d84e33b23af98da0891576" }, { "$type": "Forguncy.Model.ServerTransactionCommand, ServerDesignerCommon", @@ -426,29 +435,47 @@ "CommandList": [ { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "计算本次分配工时", + "ParameterName": "计算上报工时", "ParameterValue": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=ROUNDUP(核定工时/分配天数,1)" }, - "ID": "cff28432d5014558ac644801dc83bcd4" - } - ], - "ID": "2314f0bf-605f-4995-9ad9-bfa5472c8bd8" - }, - { - "CommandList": [ + "ID": "6861c18abaae4a64b85f27614c4c6480" + }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", "ParameterName": "计算本次分配工时", "ParameterValue": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=ROUNDUP(待分配工时,1)" + "SerializeProperty": "=ROUNDUP(核定工时/分配天数,1)" }, - "ID": "51d76eb5504747bea615fccffb11a13d" + "ID": "34efaeaa449044baadb2591bdb778751" } ], - "ID": "17de5519-67a1-4f83-9cb1-449b7ad3bc88" + "ID": "a8aa1415-d49c-4539-83f7-c58187550c22" + }, + { + "CommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "计算上报工时", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=待分配上报工时" + }, + "ID": "6cab8652a3e24a3b8b5892d1b1aa96de" + }, + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "计算本次分配工时", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=待分配工时" + }, + "ID": "737f988cc853421ba2604b8663caa91e" + } + ], + "ID": "56cdb439-0a71-429f-984c-cd071878c6cc" } ] }, @@ -465,7 +492,7 @@ "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", "ParamObject": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=统计工时.总实际工时+计算本次分配工时" + "SerializeProperty": "=统计工时.总实际工时+计算上报工时" } }, "value": "24", @@ -524,13 +551,13 @@ "ParameterName": "本次核定工时", "ParameterValue": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=IF(计算本次分配工时>(个人工时情况.总计划工时-个人工时情况.总实际工时),(个人工时情况.总计划工时-个人工时情况.总实际工时),计算本次分配工时)" + "SerializeProperty": "=IF(计算上报工时>(个人工时情况.总计划工时-个人工时情况.总实际工时),(个人工时情况.总计划工时-个人工时情况.总实际工时),计算上报工时)" }, - "ID": "82d3168ea8de46269eb8cb8d04263bc9" + "ID": "8d491a5ef74f4ee897d8f9bb342947c2" } ], "Comments": "如果是按天分配，则需要检测这一天的实际工时是否超出，", - "ID": "8e1f5f08-5161-44f0-8b85-769226d15d7e" + "ID": "62e86d54-b241-4ab6-a941-9fd46c076b1e" }, { "CommandList": [ @@ -539,138 +566,278 @@ "ParameterName": "本次核定工时", "ParameterValue": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=计算本次分配工时" + "SerializeProperty": "=计算上报工时" }, - "ID": "3b52a13937d84916b9d9d54635e2270c" + "ID": "0ded4e0b74d841e3b3fd855e20f27dac" } ], - "ID": "01636c53-f2ca-4c1a-9cde-44a709781fef" + "ID": "6c639e39-5c5c-4876-8d3d-32f09bfdccde" } ] }, { - "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", - "TableName": "任务工时表", - "UpdateType": "add", - "ShowConfirm": false, - "UpdateBindingValues": [ + "$type": "Forguncy.Model.ServerTransactionCommand, ServerDesignerCommon", + "CommandList": [ { - "BindingInfo": { - "TableName": "任务工时表", - "ColumnName": "项目ID", - "GUID": "b769367b-ed5b-431e-b215-c1deeac30f51" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务信息.项目ID" - } + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "任务工时表", + "UpdateType": "add", + "ShowConfirm": false, + "UpdateBindingValues": [ + { + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "项目ID", + "GUID": "1e6fb738-3d19-4d3c-904d-684484bafc09" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务信息.项目ID" + } + }, + { + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "任务ID", + "GUID": "ecc713dd-73a0-45fd-8bcf-6d9c9445aac9" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务ID" + } + }, + { + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "工时日期", + "GUID": "09fa556e-186d-4a19-aa8c-61eba375f451" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=当前日期" + } + }, + { + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "工时类型", + "GUID": "2a32b811-3757-4b98-a2da-6e13e005db65" + }, + "Value": "实际" + }, + { + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "执行人", + "GUID": "7d0a64a7-d3a7-4094-b11c-f1c766c90848" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=执行人" + } + }, + { + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "执行内容", + "GUID": "089f52bd-7282-4e46-9c79-8c7bd26eee77" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=进展内容" + } + }, + { + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "工时", + "GUID": "c32e5e67-dc6b-4655-b04e-cd87b97a2e64" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=本次核定工时" + } + }, + { + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "上报工时", + "GUID": "8dcd050a-f8b8-475a-bca7-9f5f7d0779ce" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=计算上报工时" + } + }, + { + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "时薪单价", + "GUID": "c6cad5a4-0262-484e-89f3-3f1324fb953f" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=计算时薪" + } + }, + { + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "提成系数", + "GUID": "172dc45b-dd32-435c-b260-7690334101cb" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=提成系数" + } + }, + { + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "时薪来源", + "GUID": "1a4391f0-206c-4a76-9d79-f5cd255b85be" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=时薪来源" + } + } + ] }, { - "BindingInfo": { - "TableName": "任务工时表", - "ColumnName": "任务ID", - "GUID": "dec98623-67dd-4c81-a24e-2f15d7c2614c" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务ID" - } - }, - { - "BindingInfo": { - "TableName": "任务工时表", - "ColumnName": "工时日期", - "GUID": "e72f9c26-62b4-46de-8fa1-c4ee0a7ebf29" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=当前日期" - } - }, - { - "BindingInfo": { - "TableName": "任务工时表", - "ColumnName": "工时类型", - "GUID": "5af4b16e-fe30-495e-999d-9bf946ac7749" - }, - "Value": "实际" - }, - { - "BindingInfo": { - "TableName": "任务工时表", - "ColumnName": "执行人", - "GUID": "f32490b1-8e5d-4595-b960-baa6887370d5" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=执行人" - } - }, - { - "BindingInfo": { - "TableName": "任务工时表", - "ColumnName": "执行内容", - "GUID": "8efab63a-5684-4be7-9daf-53ba1629eac8" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=进展内容" - } - }, - { - "BindingInfo": { - "TableName": "任务工时表", - "ColumnName": "工时", - "GUID": "12be422a-6063-40fc-a875-f8e01c176a33" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=本次核定工时" - } - }, - { - "BindingInfo": { - "TableName": "任务工时表", - "ColumnName": "上报工时", - "GUID": "cb8cb8d8-d865-493b-91b7-5cf4c4167d5d" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=计算本次分配工时" - } - }, - { - "BindingInfo": { - "TableName": "任务工时表", - "ColumnName": "时薪单价", - "GUID": "ba1bf86e-ef9d-4bd4-9a93-c96f83850200" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=计算时薪" - } - }, - { - "BindingInfo": { - "TableName": "任务工时表", - "ColumnName": "提成系数", - "GUID": "0c691d92-25a7-4381-a6d8-e85f04ee0041" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=提成系数" - } - }, - { - "BindingInfo": { - "TableName": "任务工时表", - "ColumnName": "时薪来源", - "GUID": "dfc2ba05-a453-404a-9872-267524c707fa" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=时薪来源" - } + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务信息.工时分配方式" + } + }, + "value": "3" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "任务工时表", + "UpdateType": "add", + "ShowConfirm": false, + "UpdateBindingValues": [ + { + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "项目ID", + "GUID": "961887ae-659c-4337-a98c-ae9e991f406c" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务信息.项目ID" + } + }, + { + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "任务ID", + "GUID": "1f066a99-5744-4544-85ac-0ab3dc160074" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务ID" + } + }, + { + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "工时日期", + "GUID": "c235fd62-1dbd-43cb-9bfd-432025656e03" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=当前日期" + } + }, + { + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "工时类型", + "GUID": "a67c10ac-aa54-4ffc-97e8-0375344361fd" + }, + "Value": "计划" + }, + { + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "执行人", + "GUID": "06dcce45-051c-4277-80b3-d67838a0bdbc" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=执行人" + } + }, + { + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "执行内容", + "GUID": "6fc34fb9-8e12-4abc-9b10-3b5eeeba365e" + }, + "Value": "系统自动生成对应计划，保证任务可分配工时" + }, + { + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "工时", + "GUID": "70556be8-7ff8-4b64-a6b7-666394855a59" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=本次核定工时" + } + }, + { + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "上报工时", + "GUID": "4be7efc6-344d-49e6-908e-ce772c45aa18" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=计算上报工时" + } + }, + { + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "时薪单价", + "GUID": "8972f0f0-9282-4ce3-9c3b-bb6079acce49" + }, + "Value": "0" + }, + { + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "提成系数", + "GUID": "b2920132-6d04-4ac1-9592-260e181e8ab7" + }, + "Value": "0" + }, + { + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "时薪来源", + "GUID": "8a0ff2f5-be57-4f51-b98f-c8675326fa3c" + } + } + ] + } + ], + "Comments": "如果是分配到任务，就补一条计划，保证任务可分配工时准确", + "ID": "8fe38375-41cb-4b5f-8ef7-ccda5129a297" + } + ] } ] }, @@ -679,12 +846,21 @@ "ParameterName": "待分配工时", "ParameterValue": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=ROUNDUP(待分配工时-计算本次分配工时,1)" + "SerializeProperty": "=ROUNDUP(待分配工时-计算上报工时,1)" }, - "ID": "1109a11b52d24ce892de81be12b029ce" + "ID": "0a87d0ac1625451caaae7de7289a1cd4" + }, + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "待分配上报工时", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=ROUNDUP(待分配上报工时-计算上报工时,1)" + }, + "ID": "dfe08a493a80498e8915bc2fe710ad21" } ], - "ID": "2ee034e5-adfe-4ea5-a165-1006467aa11c" + "ID": "0460ed6a-861d-4fe6-a598-b8c5c34a4fe2" }, { "CommandList": [ @@ -697,7 +873,7 @@ } } ], - "ID": "65a446c2-48a7-469a-bf05-4e01cd229bd4" + "ID": "0d45bbbc-829c-4691-a7d2-28a6fa2a83e9" } ] } @@ -713,7 +889,7 @@ "BindingInfo": { "TableName": "项目动态", "ColumnName": "项目ID", - "GUID": "dd6b9c66-2ace-4db3-829f-d2fccfd5de44" + "GUID": "1144a11d-2103-4e46-95ed-aa1cf7769e60" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -724,7 +900,7 @@ "BindingInfo": { "TableName": "项目动态", "ColumnName": "项目动态", - "GUID": "4716c534-e2b0-46a3-91f1-7f6c0c2e2776" + "GUID": "bcaebb23-fdc7-47d9-9546-0b8f92e93e82" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -735,7 +911,7 @@ "BindingInfo": { "TableName": "项目动态", "ColumnName": "执行人", - "GUID": "db952fe7-2f9e-4ac5-9b95-f8c332427640" + "GUID": "6f1e54cd-9592-465d-8785-cdc89619f1c3" }, "Value": "%CurrentUser%" } @@ -749,7 +925,7 @@ "Message": "报工成功" } ], - "ID": "a0f122c7-49b1-4d3d-b7b4-a93bd2f38872" + "ID": "14a48dac-a86c-4438-86b6-60a4d81a093b" }, { "CommandList": [ @@ -765,12 +941,12 @@ } } ], - "ID": "175ccd6e-ff57-4f9a-ab7e-a949afe20f49" + "ID": "441069e4-55a0-476d-ad6a-6619da529099" } ] } ], - "ID": "53d9c708-8fdd-409d-b551-a0306f4d4e3d" + "ID": "62472742-dfb4-47de-9e2c-6f8536ee9535" }, { "CommandList": [ @@ -783,7 +959,7 @@ } } ], - "ID": "dd27d16b-7644-44b7-b966-37d14a2cf317" + "ID": "2959e3a3-8e8e-4251-9606-40fccc8fbd11" } ] } diff --git a/ServerCommands/工时/分配任务工时.json b/ServerCommands/工时/分配任务工时.json index 0f77f2fa..871b0d53 100644 --- a/ServerCommands/工时/分配任务工时.json +++ b/ServerCommands/工时/分配任务工时.json @@ -237,7 +237,7 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=任务信息.可分配工时" }, - "compareType": 4 + "compareType": 5 }, "CommandList": [ { @@ -442,7 +442,7 @@ "BindingInfo": { "TableName": "任务成员表", "ColumnName": "项目ID", - "GUID": "46dbbe16-5e29-4001-848b-9cde33e91cfd" + "GUID": "907e634d-70aa-4e00-88d9-f79953045dfd" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -453,7 +453,7 @@ "BindingInfo": { "TableName": "任务成员表", "ColumnName": "任务ID", - "GUID": "bff7cde1-d988-4f23-9830-f719f199a6b3" + "GUID": "abd77ff1-74af-4c64-b709-ba12c09c4449" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -464,7 +464,7 @@ "BindingInfo": { "TableName": "任务成员表", "ColumnName": "任务成员", - "GUID": "80d935fe-3363-4157-bfb4-4bd12910115f" + "GUID": "0cd16274-f487-4f8c-944d-2160958e5a56" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -475,7 +475,7 @@ "ParamNameToSaveNewRowValue": "" } ], - "ID": "31d7ecc8-104d-48fc-96e8-4df28627f256" + "ID": "7b5c9507-6fcf-4351-96a0-00134cfc0acd" } ] }, @@ -530,7 +530,7 @@ "ID": "f1babee3af9a4401b69d66a5728facf3" } ], - "ID": "5a43c6fd-9734-49aa-9002-a256e7d7f7ed" + "ID": "d084fbee-4af1-4e4d-8eaa-6af89e55b775" }, { "Condition": { @@ -564,7 +564,7 @@ "ID": "d184eff4cba7445a955fa8144ebd3951" } ], - "ID": "cec86543-c168-4c2e-81a8-3769b332781c" + "ID": "0b37c3cb-e565-4743-bb74-87d80ddbd9f5" } ], "Comments": "如果是按人分配，则把计划工时分到一天中" @@ -576,7 +576,7 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=工时数" }, - "ID": "d0c562049a03431f8bd7b16dc05571a8" + "ID": "538fe8a21ecb4b4cb6f8fbf831f03d1d" }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", @@ -700,7 +700,7 @@ "ID": "954da7d900d44d068c49c0775cbb66ad" } ], - "ID": "79688b2f-93a6-42bf-b9e9-6cdd65d33e7d" + "ID": "9136d195-6c6d-421a-a38c-82180d48e4eb" }, { "CommandList": [ @@ -714,7 +714,7 @@ "ID": "bd03cd955f4449cf9d84c422471b58ac" } ], - "ID": "c81b405e-c3a5-4733-8918-ac465fe4d0a8" + "ID": "1f4284c0-335b-4330-9c39-0620a677e8fe" } ] }, @@ -932,7 +932,7 @@ } ], "Comments": "如果不是按人分配，且分配后的工时超过负荷，则报错", - "ID": "eafc2770-e4d5-4169-b5f5-ff14fa5f7f41" + "ID": "5ee7326c-c558-4870-8c9b-3b901b21182c" }, { "CommandList": [ @@ -945,7 +945,7 @@ } } ], - "ID": "b36283f4-76f4-4a4e-84fe-4999b8ed82ee" + "ID": "bd16d028-b73c-491a-b4a8-6d00a6923fec" } ] } @@ -959,7 +959,7 @@ "Message": "分配计划工时成功" } ], - "ID": "789c1dbc-6599-4582-8242-e2c39e6d10c5" + "ID": "5fac0eb5-f731-44cc-a018-995976e67698" }, { "CommandList": [ @@ -972,12 +972,12 @@ } } ], - "ID": "4fda4e38-33d6-4718-ac39-5cb8948b633f" + "ID": "892579fc-1bf9-43bc-80d7-6c3b50ea11c3" } ] } ], - "ID": "72d12494-04ee-4c3d-8dd3-4318c75f9144" + "ID": "215c9939-b849-4e09-b1c6-dc0d0b7d3c77" }, { "CommandList": [ @@ -987,13 +987,13 @@ "Message": "该用户不是项目成员" } ], - "ID": "45d5ac8d-19fe-4399-9de8-f7a875a732d5" + "ID": "f1bfbc10-35b8-44c1-b4c9-a8d6965a7f01" } ], "Comments": "如果任务成员中没有，则自动加一个" } ], - "ID": "8edb92cd-bfb1-49c3-a1b8-66936a463200" + "ID": "bbfe9b03-66df-4e36-9b90-0d6758c44408" }, { "CommandList": [ @@ -1003,12 +1003,12 @@ "Message": "您提交的工时超过任务预算工时，请修改后重新提交" } ], - "ID": "d782d30a-c268-4d2a-a437-2e3d97fe30fb" + "ID": "36775ed1-cd32-4f99-acdf-6b85362b827c" } ] } ], - "ID": "7c9540a9-b064-436f-815e-93c653252939" + "ID": "dc63381f-0182-438c-bba5-f8470ca29226" }, { "CommandList": [ @@ -1018,7 +1018,7 @@ "Message": "任务不存在" } ], - "ID": "6d828dea-09c2-477b-9c7f-964aefd974e2" + "ID": "76705ade-2b7a-4303-bb61-e297fdf90439" } ] } diff --git a/Tables/任务/任务平行视图.json b/Tables/任务/任务平行视图.json index 4a91d812..87e01438 100644 --- a/Tables/任务/任务平行视图.json +++ b/Tables/任务/任务平行视图.json @@ -1,5 +1,375 @@ { "Name": "任务平行视图", + "PermissionData": { + "$type": "Forguncy.RbacPermission.Core.Impl.Data.DataPermissionData, Forguncy.RbacPermission.Core", + "permissionResource": { + "$type": "Forguncy.RbacPermission.Core.Impl.Data.DataPermissionResource, Forguncy.RbacPermission.Core", + "enabledTypes": 2, + "isView": true, + "isExternal": true, + "detailTables": [ + { + "subTableName": "任务平行视图", + "subColumnName": "父任务ID", + "relatedColumnName": "ID" + }, + { + "subTableName": "任务成员视图", + "subColumnName": "任务ID", + "relatedColumnName": "ID" + }, + { + "subTableName": "任务成员表", + "subColumnName": "任务ID", + "relatedColumnName": "ID" + }, + { + "subTableName": "任务进展", + "subColumnName": "任务ID", + "relatedColumnName": "ID" + }, + { + "subTableName": "任务评论表", + "subColumnName": "任务ID", + "relatedColumnName": "ID" + }, + { + "subTableName": "View_任务工时统计", + "subColumnName": "任务ID", + "relatedColumnName": "ID" + }, + { + "subTableName": "任务工时表", + "subColumnName": "任务ID", + "relatedColumnName": "ID" + }, + { + "subTableName": "需求反馈登记表", + "subColumnName": "关联任务", + "relatedColumnName": "ID" + } + ] + }, + "permissionBindings": [ + { + "$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": [ + "Administrator" + ] + }, + { + "$type": "Forguncy.RbacPermission.Core.Impl.Data.DataPermissionBinding, Forguncy.RbacPermission.Core", + "config": { + "$type": "Forguncy.RbacPermission.Core.Impl.Data.RowBindingConfig, Forguncy.RbacPermission.Core", + "operationTypes": 5, + "dataFilter": { + "$type": "Forguncy.RbacPermission.Core.Impl.Data.RowFilter, Forguncy.RbacPermission.Core", + "filterType": 1 + } + }, + "dataPermissionType": 2, + "roleNames": [ + "项目总监", + "商务总监", + "财务" + ] + }, + { + "$type": "Forguncy.RbacPermission.Core.Impl.Data.DataPermissionBinding, Forguncy.RbacPermission.Core", + "config": { + "$type": "Forguncy.RbacPermission.Core.Impl.Data.RowBindingConfig, Forguncy.RbacPermission.Core", + "operationTypes": 1, + "dataFilter": { + "$type": "Forguncy.RbacPermission.Core.Impl.Data.RowFilter, Forguncy.RbacPermission.Core", + "userFieldName": "任务负责人", + "filterType": 4, + "condition": { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务平行视图", + "ColumnName": "任务负责人", + "GUID": "7853ff22-f892-43ec-b7ad-aaac4ab5d8a9" + }, + "Value": "%CurrentUser.UserName%" + }, + { + "$type": "ForguncyDataAccess.TextCESqlCondition, ForguncyDataAccess", + "CompareType": 6, + "ColumnBindingInfo": { + "TableName": "任务平行视图", + "ColumnName": "任务负责人", + "GUID": "d447b011-8562-47de-8716-6766969c93ed", + "AttachType": { + "$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess", + "UserColumnAttachType": 8 + } + }, + "Value": "%CurrentUser.UserName%" + }, + { + "$type": "ForguncyDataAccess.TextCESqlCondition, ForguncyDataAccess", + "CompareType": 6, + "ColumnBindingInfo": { + "TableName": "任务平行视图", + "ColumnName": "任务成员", + "GUID": "4c91846d-6f34-46f1-b890-bb350f51c1ac" + }, + "Value": "%CurrentUser.UserName%" + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务平行视图", + "ColumnName": "项目ID", + "GUID": "e8cbf68a-86d8-4cfd-89bc-00ce385c40b2", + "RelationBinding": { + "RelatedTable": "项目平行视图", + "RelatedColumn": "ID", + "DisplayColumn": "项目经理" + } + }, + "Value": "%CurrentUser.UserName%" + } + ], + "RelationType": 1 + } + } + }, + "dataPermissionType": 2, + "roleNames": [ + "FGC_LoginUser" + ] + }, + { + "$type": "Forguncy.RbacPermission.Core.Impl.Data.DataPermissionBinding, Forguncy.RbacPermission.Core", + "config": { + "$type": "Forguncy.RbacPermission.Core.Impl.Data.CreateRecordBindingConfig, Forguncy.RbacPermission.Core", + "dataFilter": { + "$type": "Forguncy.RbacPermission.Core.Impl.Data.CreateRecordFilter, Forguncy.RbacPermission.Core" + } + }, + "dataPermissionType": 1, + "roleNames": [ + "FGC_LoginUser" + ] + }, + { + "$type": "Forguncy.RbacPermission.Core.Impl.Data.DataPermissionBinding, Forguncy.RbacPermission.Core", + "config": { + "$type": "Forguncy.RbacPermission.Core.Impl.Data.FieldBindingConfig, Forguncy.RbacPermission.Core", + "fieldOperations": { + "ID": 1, + "任务名称": 5, + "任务成员": 5, + "任务状态": 5, + "任务类型": 5, + "任务说明": 5, + "任务负责人": 5, + "任务预算工时": 5, + "关联资源": 5, + "分组ID": 5, + "前置任务": 5, + "功能名称": 5, + "功能描述": 5, + "可分配工时": 5, + "可核定工时": 5, + "备注": 5, + "实际工时": 5, + "层级": 5, + "工期": 5, + "已分配工时": 5, + "已分配工时_总分配工时": 5, + "开始时间": 5, + "总分配工时": 5, + "总核定工时": 5, + "总核定工时_已分配工时": 5, + "成员数量": 5, + "收集反馈": 5, + "次序": 5, + "流程实例ID": 5, + "父任务ID": 5, + "版本": 5, + "结束时间": 5, + "进度": 5, + "里程碑": 5, + "项目ID": 5, + "本任务已分配工时": 5, + "子任务已分配工时": 5, + "本任务核定工时": 5, + "子任务核定工时": 5, + "本任务可核定工时": 5, + "子任务可核定工时": 5, + "本任务实际工时": 5, + "子任务实际工时": 5 + }, + "subTableOperations": { + "View_任务工时统计": 5, + "任务工时表": 5, + "任务平行视图": 5, + "任务成员表": 5, + "任务成员视图": 5, + "任务评论表": 5, + "任务进展": 5, + "需求反馈登记表": 5 + }, + "dataFilter": { + "$type": "Forguncy.RbacPermission.Core.Impl.Data.FieldFilter, Forguncy.RbacPermission.Core" + } + }, + "dataPermissionType": 4, + "roleNames": [ + "Administrator" + ] + }, + { + "$type": "Forguncy.RbacPermission.Core.Impl.Data.DataPermissionBinding, Forguncy.RbacPermission.Core", + "config": { + "$type": "Forguncy.RbacPermission.Core.Impl.Data.FieldBindingConfig, Forguncy.RbacPermission.Core", + "fieldOperations": { + "ID": 1, + "任务名称": 5, + "任务成员": 5, + "任务状态": 5, + "任务类型": 5, + "任务说明": 5, + "任务负责人": 5, + "任务预算工时": 5, + "关联资源": 5, + "分组ID": 5, + "前置任务": 5, + "功能名称": 5, + "功能描述": 5, + "可分配工时": 5, + "可核定工时": 5, + "备注": 5, + "实际工时": 5, + "层级": 5, + "工期": 5, + "已分配工时": 5, + "已分配工时_总分配工时": 5, + "开始时间": 5, + "总分配工时": 5, + "总核定工时": 5, + "总核定工时_已分配工时": 5, + "成员数量": 5, + "收集反馈": 5, + "次序": 5, + "流程实例ID": 5, + "父任务ID": 5, + "版本": 5, + "结束时间": 5, + "进度": 5, + "里程碑": 5, + "项目ID": 5, + "本任务已分配工时": 5, + "子任务已分配工时": 5, + "本任务核定工时": 5, + "子任务核定工时": 5, + "本任务可核定工时": 5, + "子任务可核定工时": 5, + "本任务实际工时": 5, + "子任务实际工时": 5 + }, + "subTableOperations": { + "View_任务工时统计": 5, + "任务工时表": 5, + "任务平行视图": 5, + "任务成员表": 5, + "任务成员视图": 5, + "任务评论表": 5, + "任务进展": 5, + "需求反馈登记表": 5 + }, + "dataFilter": { + "$type": "Forguncy.RbacPermission.Core.Impl.Data.FieldFilter, Forguncy.RbacPermission.Core" + } + }, + "dataPermissionType": 4, + "roleNames": [ + "FGC_LoginUser" + ] + }, + { + "$type": "Forguncy.RbacPermission.Core.Impl.Data.DataPermissionBinding, Forguncy.RbacPermission.Core", + "config": { + "$type": "Forguncy.RbacPermission.Core.Impl.Data.FieldBindingConfig, Forguncy.RbacPermission.Core", + "fieldOperations": { + "ID": 1, + "任务名称": 5, + "任务成员": 5, + "任务状态": 5, + "任务类型": 5, + "任务说明": 5, + "任务负责人": 5, + "任务预算工时": 5, + "关联资源": 5, + "分组ID": 5, + "前置任务": 5, + "功能名称": 5, + "功能描述": 5, + "可分配工时": 5, + "可核定工时": 5, + "备注": 5, + "实际工时": 5, + "层级": 5, + "工期": 5, + "已分配工时": 5, + "已分配工时_总分配工时": 5, + "开始时间": 5, + "总分配工时": 5, + "总核定工时": 5, + "总核定工时_已分配工时": 5, + "成员数量": 5, + "收集反馈": 5, + "次序": 5, + "流程实例ID": 5, + "父任务ID": 5, + "版本": 5, + "结束时间": 5, + "进度": 5, + "里程碑": 5, + "项目ID": 5, + "本任务已分配工时": 5, + "子任务已分配工时": 5, + "本任务核定工时": 5, + "子任务核定工时": 5, + "本任务可核定工时": 5, + "子任务可核定工时": 5, + "本任务实际工时": 5, + "子任务实际工时": 5 + }, + "subTableOperations": { + "View_任务工时统计": 5, + "任务工时表": 5, + "任务平行视图": 5, + "任务成员表": 5, + "任务成员视图": 5, + "任务评论表": 5, + "任务进展": 5, + "需求反馈登记表": 5 + }, + "dataFilter": { + "$type": "Forguncy.RbacPermission.Core.Impl.Data.FieldFilter, Forguncy.RbacPermission.Core" + } + }, + "dataPermissionType": 4, + "roleNames": [ + "FGC_Anonymous" + ] + } + ] + }, "Columns": [ { "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", @@ -221,6 +591,22 @@ "Name": "已分配工时", "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "Required": true, + "DatabaseColumnType": "float", + "MaxLength": -1, + "Name": "本任务已分配工时", + "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "Required": true, + "DatabaseColumnType": "float", + "MaxLength": -1, + "Name": "子任务已分配工时", + "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, { "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", "DatabaseColumnType": "float", @@ -236,6 +622,22 @@ "Name": "总核定工时", "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "Required": true, + "DatabaseColumnType": "float", + "MaxLength": -1, + "Name": "本任务核定工时", + "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "Required": true, + "DatabaseColumnType": "float", + "MaxLength": -1, + "Name": "子任务核定工时", + "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, { "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", "DatabaseColumnType": "float", @@ -243,6 +645,22 @@ "Name": "可核定工时", "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "Required": true, + "DatabaseColumnType": "float", + "MaxLength": -1, + "Name": "本任务可核定工时", + "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "Required": true, + "DatabaseColumnType": "float", + "MaxLength": -1, + "Name": "子任务可核定工时", + "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, { "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", "Required": true, @@ -251,6 +669,22 @@ "Name": "实际工时", "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "Required": true, + "DatabaseColumnType": "float", + "MaxLength": -1, + "Name": "本任务实际工时", + "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "Required": true, + "DatabaseColumnType": "float", + "MaxLength": -1, + "Name": "子任务实际工时", + "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, { "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", "DatabaseColumnType": "int", @@ -276,6 +710,12 @@ "Formula": "[总核定工时]&\"/\"&[已分配工时]", "Name": "总核定工时_已分配工时", "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.SaveLoad.FormulaColumnSaveData, ServerDesignerCommon", + "Formula": "=IF([任务类型]=3,[本任务可核定工时],[可分配工时])", + "Name": "动态可核定工时", + "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" } ], "ExternalDatabaseInfo": { @@ -284,7 +724,7 @@ "ConnectionId": "业务表", "SourceTableName": "任务平行视图", "SourceTableSchema": "dbo", - "CreateViewSql": "WITH [任务递归CTE] AS (-- CTE to gather all tasks and their child tasks\r\n\tSELECT\r\n\t\tt.ID,\r\n\t\tt.[父任务ID],\r\n\t\tt.[任务预算工时],\r\n\t\tCAST ( t.ID AS VARCHAR ( MAX ) ) AS TaskPath,\r\n\t\t0 AS Depth \r\n\tFROM\r\n\t\t任务表 t \r\n\tWHERE\r\n\t\tt.[父任务ID] IS NULL UNION ALL\r\n\tSELECT\r\n\t\tt.ID,\r\n\t\tt.[父任务ID],\r\n\t\tt.任务预算工时,\r\n\t\tCAST ( cte.TaskPath + '->' + CAST ( t.ID AS VARCHAR ( 50 ) ) AS VARCHAR ( MAX ) ) AS TaskPath,\r\n\t\tcte.Depth + 1 AS Depth \r\n\tFROM\r\n\t\t任务表 t\r\n\t\tINNER JOIN [任务递归CTE] cte ON t.[父任务ID] = cte.ID \r\n\t),\r\n\t汇总工时 AS (-- Gather plan hours and actual hours from 任务工时表\r\n\tSELECT\r\n\t\t[任务ID],\r\n\t\tSUM ( CASE WHEN 工时类型 = '计划' THEN 工时 ELSE 0 END ) AS 计划工时汇总,\r\n\t\tSUM ( CASE WHEN 工时类型 = '实际' THEN 工时 ELSE 0 END ) AS 核定工时汇总,\r\n\t\tSUM ( CASE WHEN 工时类型 = '实际' THEN 上报工时 ELSE 0 END ) AS 实际工时汇总 \r\n\tFROM\r\n\t\t任务工时表 \r\n\tGROUP BY\r\n\t\t[任务ID] \r\n\t),\r\n\t任务汇总 AS (-- Sum up task hours with recursive sum of child tasks\r\n\tSELECT\r\n\t\tcte.ID,\r\n\t\tISNULL( SUM ( c.任务预算工时 ), 0 ) AS 子任务分配工时 \r\n\tFROM\r\n\t\t[任务递归CTE] cte\r\n\t\tLEFT JOIN 任务表 c ON c.[父任务ID] = cte.ID \r\n\tGROUP BY\r\n\t\tcte.ID \r\n\t),\r\n\t任务成员 AS ( \r\n\tSELECT \r\n\t[任务ID],\r\n\tSTRING_AGG ([任务成员],',') AS 任务成员,\r\n\tcount(*) AS [成员数量] \r\n\tFROM [任务成员表] \r\n\tGROUP BY [任务ID] \r\n\t)\r\n\t -- Final view definition\r\nSELECT\r\n\tt.*,\r\n\tt.任务预算工时 AS 总分配工时,\r\n\tISNULL( 汇总.计划工时汇总, 0 ) + ISNULL( 任务汇总.子任务分配工时, 0 ) AS 已分配工时,\r\n\tt.任务预算工时 - ( ISNULL( 汇总.计划工时汇总, 0 ) + ISNULL( 任务汇总.子任务分配工时, 0 ) ) AS 可分配工时,\r\n\tISNULL( 汇总.核定工时汇总, 0 ) AS 总核定工时,\r\n\t( t.任务预算工时 - ( ISNULL( 汇总.计划工时汇总, 0 ) + ISNULL( 任务汇总.子任务分配工时, 0 ) ) ) - ISNULL( 汇总.核定工时汇总, 0 ) AS 可核定工时,\r\n\tISNULL( 汇总.实际工时汇总, 0 ) AS 实际工时,\r\n\t成员.[成员数量],\r\n\t成员.[任务成员]\r\nFROM\r\n\t任务表 t\r\n\tLEFT JOIN 汇总工时 汇总 ON t.ID = 汇总.[任务ID]\r\n\tLEFT JOIN 任务汇总 任务汇总 ON t.ID = 任务汇总.ID\r\n\tLEFT JOIN 任务成员 成员 ON t.ID = 成员.[任务ID];", + "CreateViewSql": "WITH [任务递归CTE] AS (-- CTE to gather all tasks and their child tasks\r\n\tSELECT\r\n\t\tt.ID,\r\n\t\tt.[父任务ID],\r\n\t\tt.[任务预算工时],\r\n\t\tCAST ( t.ID AS VARCHAR ( MAX ) ) AS TaskPath,\r\n\t\t0 AS Depth \r\n\tFROM\r\n\t\t任务表 t \r\n\tWHERE\r\n\t\tt.[父任务ID] IS NULL\r\n\t\t\r\n\t\tUNION ALL\r\n\tSELECT\r\n\t\tt.ID,\r\n\t\tt.[父任务ID],\r\n\t\tt.任务预算工时,\r\n\t\tCAST ( cte.TaskPath + '->' + CAST ( t.ID AS VARCHAR ( 50 ) ) AS VARCHAR ( MAX ) ) AS TaskPath,\r\n\t\tcte.Depth + 1 AS Depth \r\n\tFROM\r\n\t\t任务表 t\r\n\t\tINNER JOIN [任务递归CTE] cte ON t.[父任务ID] = cte.ID\r\n\t),\r\n\t汇总工时 AS (-- Gather plan hours and actual hours from 任务工时表\r\n\tSELECT\r\n\t\t[任务ID],\r\n\t\tSUM ( CASE WHEN 工时类型 = '计划' THEN 工时 ELSE 0 END ) AS 计划工时汇总,\r\n\t\tSUM ( CASE WHEN 工时类型 = '实际' THEN 工时 ELSE 0 END ) AS 核定工时汇总,\r\n\t\tSUM ( CASE WHEN 工时类型 = '实际' THEN 上报工时 ELSE 0 END ) AS 实际工时汇总 \r\n\tFROM\r\n\t\t任务工时表 \r\n\tGROUP BY\r\n\t\t[任务ID] \r\n\t),\r\n\t任务汇总 AS (-- Sum up task hours with recursive sum of child tasks\r\n\tSELECT\r\n\t\tcte.ID,\r\n\t\tISNULL( SUM ( c.任务预算工时 ), 0 ) AS 子任务分配工时 \r\n\tFROM\r\n\t\t[任务递归CTE] cte\r\n\t\tLEFT JOIN 任务表 c ON c.[父任务ID] = cte.ID AND c.[任务状态]>=1\r\n\tGROUP BY\r\n\t\tcte.ID \r\n\t),\r\n\t子任务核定工时汇总 AS (\r\n SELECT\r\n cte.ID,\r\n ISNULL(SUM(汇总.核定工时汇总), 0) AS 子任务核定工时汇总\r\n FROM\r\n [任务递归CTE] cte\r\n LEFT JOIN 任务表 c ON c.[父任务ID] = cte.ID\r\n LEFT JOIN 汇总工时 汇总 ON c.ID = 汇总.[任务ID]\r\n GROUP BY\r\n cte.ID\r\n),\r\n子任务实际工时汇总 AS (\r\n SELECT\r\n cte.ID,\r\n ISNULL(SUM(汇总.实际工时汇总), 0) AS 子任务实际工时汇总\r\n FROM\r\n [任务递归CTE] cte\r\n LEFT JOIN 任务表 c ON c.[父任务ID] = cte.ID\r\n LEFT JOIN 汇总工时 汇总 ON c.ID = 汇总.[任务ID]\r\n GROUP BY\r\n cte.ID\r\n),\r\n\t任务成员 AS ( \r\n\tSELECT \r\n\t[任务ID],\r\n\tSTRING_AGG ([任务成员],',') AS 任务成员,\r\n\tcount(*) AS [成员数量] \r\n\tFROM [任务成员表] \r\n\tGROUP BY [任务ID] \r\n\t)\r\n-- Final view definition\r\nSELECT\r\n t.*,\r\n t.任务预算工时 AS 总分配工时,\r\n ISNULL(汇总.计划工时汇总, 0) + ISNULL(任务汇总.子任务分配工时, 0) AS 已分配工时,\r\n\t\tISNULL(汇总.计划工时汇总, 0) AS 本任务已分配工时,\r\n\t\tISNULL(任务汇总.子任务分配工时, 0) AS 子任务已分配工时,\r\n t.任务预算工时 - (ISNULL(汇总.计划工时汇总, 0) + ISNULL(任务汇总.子任务分配工时, 0)) AS 可分配工时,\r\n ISNULL(汇总.核定工时汇总, 0) + ISNULL(子任务核定工时汇总.子任务核定工时汇总, 0) AS 总核定工时,\r\n\t\tISNULL(汇总.核定工时汇总, 0) AS 本任务核定工时,\r\n\t\tISNULL(子任务核定工时汇总.子任务核定工时汇总, 0) AS 子任务核定工时,\r\n (t.任务预算工时 - (ISNULL(汇总.核定工时汇总, 0) + ISNULL(子任务核定工时汇总.子任务核定工时汇总, 0))) AS 可核定工时,\r\n\t\tISNULL(汇总.计划工时汇总, 0) - ISNULL(汇总.核定工时汇总, 0) AS 本任务可核定工时,\r\n\t\tISNULL(任务汇总.子任务分配工时, 0) - ISNULL(子任务核定工时汇总.子任务核定工时汇总, 0) AS 子任务可核定工时,\r\n ISNULL(汇总.实际工时汇总, 0) + ISNULL(子任务实际工时汇总.子任务实际工时汇总, 0) AS 实际工时,\r\n\t\tISNULL(汇总.实际工时汇总, 0) AS 本任务实际工时,\r\n\t\tISNULL(子任务实际工时汇总.子任务实际工时汇总, 0) AS 子任务实际工时,\r\n 成员.[成员数量],\r\n 成员.[任务成员]\r\nFROM\r\n 任务表 t\r\n LEFT JOIN 汇总工时 汇总 ON t.ID = 汇总.[任务ID]\r\n LEFT JOIN 任务汇总 任务汇总 ON t.ID = 任务汇总.ID\r\n LEFT JOIN 子任务核定工时汇总 子任务核定工时汇总 ON t.ID = 子任务核定工时汇总.ID\r\n LEFT JOIN 子任务实际工时汇总 子任务实际工时汇总 ON t.ID = 子任务实际工时汇总.ID\r\n LEFT JOIN 任务成员 成员 ON t.ID = 成员.[任务ID];", "ViewInfo": { "ViewName": "任务平行视图", "QueryColumns": [ diff --git a/Tables/任务/任务成员表.json b/Tables/任务/任务成员表.json index 7aaea133..e14a2a03 100644 --- a/Tables/任务/任务成员表.json +++ b/Tables/任务/任务成员表.json @@ -13,6 +13,7 @@ }, { "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "Required": true, "DatabaseColumnType": "bigint", "MaxLength": -1, "Name": "项目ID", @@ -20,6 +21,7 @@ }, { "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "Required": true, "DatabaseColumnType": "bigint", "MaxLength": -1, "Name": "任务ID", @@ -27,6 +29,7 @@ }, { "$type": "Forguncy.SaveLoad.UserBindingColumnSaveData, ServerDesignerCommon", + "Required": true, "DatabaseColumnType": "nvarchar", "MaxLength": -1, "Name": "任务成员", diff --git a/Tables/任务/任务表.json b/Tables/任务/任务表.json index 6801b7ce..9724a7e6 100644 --- a/Tables/任务/任务表.json +++ b/Tables/任务/任务表.json @@ -4,7 +4,6 @@ "$type": "Forguncy.RbacPermission.Core.Impl.Data.DataPermissionData, Forguncy.RbacPermission.Core", "permissionResource": { "$type": "Forguncy.RbacPermission.Core.Impl.Data.DataPermissionResource, Forguncy.RbacPermission.Core", - "enabledTypes": 2, "isExternal": true, "detailTables": [ { diff --git a/UserControlPages/任务统计信息.json b/UserControlPages/任务统计信息.json index 34a532f9..47ce6a13 100644 --- a/UserControlPages/任务统计信息.json +++ b/UserControlPages/任务统计信息.json @@ -68,22 +68,22 @@ }, "2": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 215.0 + "DesignLengthInPixel": 121.0 } }, "3": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 50.0 + "DesignLengthInPixel": 57.0 } }, "4": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 121.0 + "DesignLengthInPixel": 215.0 } }, "5": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0 + "DesignLengthInPixel": 50.0 } }, "6": { @@ -97,11 +97,6 @@ } }, "8": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 121.0 - } - }, - "9": { "GridRowColumnDefinition": { "DesignLengthInPixel": 47.0, "Mode": 2, @@ -114,22 +109,18 @@ } } }, - "Count": 10, + "Count": 9, "DefaultSize": 121.0 }, "Values": { - "1,4": "总分配工时", - "1,6": "已分配工时", - "1,8": "已分配工时", - "2,4": 0, + "1,2": "已分配工时", + "1,6": "可分配工时", + "2,2": 0, "2,6": 0, - "2,8": 0, - "4,4": "总核定工时", + "4,2": "已核定工时", "4,6": "可核定工时", - "4,8": "实际上报工时", - "5,4": 0, - "5,6": 0, - "5,8": 0 + "5,2": 0, + "5,6": 0 }, "AttachInfos": { "1,1": { @@ -152,7 +143,7 @@ "Config": "{\"option\":\"option = {\\n color: [\\\"#2196f3\\\", \\\"#bdd2e2\\\"],\\n title: {\\n text: '工时核定',\\n left: '50%',\\n top: '50%',\\n textAlign: 'center',\\n textVerticalAlign: 'middle',\\n textStyle: {\\n fontSize: 14,\\n },\\n },\\n tooltip: {\\n trigger: 'item'\\n },\\n series: [\\n {\\n name: '工时',\\n type: 'pie',\\n radius: ['40%', '90%'], // 调整内外半径，确保饼图尽量填充容器\\n center: ['50%', '50%'], // 确保饼图在容器中居中\\n label: {\\n fontSize: 10,\\n position: 'inside',\\n color: '#FFFFFF',\\n lineHeight: 13,\\n // 使用 formatter 回调函数\\n formatter: getColor,\\n rich: {\\n style: {\\n fontSize: 14,\\n fontWeight:\\\"normal\\\",\\n // 这里定义一个占位符，颜色会在 formatter 回调中动态设置\\n color: '#000000'\\n }\\n }\\n },\\n data: [\\n { value: 30, name: '已核定' },\\n { value: 70, name: '未核定' },\\n ],\\n emphasis: {\\n itemStyle: {\\n shadowBlur: 10,\\n shadowOffsetX: 0,\\n shadowColor: 'rgba(0, 0, 0, 0.5)'\\n }\\n }\\n }\\n ]\\n};\\n\\nfunction getColor(params) {\\n // 获取当前部分的颜色\\n const color = params.color;\\n // 解析颜色：\\n const rgb = color.slice(1); // 去掉 # \\n const r = parseInt(rgb.slice(0, 2), 16);\\n const g = parseInt(rgb.slice(2, 4), 16);\\n const b = parseInt(rgb.slice(4, 6), 16);\\n const brightness = (r * 299 + g * 587 + b * 114) / 1000;\\n\\n // 根据亮度判断标签颜色\\n const textColor = brightness > 128 ? '#000000' : '#FFFFFF';\\n\\n // 返回格式化字符串，其中包含样式标签\\n return `{style|${params.name}\\\\n ${params.value+'h'}}`;\\n}\",\"graphTheme\":null,\"displayMode\":\"canvas\",\"jsCode\":\"\\n async ({Context,JSONContext,ImageContext,echarts,myChart,dat,Forguncy,d3,setInterval,setTimeout,ForguncyEchartsHelper,PublicResource})=>{\\n var datGUI=undefined;\\n var option={};\\n option = {\\n color: [\\\"#2196f3\\\", \\\"#bdd2e2\\\"],\\n title: {\\n text: '工时核定',\\n left: '50%',\\n top: '50%',\\n textAlign: 'center',\\n textVerticalAlign: 'middle',\\n textStyle: {\\n fontSize: 14,\\n },\\n },\\n tooltip: {\\n trigger: 'item'\\n },\\n series: [\\n {\\n name: '工时',\\n type: 'pie',\\n radius: ['40%', '90%'],\\n center: ['50%', '50%'],\\n label: {\\n fontSize: 10,\\n position: 'inside',\\n color: '#FFFFFF',\\n lineHeight: 13,\\n // 使用 formatter 回调函数\\n formatter: getColor,\\n rich: {\\n style: {\\n fontSize: 14,\\n fontWeight: \\\"normal\\\",\\n // 这里定义一个占位符，颜色会在 formatter 回调中动态设置\\n color: '#000000'\\n }\\n }\\n },\\n data: [\\n { value: 30, name: '已核定' },\\n { value: 70, name: '未核定' },\\n ],\\n emphasis: {\\n itemStyle: {\\n shadowBlur: 10,\\n shadowOffsetX: 0,\\n shadowColor: 'rgba(0, 0, 0, 0.5)'\\n }\\n }\\n }\\n ]\\n};\\nfunction getColor(params) {\\n // 获取当前部分的颜色\\n const color = params.color;\\n // 解析颜色：\\n const rgb = color.slice(1); // 去掉 # \\n const r = parseInt(rgb.slice(0, 2), 16);\\n const g = parseInt(rgb.slice(2, 4), 16);\\n const b = parseInt(rgb.slice(4, 6), 16);\\n const brightness = (r * 299 + g * 587 + b * 114) / 1000;\\n // 根据亮度判断标签颜色\\n const textColor = brightness > 128 ? '#000000' : '#FFFFFF';\\n // 返回格式化字符串，其中包含样式标签\\n return `{style|${params.name}\\\\n ${params.value + 'h'}}`;\\n}\\n\\n return {\\n option,\\n datGUI,\\n };\\n }\\n \"}" } }, - "1,2": { + "1,4": { "CellType": { "$type": "EchartsCustomCellType.EchartsCustomCellTypeCellType, EchartsCustomCellType", "EChartTitle": "Echarts图表", @@ -172,46 +163,32 @@ "Config": "{\"option\":\"option = {\\n color: [\\\"#2196f3\\\", \\\"#bdd2e2\\\"],\\n title: {\\n text: '工时分配',\\n left: '50%',\\n top: '50%',\\n textAlign: 'center',\\n textVerticalAlign: 'middle',\\n textStyle: {\\n fontSize: 14,\\n },\\n },\\n tooltip: {\\n trigger: 'item'\\n },\\n series: [\\n {\\n name: '工时',\\n type: 'pie',\\n radius: ['40%', '90%'], // 调整内外半径，确保饼图尽量填充容器\\n center: ['50%', '50%'], // 确保饼图在容器中居中\\n label: {\\n fontSize: 10,\\n position: 'inside',\\n color: '#FFFFFF',\\n lineHeight: 13,\\n // 使用 formatter 回调函数\\n formatter: getColor,\\n rich: {\\n style: {\\n fontSize: 14,\\n fontWeight:\\\"normal\\\",\\n // 这里定义一个占位符，颜色会在 formatter 回调中动态设置\\n color: '#000000'\\n }\\n }\\n },\\n data: [\\n { value: 30, name: '已分配' },\\n { value: 70, name: '未分配' },\\n ],\\n emphasis: {\\n itemStyle: {\\n shadowBlur: 10,\\n shadowOffsetX: 0,\\n shadowColor: 'rgba(0, 0, 0, 0.5)'\\n }\\n }\\n }\\n ]\\n};\\n\\nfunction getColor(params) {\\n // 获取当前部分的颜色\\n const color = params.color;\\n // 解析颜色：\\n const rgb = color.slice(1); // 去掉 # \\n const r = parseInt(rgb.slice(0, 2), 16);\\n const g = parseInt(rgb.slice(2, 4), 16);\\n const b = parseInt(rgb.slice(4, 6), 16);\\n const brightness = (r * 299 + g * 587 + b * 114) / 1000;\\n\\n // 根据亮度判断标签颜色\\n const textColor = brightness > 128 ? '#000000' : '#FFFFFF';\\n\\n // 返回格式化字符串，其中包含样式标签\\n return `{style|${params.name}\\\\n ${params.value+'h'}}`;\\n}\",\"graphTheme\":null,\"displayMode\":\"canvas\",\"jsCode\":\"\\n async ({Context,JSONContext,ImageContext,echarts,myChart,dat,Forguncy,d3,setInterval,setTimeout,ForguncyEchartsHelper,PublicResource})=>{\\n var datGUI=undefined;\\n var option={};\\n option = {\\n color: [\\\"#2196f3\\\", \\\"#bdd2e2\\\"],\\n title: {\\n text: '工时分配',\\n left: '50%',\\n top: '50%',\\n textAlign: 'center',\\n textVerticalAlign: 'middle',\\n textStyle: {\\n fontSize: 14,\\n },\\n },\\n tooltip: {\\n trigger: 'item'\\n },\\n series: [\\n {\\n name: '工时',\\n type: 'pie',\\n radius: ['40%', '90%'],\\n center: ['50%', '50%'],\\n label: {\\n fontSize: 10,\\n position: 'inside',\\n color: '#FFFFFF',\\n lineHeight: 13,\\n // 使用 formatter 回调函数\\n formatter: getColor,\\n rich: {\\n style: {\\n fontSize: 14,\\n fontWeight: \\\"normal\\\",\\n // 这里定义一个占位符，颜色会在 formatter 回调中动态设置\\n color: '#000000'\\n }\\n }\\n },\\n data: [\\n { value: 30, name: '已分配' },\\n { value: 70, name: '未分配' },\\n ],\\n emphasis: {\\n itemStyle: {\\n shadowBlur: 10,\\n shadowOffsetX: 0,\\n shadowColor: 'rgba(0, 0, 0, 0.5)'\\n }\\n }\\n }\\n ]\\n};\\nfunction getColor(params) {\\n // 获取当前部分的颜色\\n const color = params.color;\\n // 解析颜色：\\n const rgb = color.slice(1); // 去掉 # \\n const r = parseInt(rgb.slice(0, 2), 16);\\n const g = parseInt(rgb.slice(2, 4), 16);\\n const b = parseInt(rgb.slice(4, 6), 16);\\n const brightness = (r * 299 + g * 587 + b * 114) / 1000;\\n // 根据亮度判断标签颜色\\n const textColor = brightness > 128 ? '#000000' : '#FFFFFF';\\n // 返回格式化字符串，其中包含样式标签\\n return `{style|${params.name}\\\\n ${params.value + 'h'}}`;\\n}\\n\\n return {\\n option,\\n datGUI,\\n };\\n }\\n \"}" } }, - "2,4": { + "2,2": { "BindingInfo": { "TableName": "任务平行视图", - "ColumnName": "总分配工时", - "GUID": "0f95ca94-c3d9-44e9-9b8f-662eb6133dbb" + "ColumnName": "已分配工时", + "GUID": "b704ed62-8098-481a-b3f9-30659e9f65ba" } }, "2,6": { - "BindingInfo": { - "TableName": "任务平行视图", - "ColumnName": "已分配工时", - "GUID": "ec51b865-2e7b-4950-bab7-fcd797b3f485" - } - }, - "2,8": { "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "可分配工时", - "GUID": "f5e9bf9d-713e-4573-98a6-9c363ff8c04b" + "GUID": "5c1528c1-bfc6-4f9f-a836-84dbd86a3cf2" } }, - "5,4": { + "5,2": { "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "总核定工时", - "GUID": "60d4b725-a65e-4d8e-adcd-d9e64ab73811" + "GUID": "973f7d86-5349-4aee-90fc-777bb8df0534" } }, "5,6": { "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "可核定工时", - "GUID": "13df3be4-231d-401d-b4fc-179a5dd7422e" - } - }, - "5,8": { - "BindingInfo": { - "TableName": "任务平行视图", - "ColumnName": "实际工时", - "GUID": "e3c4608b-0fe1-4be9-88ff-956e08fe3cc4" + "GUID": "ccf17015-40dc-4d64-b7ad-7042e4b9afb0" } } }, @@ -220,29 +197,15 @@ { "FontFamily": 0 }, - { - "FontSize": 12.0, - "Foreground": 1 - }, - { - "FontFamily": 0, - "FontSize": 12.0, - "Foreground": 1 - }, { "FontFamily": 0, "FontSize": 12.0, "Foreground": 1, "Formatter": 2 }, - { - "FontSize": 32.0, - "Formatter": 3, - "HorizontalAlignment": 4 - }, { "FontFamily": 0, - "FontSize": 32.0, + "FontSize": 24.0, "Formatter": 3, "HorizontalAlignment": 4 } @@ -258,40 +221,43 @@ }, "CellStyles": { "0,2": 0, + "0,3": 0, + "0,4": 0, "0,6": 0, - "0,8": 0, - "1,2": 0, - "1,4": 1, - "1,6": 2, - "1,8": 3, - "2,2": 0, - "2,4": 4, - "2,6": 5, - "2,8": 5, + "1,2": 1, + "1,3": 1, + "1,4": 0, + "1,6": 1, + "1,7": 0, + "2,2": 2, + "2,3": 2, + "2,4": 0, + "2,6": 2, + "2,7": 0, "3,2": 0, + "3,3": 0, + "3,4": 0, "3,6": 0, - "3,8": 0, "4,0": 0, - "4,2": 0, - "4,3": 0, - "4,4": 3, + "4,2": 1, + "4,3": 1, + "4,4": 0, "4,5": 0, - "4,6": 3, + "4,6": 1, "4,7": 0, - "4,8": 3, - "4,9": 0, + "4,8": 0, "5,0": 0, - "5,2": 0, - "5,3": 0, - "5,4": 5, + "5,2": 2, + "5,3": 2, + "5,4": 0, "5,5": 0, - "5,6": 5, + "5,6": 2, "5,7": 0, - "5,8": 5, - "5,9": 0, + "5,8": 0, "6,2": 0, - "6,6": 0, - "6,8": 0 + "6,3": 0, + "6,4": 0, + "6,6": 0 }, "SheetStyle": { "FontFamily": 0 @@ -299,7 +265,7 @@ }, "Spans": [ "1,1,6,1", - "1,2,6,1" + "1,4,6,1" ], "PageInfo": { "$type": "Forguncy.Model.Pages.UserControlPage, ServerDesignerCommon", @@ -312,4 +278,4 @@ "PaperSize": {}, "Margin": {} } -}//KjT4ADE1F8b/zkR+vJQY6/P1KnUEZRTaGebqqsDFQKU09JATyVBjyobv4uTfQqoaxwPYMzrKwpb+J2p5VtOac3LBKto5E5NHay7lHyJb3d2kyc+XJgPH9O4EjOcXEYUv3FoowZn9/5drEePsL++zKKnurJzso3sNmGsCSBMffgSRKuPw2N8+Kkw753+MkHnDWWZR6xcRNneqkSxgjVkJAM/5dfmvXuo1/JgIoPPziIfchDynm9z8ZHHQPJtpOZUqnnOP9uzkrlN326j/OHyGgHmy8x0h34f7WKe1LWhlBRLMsrqVg9P16cNK7xCrf0wa52lImm95A4/aw8pBNM0kifie8FusUQsGCwH5TOPs9aUMrID7AhwLB3YfuosTVJ9bZxEyVOAO+y3CG/AEiGtX2XOx/h19D/zt5xCc4xn5WqtZinoz+9lyQ4kM/EAIznK+ZwrdqQQjy/oM6mCADR2vZn+Roq8ncnyLrZnK5gllNyVtXXpk4pfqsPZmX3kzdiNfdZbx01U1pFLaNB6zGXGSKB5jkgIjZTf7gnGZyWjZf0cBcaAPrWOaeWX/2aNZL/v7OcHdKXCRpZ6W3LZSQx3CKHYScjTfr3Wwgfa610DJXfIhOddQCZugt5eVKVIqR203veLeAmahnRFx7Bp+3+EIgY98+QJPrGYQrCl8IQrhwGKTMqv0Q0R7vVr62NEvloK2L5wvTjHWi3UsrB48RJ/P/r7WVnpTmXnD8VQFrCn1uYDFeoEMV0DXClPjvASK3yGS5e6xmXoNWrLIaROr0NnrT1x/hRNurs9mtoe9Uaj1h0tuD0ZqWSkhDMeb1t+CLvXkJLL66OTjzx0DOcFSQB2S8VGkf0WJSvUYhbi2fLnQwOMTNM1EoxInkxVlHv3YgccGm8CQ+3ZC6MQOLf+XTh0l9Q==|920 \ No newline at end of file +}//wVmvUeo7MWt1dNvC4VQEYqBq7p6hvR3T2e5voXDlV9ZgNpHnr9z0gBSZouUAHxF2JgY+hfsXUcS2a0tiDHss74bhbSrEV8Zbzzc8ueMC2p3Pb1sqM9cjpa/Y4/e1+2Hux4StvRvhdMLBAkKlfjLQNhpv9mOAABqT1/8InbDRen17E3QwmJpX+4C708NEgnudiMRakStQ1rOSMnBQqco8IIYjW640mvphX9+C6pv1z0Me7qRqnLv8SIRDGSqFDZrOpm24Up1Qwx2p0FNz+dVNWLM2KUPO5MwowKt/RDhMMqSLoApkZBGXBfqvVwQj2qc7o5zAbbb/yaaTL1cSfwZ4312/+gtU76Ouc3DUD+jJblaqUGVBfvvrtJ6ZZRnmcN1qSrerI5/xop2NyC3AjoVqYXd133F6p3LXPVuWDWd5mi3gBkGXcx8m+x0PYrFGu7nMgoVN7qL55P91mT79Ac2d5GJFQqRWVX95VGzm6mI86k7aRLS3N122i+DafgErVt6JKr7t9Z+VG1sPYibFaA9JeWNrxqZ0/JWAfqaH9obPhIyBRkG3tlIclGGrnnbwhA0AwJsrWmU8nh/siJkb/zoI+yKby/RE0GcWcl4ZTg9323Iv6P+mbV9pYqujQLnqrf1sVzIGoyrTHi8XUsGc7FfDfQVCZQ8ghIOamXvU8v6yJh/g1bT8/rBPN/new6QR4LLbB0Ofmrfe/aYUfPr+s3RBCHGoQYIEmxeWCy/ujBYD0JftJBPWFOHNJpE1ZArydTyQz+XzjX03IiCU0iRUb2BGLh9cMZdrN7Vizf2elbVfwna/GVmc3oH1LTfMQY2dbyTf4Oat01Ln6rIcftLGzren4NOSw3oAcpmsyoyrw40XT6LKUJgfFrYYvVh1UGvkaL7ETV6q0dPUqdh46iilQukOqQ==|920 \ No newline at end of file diff --git a/UserControlPages/任务统计信息.rd b/UserControlPages/任务统计信息.rd index 62b4fbc4..6bc726ff 100644 --- a/UserControlPages/任务统计信息.rd +++ b/UserControlPages/任务统计信息.rd @@ -1,5 +1,5 @@ { "PageType": 3, - "ColumnCount": 10, + "ColumnCount": 9, "RowCount": 7 } \ No newline at end of file