From 8a4a964beeb8f18a529606cb83cf85ad9a549f8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B6=85=E5=93=A5?= Date: Thu, 20 Jun 2024 14:34:51 +0800 Subject: [PATCH] =?UTF-8?q?{"Message":"=E9=87=8D=E5=86=99=E9=83=A8?= =?UTF-8?q?=E5=88=86=E5=B7=A5=E6=97=B6=E6=A0=A1=E9=AA=8C=E9=80=BB=E8=BE=91?= =?UTF-8?q?","MessageType":2,"Modules":[{"State":1,"Type":7,"Name":"Table/?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E8=A1=A8"},{"State":1,"Type":23,"Name":"Tabl?= =?UTF-8?q?eView/=E5=8F=8D=E9=A6=88=E6=94=B6=E9=9B=86=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=8C=BF=E5=90=8D=E8=A7=86=E5=9B=BE"},{"State":1,"Type":1,"Nam?= =?UTF-8?q?e":"PCPage/=E9=A1=B9=E7=9B=AE=E6=88=90=E5=91=98=E8=AF=A6?= =?UTF-8?q?=E6=83=85"},{"State":1,"Type":1,"Name":"PCPage/=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E5=88=97=E8=A1=A8"},{"State":1,"Type":1,"Name":"PCPag?= =?UTF-8?q?e/=E4=BB=BB=E5=8A=A1=E9=A6=96=E9=A1=B5"},{"State":1,"Type":1,"N?= =?UTF-8?q?ame":"PCPage/=E4=BB=BB=E5=8A=A1-=E5=9F=BA=E6=9C=AC=E4=BF=A1?= =?UTF-8?q?=E6=81=AF"},{"State":1,"Type":1,"Name":"PCPage/=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1-=E5=B7=A5=E6=97=B6"},{"State":1,"Type":1,"Name":"PCPa?= =?UTF-8?q?ge/=E5=B7=A5=E6=97=B6=E8=AF=A6=E6=83=85"},{"State":1,"Type":1,"?= =?UTF-8?q?Name":"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?=E8=AE=A1=E7=AE=97=E6=8A=A5=E5=B7=A5=E6=95=B0=E6=8D=AE"},{"Stat?= =?UTF-8?q?e":1,"Type":15,"Name":"ServerCommand/=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=8F=91=E8=B5=B7=E6=B5=81=E7=A8=8B=E5=89=8D=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?"},{"State":1,"Type":28,"Name":"ProcessItem/=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=B5=81=E7=A8=8B"},{"State":1,"Type":1,"Nam?= =?UTF-8?q?e":"PCPage/=E9=A1=B5=E9=9D=A2=E5=8F=8D=E9=A6=88=E5=BD=95?= =?UTF-8?q?=E5=85=A5"},{"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"},{"State":1,"Typ?= =?UTF-8?q?e":23,"Name":"TableView/=E4=BB=BB=E5=8A=A1=E5=B9=B3=E8=A1=8C?= =?UTF-8?q?=E8=A7=86=E5=9B=BE"},{"State":1,"Type":28,"Name":"ProcessItem/?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=AB=8B=E9=A1=B9=E6=B5=81=E7=A8=8B"},{"Stat?= =?UTF-8?q?e":1,"Type":15,"Name":"ServerCommand/=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=8F=91=E8=B5=B7=E5=89=8D=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?"},{"State":3,"Type":31,"Name":"UserControlPage/=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E7=BB=9F=E8=AE=A1=E4=BF=A1=E6=81=AF"}],"Version":"v1"?= =?UTF-8?q?}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .collaboration | 242 +--------- Pages/31a709cea02e45ad83bb92336a6d829.json | 16 +- Pages/94f8bae36aee4ae7aec2a063ca731b1.json | 12 +- Pages/a3c94948c8a24e6a9d63fc05ebfd71f.json | 16 +- Pages/任务/任务-基本信息.json | 168 +++---- Pages/任务/任务-基本信息.rd | 37 +- Pages/任务/任务-工时.json | 313 ++++++------ Pages/任务/任务首页.json | 153 ++++-- Pages/任务/任务首页.rd | 42 +- Pages/任务/工时/新增报工.json | 94 ++-- Pages/任务/工时/新增报工.rd | 32 +- Pages/任务/工时详情.json | 41 +- Pages/任务/工时详情.rd | 8 +- Pages/项目/项目反馈/页面反馈录入.json | 26 +- Pages/项目/项目反馈/页面反馈录入.rd | 24 +- Pages/项目/项目成员详情.json | 111 +++-- Pages/项目/项目成员详情.rd | 8 +- .../项目首页/项目首页-容器页面/任务列表.json | 99 ++-- .../项目首页/项目首页-容器页面/任务列表.rd | 8 +- Process/新增任务流程.bpmn | 4 +- Process/项目立项流程.bpmn | 8 +- ServerCommands/任务/任务发起流程前校验.json | 124 +++-- ServerCommands/任务/修改任务预算工时.json | 456 ++++++++---------- ServerCommands/工时/上报实际工时.json | 259 +++++----- ServerCommands/工时/分配任务工时.json | 226 +++------ ServerCommands/工时/计算报工数据.json | 292 +++-------- ServerCommands/项目/项目流程发起前校验.json | 38 +- Tables/任务/任务平行视图.json | 149 ++++-- Tables/任务/任务表.json | 19 +- Tables/需求反馈/反馈收集任务匿名视图.json | 4 +- Tables/项目/项目平行视图.json | 72 ++- UserControlPages/任务统计信息.json | 315 ++++++++++++ UserControlPages/任务统计信息.rd | 5 + 33 files changed, 1740 insertions(+), 1681 deletions(-) create mode 100644 UserControlPages/任务统计信息.json create mode 100644 UserControlPages/任务统计信息.rd diff --git a/.collaboration b/.collaboration index b63aada1..1eae0b16 100644 --- a/.collaboration +++ b/.collaboration @@ -92,16 +92,7 @@ }, { "ModuleName": "Table/任务表", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-20T12:50:59.3957227+08:00", - "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\任务\\任务表.json" - ] + "ModuleType": 7 }, { "ModuleName": "Table/任务进展", @@ -258,16 +249,7 @@ }, { "ModuleName": "TableView/反馈收集任务匿名视图", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-20T10:09:28.0599067+08:00", - "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\需求反馈\\反馈收集任务匿名视图.json" - ] + "ModuleType": 23 }, { "ModuleName": "Tables/汇报", @@ -540,17 +522,7 @@ }, { "ModuleName": "PCPage/项目成员详情", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-20T10:34:19.6182735+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目成员详情.json", - "Pages\\项目\\项目成员详情.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目岗位详情", @@ -586,19 +558,7 @@ }, { "ModuleName": "PCPage/任务列表", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-20T13:03:44.4936003+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务列表.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务列表.rd", - "Pages\\a3c94948c8a24e6a9d63fc05ebfd71f.json", - "Pages\\a3c94948c8a24e6a9d63fc05ebfd71f.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目工时", @@ -710,17 +670,7 @@ }, { "ModuleName": "PCPage/任务首页", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-20T10:32:44.1341443+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\任务首页.json", - "Pages\\任务\\任务首页.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务部分", @@ -732,17 +682,7 @@ }, { "ModuleName": "PCPage/任务-基本信息", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-20T10:29:27.9773372+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\任务-基本信息.json", - "Pages\\任务\\任务-基本信息.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务-任务信息", @@ -758,19 +698,7 @@ }, { "ModuleName": "PCPage/任务-工时", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-20T10:41:12.4293268+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\任务-工时.json", - "Pages\\任务\\任务-工时.rd", - "Pages\\94f8bae36aee4ae7aec2a063ca731b1.json", - "Pages\\94f8bae36aee4ae7aec2a063ca731b1.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务-进展", @@ -782,19 +710,7 @@ }, { "ModuleName": "PCPage/工时详情", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-20T12:57:45.0332679+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\工时详情.json", - "Pages\\任务\\工时详情.rd", - "Pages\\31a709cea02e45ad83bb92336a6d829.json", - "Pages\\31a709cea02e45ad83bb92336a6d829.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/新增任务", @@ -830,17 +746,7 @@ }, { "ModuleName": "PCPage/新增报工", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-20T10:43:34.5351612+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\工时\\新增报工.json", - "Pages\\任务\\工时\\新增报工.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/分配计划工时", @@ -1080,16 +986,7 @@ }, { "ModuleName": "ServerCommand/修改任务预算工时", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-20T13:53:41.8751676+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\任务\\修改任务预算工时.json" - ] + "ModuleType": 15 }, { "ModuleName": "ServerCommand/移除任务成员", @@ -1117,29 +1014,11 @@ }, { "ModuleName": "ServerCommand/上报实际工时", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-20T14:24:40.3263635+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\工时\\上报实际工时.json" - ] + "ModuleType": 15 }, { "ModuleName": "ServerCommand/分配任务工时", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-20T14:30:14.3358137+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\工时\\分配任务工时.json" - ] + "ModuleType": 15 }, { "ModuleName": "ServerCommands/项目", @@ -1654,16 +1533,7 @@ }, { "ModuleName": "ServerCommand/计算报工数据", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-20T10:46:46.768252+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\工时\\计算报工数据.json" - ] + "ModuleType": 15 }, { "ModuleName": "PCPage/核定确认", @@ -2039,44 +1909,15 @@ }, { "ModuleName": "ServerCommand/任务发起流程前校验", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-20T10:13:03.8248099+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\任务\\任务发起流程前校验.json" - ] + "ModuleType": 15 }, { "ModuleName": "ProcessItem/新增任务流程", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-20T10:17:07.7697931+08:00", - "ModuleType": 28, - "ToRemoveFiles": [ - "Process\\新增任务流程.json", - "Process\\新增任务流程.bpmn" - ] + "ModuleType": 28 }, { "ModuleName": "PCPage/页面反馈录入", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-20T10:10:14.6551417+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目反馈\\页面反馈录入.json", - "Pages\\项目\\项目反馈\\页面反馈录入.rd" - ] + "ModuleType": 1 }, { "ModuleName": "ServerCommand/发起任务流程", @@ -2108,16 +1949,7 @@ }, { "ModuleName": "TableView/项目平行视图", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-20T14:06:41.6291669+08:00", - "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\项目\\项目平行视图.json" - ] + "ModuleType": 23 }, { "ModuleName": "Pages/任务/任务成员", @@ -2129,16 +1961,7 @@ }, { "ModuleName": "TableView/任务平行视图", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-20T12:57:11.3747013+08:00", - "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\任务\\任务平行视图.json" - ] + "ModuleType": 23 }, { "ModuleName": "Pages/任务/任务类型管理", @@ -2254,17 +2077,7 @@ }, { "ModuleName": "ProcessItem/项目立项流程", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-20T09:58:45.7328467+08:00", - "ModuleType": 28, - "ToRemoveFiles": [ - "Process\\项目立项流程.json", - "Process\\项目立项流程.bpmn" - ] + "ModuleType": 28 }, { "ModuleName": "PCPage/创建项目", @@ -2296,16 +2109,7 @@ }, { "ModuleName": "ServerCommand/项目流程发起前校验", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-20T09:59:38.6119498+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\项目\\项目流程发起前校验.json" - ] + "ModuleType": 15 }, { "ModuleName": "ServerCommandPrivate/递归检测子任务", @@ -2345,12 +2149,6 @@ }, { "ModuleName": "UserControlPage/任务统计信息", - "State": 3, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-20T13:13:50.0760645+08:00", "ModuleType": 31 } ] \ No newline at end of file diff --git a/Pages/31a709cea02e45ad83bb92336a6d829.json b/Pages/31a709cea02e45ad83bb92336a6d829.json index 1a7b21c1..f7e10ecb 100644 --- a/Pages/31a709cea02e45ad83bb92336a6d829.json +++ b/Pages/31a709cea02e45ad83bb92336a6d829.json @@ -224,7 +224,7 @@ } } ], - "ID": "6de9980b-acea-4578-9975-b3fddaee4ee1" + "ID": "cc6414c0-8d71-4e21-8a1f-5bda38e21d69" }, { "CommandList": [ @@ -239,12 +239,12 @@ "BtnText": "知道了" } ], - "ID": "5f945524-944d-424f-8f19-084fe4c2b9de" + "ID": "c6a8d546-184d-41b1-aec6-aaa597dbf6e9" } ] } ], - "ID": "e8707706-80f2-43dc-bf22-42ce2fd6c464" + "ID": "61fe0214-8f67-4058-844c-3f771b64bc7a" } ] } @@ -366,7 +366,7 @@ "value": "编辑" }, "CommandList": [], - "ID": "1bc14626-b986-4cf7-8d5b-43fb5b0fa237" + "ID": "75427578-3fff-4b0d-bf43-be22cfd18e71" }, { "Condition": { @@ -420,17 +420,17 @@ } } ], - "ID": "74a52a82-3513-4cf9-adbf-353ab7d8640f" + "ID": "9bd33793-772f-4e03-9bbf-40770581cf1b" } ] } ], - "ID": "f11fb3fb-44c6-41a2-b750-9eb30f8fc782" + "ID": "66d71c5c-95db-4fb2-bf5c-6f58014cfeff" } ] } ], - "ID": "71535b45-f714-4d82-9d1b-fa62b689dcb2" + "ID": "4a099079-1594-4b16-b203-aa37fdaced09" } ] } @@ -550,4 +550,4 @@ "PaperSize": {}, "Margin": {} } -}//WFTCgYJ9MqwFqeIqVXDPnWJQJM+gcJauq0z7OHXYtUp1jIm/LuvzHwsNWkw+oOVA/8OXzwyqII6ZDIVi1s2ElG13No9IxXmbkmZM65uDvkNFz2ODTY6s7ZItQfR4xBUSwX23LtSgZoLXXsBzHAmH4Kkh4e8Re0tYFcW+Q3RcB023XiehcT34Zl6phVmJhBi+1KZQPuJEB4KQ3hhB7KJMuHRFiRMVmZgKz1kMC/odNgqDTFj5HcIm3Rf6rXqo1ZmwcspmoBsDyRqNcvliGvermgM+ykT69qPlDCS0AT1dEbpG6PlDt01/3W3OWmeFY+RWkkM5Vnc9fT6RZYxcq2g54IbTQzonUmBTpRNqU9k/VFTaFWndZrmX2vEOmzmOrylFBH0Od1p2mW+IQAQpM7RCIf2qXeRPmyHisU9mcDebq2pYO5VVcRzsbQf8fMXhkmGnBi+dO4thz1AF+gTR1+FvBRnSKaC+i3EZ1qBNQ0btVy/7OX9p7PN34OjVKfHNRMiH/ey1LTvID5q+y3314kFRXA3/RnVB+jm6qS/GXsPxCQaNwHeh872vS8hg+Ocz2L3WPCAaOCieVsyKG9NC03eHLVomiLYKyPqh2Hgu0//HvLRqdPzFp1rZelitAbyRByHgka9bNwo5kiF/5Z8p9mp+N8LhoRvq2cO+IJ4q5FowA/8wzqvuwqXDK2MHIC9GRlSfVhbGahaB/DIB0TQhaKmWtL5/2mgYEcIYW4D1Yo+ON3GIvPZAe54is2b+89zmkuu4qoB5S50UwPWCAyZ4l2FuLj2o8/4c1uAO6poMdW7XO6tfSUyOeaOz/mA6MlTt4ylqSvvKFU5uARE8m9VVgnRKb7YSYd2dgpr/MI+6uOb7yzb8OHgeu1ODV8Zf+MZZV/AIfXSrZPHKmfF8jvNSOBd0FQ==|920 \ No newline at end of file +}//58WETGhJJVvEAKtlp2msSB8ewUo/hkWZzBIPJM1dWDR+xf6Gi2ae/RU8Vvq+Pi77qAA216c3Hhl8mnnkbop48fc9Obys8p3JWRzr3qBbKWr6mHn7m/Iz0uB4XR85saB6dY2PB7XIvdZRhpdZ0NRaT3jJ9N3FtuOMFhSvEFWS4re7+LW6lpLIoL3eMS339EREXpq88S/Q2M1Zmeb4umbyIXrtMOEnl82+i9GGd0Sbge+wn1GdI4PtnZl2sSRTo7VSuMyVfb8ygSZQOWf12bLgpjioOsvNJPVWfOFU3z+DfTyJqwKY0SwC053G8fddmIS1RB6ueQbkYADz1oKGm4/fWjgtvVsV+byVpJ7q1e0jvZ7jPou66/KswAROT2QGPbMANEN7sDuXG6Akg0e0T349/eRZNGIlW2MiwTD2R5ORzttubWmiN2WZcFicGRaodps0loFqdUClwzS9Lj6Qrk/MPxVdtKe7Cu8ctWjYNo7Topt3Y4cWKOS3rhCA+96izubNGxPZmybVQQK2Nj9R1YQzZOrvm3EAsH8nyTbDyc4kyK62rWb3X8/XK7K726tlADRRCpHW4B4SmSOoRtESKqSKtARUVLPrFEzAS0CewpqD51Qd40nbw/vJn7jvY2+Fv/I+X97Di/ufeTEHDkgA5a7NubUSTH1Jcfc5cNitbS166Lu4D+16b1IzWXHaYGrb49z1hQISDGMer2ULtTPb/Jt6K/3ylq0VvC4zEU02Yo1p/BaUgHLYm0yF0SQuDRLmUvwYlA18/wqqhLJ1qdDlWlbbKFVPahwMzRdSoayQMVjdWOu739TEmv+VgPzuqYqNSwO3DMFyWxhse1yCituj/YArQ6rZ+KNg3U2HQJOcAsX44BKT2pnZU2bkuDGtuIV2wBhsQi/c/0zrWFTaTO+b84QhEQ==|920 \ No newline at end of file diff --git a/Pages/94f8bae36aee4ae7aec2a063ca731b1.json b/Pages/94f8bae36aee4ae7aec2a063ca731b1.json index c7142a15..d9480d8c 100644 --- a/Pages/94f8bae36aee4ae7aec2a063ca731b1.json +++ b/Pages/94f8bae36aee4ae7aec2a063ca731b1.json @@ -145,7 +145,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "f6380382-03ae-4f88-832b-a21b8e1b5515" + "ID": "9a2db6fa-bea9-4d1c-a605-08406a96b4af" }, { "CommandList": [ @@ -174,7 +174,7 @@ "ConfirmText": "您确定要删除吗？" } ], - "ID": "e43043c7-6581-4094-97d5-8ae00531ceaa" + "ID": "59403beb-255f-4003-935d-ab6cdcc92631" }, { "CommandList": [ @@ -184,17 +184,17 @@ "Message": "该报工已请款，无法删除" } ], - "ID": "8b0b8862-07f0-4d31-898a-333a3bdc27f5" + "ID": "f41fa805-852d-4472-a85b-b61b517f5e30" } ] } ], - "ID": "0c86dd95-4cca-4645-9a22-27090af1a6f2" + "ID": "ea4c94c0-7b5d-4fdf-8e77-3d0990f2d095" } ] } ], - "ID": "aac76f27-0dae-42ba-8763-da35ffdc7d27" + "ID": "2b117c97-11a5-42e2-94ac-d9d581e11fa4" } ] } @@ -262,4 +262,4 @@ "PaperSize": {}, "Margin": {} } -}//yrF39GyFmVkZT+xZoSziVP5eeDhDxgShhMQNtpJtRUN04i4sPg2A7URQ3xIPdzjN9nRno5FgF7vPXx0ntPBBJIBQwbYPYJQqj5nxav8znSWXbYnz0Vp/wr6rCx7N41YxcTETt+NM/9S6cZ2IjNXIgEeB0aOv0ltS3HUoQABq0+6ms2Gqg9vin6+k00tUSPHcYmWNCNY9PQ4+0Y0O3Ugx49oN48IcoPN73lV6jREdtjGKG3fuzzab2WX3/w6k8vVdy/PeRc5hJCij7OZpLhTSf04rmrkpGhaLMaHVxK1VFvvfVtjMsxGQJEXtxGIqndNh9A7u1V6oLbCFgDZsz2GCTNA/PaptCkNEHcinQUhnVvt0aSMmgi6fVH8zNyN2Is5pTuqQzW1Gxu6TWhEzxyz7bkXkwe4rrsMsR0eYYqBytAXriK+FBxVVgTr6S/UB+JI44la/CEgVA8Pm6gfF6cO4LlrM5tiiEE/gYSdlkjFdJ1E6dDvsl22bE1V96GaVwqaiHKVwlb2TzfzGxdggV2Nne1dHoEJg5NY/iofYPjbgVFxoH+AHxvXD9U1JpiZfWXZ3LborySutjR29DJme0EI9EAK8wTkfBY2TumAvjrUvk9bxVJDPCiZFZThOnjDNggIrMBh9ib4IS6mA5OAMW8pC+krLyYogEvTkp8t7da+h1kTWP50bjCBkFjzynVk7BqdfKolmXhYnCKYQ98QAuL7HBi9T0U2u6IqjRnSIMv41V7ND6rapjiL4+w0PQfdNmh4nLlyOZBcenQmn6rzsPTN2GcWjFKAfA6j6XX4br3hkCofAol+AOQDyziim/EOSySum9V/4A7MBtVZKJ0k8U6/96Je6Jk9gnpcN1u3bxBE55ya9ay0fXSexpA+pSGjl/egWwf10WuWQN+QkRrQhE1opCw==|920 \ No newline at end of file +}//PK6f9CXWsya/j01OiJBt4uKCRCHzGDii/tUB0XIvVyiIE2h9unzg/lrj5O3AgXvWffnkxa7GQH7dohHbMP7WbaMLHw2BQ5BnkJaF9cFLX+Gizln7PuG8GEkhHKjXTbpMuUmQvNPYMOJ0daSFpvDckQahgTed87qFR8AygZNcD6Wfk/ZbFkzh8dB7YPHbYwBahPWD2D3JkXlf3wJPCkCEgK0qp060Fp8REwYU3Tu8DD5q/p4nzlMFpU/C1G+l0MYVvpiXqJV7Ss92DeDHcZVATc789aYkwv6hklGpKW4/Rruv6oqBzJz9qmWIqYq3dE4gj8LQIU95k0gdBj0EQ2H/pUotnQWoOeC/ImKAKEHKmdYD/Ch9cOONs8RXsbsS8PEIznM1njnw4snv2aUBCfcrrvA0qaPUVIpGFmXQ+I+IhRiphGxVCf00fA/BFloOrA1mLCZ93AniduIT2flmC3cSOikPIqeUKtZutgGLCE1ZBulHyKWaDi1+xZrnoPvvbMigQyqAhXD64NTX39Wspye5bRNoAad9k6colozwG0KIuWQv5ejGYWk0ImXzfPOZRa84DgEesfaAxggCfrENBwK/LW5tU57PwPfX2lQYQnikVfT2bn4edA+KZJN6x66aXxXJIG5Ozf6ER0x/97c+OpqxPQzpdDt6KUud30uVC9lVnI1PO2Dk2W2BZFY/jdosDOM2xQHMTxE8kbE9g7fujKVUSixz+J9A3tdNj/gIIZ7GEZQb6BOaaVmkeDRweNXf9Yj0DDiPpE0pVTFS9MgRZVXbRpX9Dc0rnJaRdFLzHv4H/mhkfYPvuvK0dUceNlfJGe0PxEcOqA38rc8eIb/Qgktz7Ub9JqRjmJhGik2/dFpuS0LhtUjQWAPok4LxfigVl+QdSxgGSjKA+eMgrDaAzwxXKQ==|920 \ No newline at end of file diff --git a/Pages/a3c94948c8a24e6a9d63fc05ebfd71f.json b/Pages/a3c94948c8a24e6a9d63fc05ebfd71f.json index a2bdd2f8..7025d5e0 100644 --- a/Pages/a3c94948c8a24e6a9d63fc05ebfd71f.json +++ b/Pages/a3c94948c8a24e6a9d63fc05ebfd71f.json @@ -155,7 +155,7 @@ ] } ], - "ID": "03aeb5bb-f5d3-443b-9817-c7f79ace5846" + "ID": "363f4248-0f06-4f22-b9b0-4c79008137f2" } ] } @@ -229,7 +229,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "b98cd376-caaf-4c42-b976-8ed1fa1c9481" + "ID": "ec3505fa-a2df-448e-9e6c-accad0068a62" }, { "Condition": { @@ -259,7 +259,7 @@ "Message": "复制成功" } ], - "ID": "dd2a1e78-9fdf-47db-bc53-4365cb6aac0b" + "ID": "25a5f661-21cb-46ec-af4b-4dfe7e28dd1b" }, { "Condition": { @@ -336,7 +336,7 @@ "Message": "操作成功" } ], - "ID": "71c32e9c-2ef9-4544-82bb-1c46871f7335" + "ID": "ffe4ea1b-31f9-4ccb-bdc7-9fd556228c6b" }, { "CommandList": [ @@ -351,17 +351,17 @@ "BtnText": "知道了" } ], - "ID": "00834f27-bdbc-44d7-bc2f-1ed95b3ff9df" + "ID": "b41c4c05-d30b-4d85-ad51-2b0dbb7a1c5c" } ] } ], - "ID": "dc17ae49-3c26-40f2-8b7b-36cf987be255" + "ID": "55d5807b-6b45-40e9-a62a-f3fc1e63c6d8" } ] } ], - "ID": "351094d8-89e8-45ca-a9e5-bc3b28139b6e" + "ID": "d303ce6b-07ea-4981-b6d4-c4d993ec2348" } ] } @@ -456,4 +456,4 @@ "Size": "24,24" } ] -}//NmpmTzgXw5QmoV60P1gQ01933RKZ1qcPP3LKSyYSjJJnM0LJJarS4kIpBOa7zq7alZt0gl90ZgzQKHMponjIl1qRuAfcSUKSufRSh6+WdbQ+IM7gRCts8SlkSiZD8qVBOlZRAOVm0LYUjwylIPZz+p3y6tMxdNlZFv6+oZQ1AGXOwej5ovtglAjxw1u1HAFiQcMmzZoBmWg+RDIzaikNolJkVw9f4zZXFa/mToy4790JwescAbDV6NR1OaxhwIMtEpZuB7Mm1KZ4g87hH6K1Z/WnObxr7SpvAzycAAJrjD26yFIk06wpYFnHTMthMzwLcKgN50d76xzyz6i6ZdT0qM12noKuM/bdlleBAAmXswvn7cQLkYMaOgDxSplumVtLRdHC45lgV8DLK5AuA+N47XQ9GRuIIbzr7Bv+7MOGRUAXB8/V3er+gvv42t7+ZUmnIZ6EJUOzHWhk029IOz+oGFqig2cvmqOble4kQgmy/7gBmqb/7uvkLEMKDrt16Dgr0L3oWghPiPZjSZ6n4vuVKwWD6+LoZPtWqmOmd8h6a0R4nCnXbjorJ4tGR4bamgMKQ7ti1tAjbDMf1WhJoEzOSiS7LfoLJpssUsWagAXE1RFdYw1xPr2VzeiJrqjTQnJB0wj9Sz+zUuu73MUV3a3+H5jKqZ1tOS1ueeQSPgMvWSFjkiEdikJyokP8D4QYzjorglXg+mC+kQuE/G4cRO+9LBcxDp0VQNtlc9v5uUSTSDp7ICeUTiTm+aTJN0bnxfmO6drXvt1PEeGaMV3z5bjWcW19FCo2ktjc9Db2lkX00kyaIIJ3+evz5QnZZBydQizqa3hnMvhNbqKb7gG4fx+p4ZCvLAd7nlJJHSkcIq2ICsYqRxCW9iUvi3k3sOhYw7D7mN++dL2zU1gElR2pL6OSmA==|920 \ No newline at end of file +}//YO19iMyazAkh3fPP6AhX3UfRoEy55fkqwVtPPJpoCbSk2E1GWBQSsFbzOzoazyZDMEcmmzYpIQVkBqxzYakN9+lK9cSuMDNzHGSZC6p3qGDBU8XpTUkqyk+AAK4Vmk75rSb2J8jG+HS0/hPQ24Z62vncu63Ectlql3DYR9j3KPe3yFSruU3XCSUSGGixKANq1OEUHEfFlAblD7BZb5x3I89OcSvK2Lkryrdp02cmvLv/V3OGBhOmT6k6K1A+V56tY0ULZbJf/h/FpyzwcrekVn6mR2sGBodfGu+rJC6Nh9L4HmSSUT2AFu6Y/RofP2b+hs8aA61lHb0PUJQxRc1sLqWo89WnmdK7r9KeNj/Gp++qL7/MzxiDPT/vsLunfwLimUNUT3xlnt99MM74B9cxaJImXmaNMXW2hg64ws2cXaMLWEnzgEv6taMFwgJDnUwMHJVSAufDJ1lc1TN9SsJico3822SkfcUp0PTzXc9W5fJSEb8JnlSBmiWEiY4P8kis0lUE49Hf+iLVgHtz2AEJvvD1U+p/6u8EpzigsSJ3jwrpSr78y9cq3iAI9rYs2r5Nebq/i1hjuJrd6pcOGud5u2sJGfAb16FTsIItR2DqaLVh88u2x2Zzym/D4pe4qLxDGZlC7lD9as/dSpG7/DqJGgB7diwv3ik1InVetLID81P936Khx9djy1UhVnlPt1seU4tn4yAMV3zunOLcbbR3WZVJKqgcJUMdZblWK5HiCveuEiY+iiZnkWmp8K8d5FgoVWmc5aM2+MrMPTUuudEmT+l4CBLGDsmUTSG8BFfrmbT5Vo0YqcxEUsRgOvUgcSpWLThuHJKhd8GHSV1Jso3APBhW//5pr66GPOqg7cSbuAdr7B/tKHHFcFfXEfW3DS2Xn/m04HN5SX6zN3nI92cMUw==|920 \ No newline at end of file diff --git a/Pages/任务/任务-基本信息.json b/Pages/任务/任务-基本信息.json index be76253f..9c8fe380 100644 --- a/Pages/任务/任务-基本信息.json +++ b/Pages/任务/任务-基本信息.json @@ -58,7 +58,8 @@ }, "13": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 38.0 + "DesignLengthInPixel": 38.0, + "IsHidden": true } } }, @@ -120,6 +121,11 @@ "DesignLengthInPixel": 32.0 } }, + "10": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 93.0 + } + }, "11": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 @@ -145,9 +151,14 @@ "DesignLengthInPixel": 32.0 } }, + "18": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 55.0 + } + }, "19": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 209.0, + "DesignLengthInPixel": 600.0, "Mode": 2, "MinLength": { "Unit": 1 @@ -156,16 +167,6 @@ "Value": 1.0 } } - }, - "10": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 93.0 - } - }, - "18": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 17.0 - } } }, "Count": 21, @@ -185,7 +186,6 @@ "11,10": "任务预算工时" }, "Formulas": { - "7,19": "L12-任务总计划工时", "7,2": "项目ID" }, "AttachInfos": { @@ -290,13 +290,19 @@ ] } ], - "ID": "dc3f9f81-16cf-47df-9d55-c03b0b867cf7" + "ID": "3751fe65-18a1-4cee-9795-3902993428a3" } ] } ] } }, + "1,19": { + "CellType": { + "$type": "Forguncy.UserControlPageCellType, ServerDesignerCommon", + "UserControlPageName": "任务统计信息" + } + }, "3,2": { "BindingInfo": { "TableName": "任务表", @@ -418,7 +424,7 @@ } } ], - "ID": "bbe0fc41-e472-4c3c-99d9-9e53df6f1b9e" + "ID": "721d0fc7-c9bc-45d3-92be-b636eacf0587" }, { "CommandList": [ @@ -433,12 +439,12 @@ "BtnText": "知道了" } ], - "ID": "fd00cba3-fc58-46ac-92f0-d28d4955b723" + "ID": "cac790ce-4101-498c-bc5a-30c13d0bf130" } ] } ], - "ID": "a81ce2ba-1ffd-4b95-a067-714ccb975f74" + "ID": "84d5385d-ee02-40f8-a834-5c4ecb957098" } ] } @@ -451,7 +457,7 @@ } ], "Comments": "小于进行中", - "ID": "a026e706-c6d5-4ba2-9da8-c526e9d123f2" + "ID": "2ecff11d-b7a9-4b2a-bfdb-67c1aa6ae5f7" }, { "CommandList": [ @@ -461,7 +467,7 @@ "Message": "任务尚未审批完成，不可修改状态" } ], - "ID": "19dd02f1-7911-45cc-88b5-ceb54809b02e" + "ID": "e3ce004b-42ba-40b0-9d2d-370a1da237a3" } ] } @@ -559,7 +565,7 @@ ] } ], - "ID": "a4ba347a-65cc-43f4-b345-494a5d972494" + "ID": "f9f47166-8509-48aa-8693-2bdaa5a0b42d" } ] } @@ -641,7 +647,7 @@ ] } ], - "ID": "995c9f4e-e3c5-4e8b-860a-4c4b771f6d96" + "ID": "e523a2f8-ed6e-4759-a8ba-60aba629855d" } ] } @@ -792,7 +798,7 @@ ] } ], - "ID": "fc9381da-82b5-4ab8-8865-8f4502c69f9f" + "ID": "eeb46e7b-1986-4481-b079-fc24126e85f5" } ] } @@ -889,6 +895,7 @@ }, "CellType": { "$type": "ElementUI.SelectCellType, ElementUI", + "CommandList": [], "UIPermissions": [ { "Scope": 2, @@ -1096,7 +1103,7 @@ "BtnText": "知道了" } ], - "ID": "22f0c50c-8e90-4657-b3c7-a86386b9cc54" + "ID": "dc4329a0-ffc9-41bc-b3af-3fe09dc5001b" } ] }, @@ -1110,7 +1117,7 @@ "Title": "计算中" } ], - "ID": "b6a07399-4184-47dc-ad25-d072b12c48c0" + "ID": "03f935c4-b172-48d9-aaf3-2bd9fb76e6de" }, { "CommandList": [ @@ -1147,12 +1154,12 @@ ] } ], - "ID": "f38c9f4a-9c66-4762-9deb-66f66eb60537" + "ID": "4ab90d43-cb0a-4542-9e22-612da17423e0" } ] } ], - "ID": "613a0a20-ddda-4604-9f70-a52e0c899a63" + "ID": "0917de94-db17-43c7-b175-5b3dc6657009" } ] } @@ -1304,7 +1311,7 @@ ] } ], - "ID": "e2eeeb77-ace1-4c19-824c-a9df455ac0b1" + "ID": "2b06ad40-dba1-492d-97bb-bd31ac2422e8" } ] } @@ -1412,7 +1419,7 @@ ] } ], - "ID": "2fe5aa02-0539-48cf-bf57-c8569be06aa1" + "ID": "96059599-eabb-4d90-b8c3-d7ce1cc1406f" } ] } @@ -1520,7 +1527,7 @@ ] } ], - "ID": "58e58da8-1bc9-4f52-9cca-017cd5ccc0f0" + "ID": "88a2effd-bc0b-4b2a-b4b5-cbb8899783c6" } ] } @@ -1660,7 +1667,7 @@ "$type": "Notiflix_Forguncy.Block_Command, Notiflix_Forguncy", "Cell": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-基本信息'!任务基本信息" + "SerializeProperty": "='任务-基本信息'!预算工时" }, "Title": "校验中" }, @@ -1728,7 +1735,7 @@ "BtnText": "知道了" } ], - "ID": "7c024a44-4f58-4fd2-bbdc-7e9729d8a65b" + "ID": "48054c55-0a91-41ee-b457-c7065c6c604f" } ] }, @@ -1737,12 +1744,12 @@ "FunctionName": "remove", "Cell": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-基本信息'!任务基本信息" + "SerializeProperty": "='任务-基本信息'!预算工时" }, "Title": "计算中" } ], - "ID": "716b3e15-b827-4a15-a4a4-f5c5b831899f" + "ID": "b0f7ad95-d4c0-4960-95d6-afb9489c0baa" }, { "CommandList": [ @@ -1778,12 +1785,12 @@ ] } ], - "ID": "42192862-4af8-42e7-9e4b-c66d25d0f1a3" + "ID": "c25b3afc-b452-4cbe-907e-69782d041540" } ] } ], - "ID": "cbe5d781-c5d1-4562-ba15-22f8b0ecd395" + "ID": "6660222c-5119-4b03-8c03-e6a3cfb92ab5" } ] } @@ -1818,50 +1825,34 @@ "Formatter": 0 }, { + "FontFamily": 1, "FontSize": 18.666666666666664, - "Foreground": 1, + "Foreground": 2, "Formatter": 0 }, { "FontSize": -1.0 }, { - "FontFamily": 2, + "FontFamily": 1, "FontSize": 13.333333333333332 }, { - "FontFamily": 2, + "FontFamily": 1, "FontSize": 13.333333333333332, "Foreground": 3 }, { - "FontFamily": 2, + "FontFamily": 1, "FontSize": 13.333333333333332, "Foreground": 3, "Formatter": 4 }, { - "FontFamily": 2, + "FontFamily": 1, "FontSize": 13.333333333333332, "HorizontalAlignment": 5 }, - { - "FontFamily": 2, - "FontSize": 13.333333333333332, - "Foreground": 6, - "TextIndent": 15, - "HorizontalAlignment": 5, - "Underline": false - }, - { - "FontFamily": 2, - "FontSize": 13.333333333333332, - "Foreground": 3, - "Formatter": 7, - "TextIndent": 10, - "HorizontalAlignment": 5, - "WordWrap": true - }, { "FontSize": -1.0, "Foreground": null @@ -1873,13 +1864,11 @@ "Types": { "Strs": [ "@", - "black", "Body", + "black", "Text 1 50", "[AUTO]General", - "Left", - "Accent 1 0", - "\"待分配：\"0.0\"h\"" + "Left" ] }, "CellStyles": { @@ -1904,7 +1893,6 @@ "3,16": 3, "3,17": 3, "3,18": 6, - "3,19": 3, "3,20": 3, "5,10": 4, "5,11": 3, @@ -1915,7 +1903,6 @@ "5,16": 3, "5,17": 3, "5,18": 3, - "5,19": 7, "7,1": 5, "7,2": 3, "7,3": 3, @@ -1934,10 +1921,8 @@ "7,16": 3, "7,17": 3, "7,18": 6, - "7,19": 8, "8,0": 3, "8,18": 3, - "8,19": 3, "8,20": 3, "9,0": 3, "9,1": 5, @@ -1946,11 +1931,9 @@ "9,10": 5, "9,11": 3, "9,18": 3, - "9,19": 3, "9,20": 3, "10,0": 3, "10,18": 3, - "10,19": 3, "10,20": 3, "11,0": 3, "11,1": 5, @@ -1971,7 +1954,6 @@ "11,16": 3, "11,17": 3, "11,18": 3, - "11,19": 3, "11,20": 3, "12,0": 3, "12,1": 5, @@ -1995,15 +1977,15 @@ "12,19": 3, "12,20": 3, "13,0": 3, - "13,1": 9, + "13,1": 7, "13,18": 3, "13,19": 3 }, "ColStyles": { - "1": 10 + "1": 8 }, "SheetStyle": { - "FontFamily": 2, + "FontFamily": 1, "FontSize": 13.333333333333332 } }, @@ -2013,13 +1995,13 @@ "1,1,1,17", "5,11,1,7", "3,11,1,7", - "7,19,1,1", "7,2,1,7", "7,11,1,7", "11,2,1,7", "11,11,1,7", "9,2,1,7", - "9,11,1,7" + "9,11,1,7", + "1,19,11,1" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -2049,7 +2031,7 @@ } } ], - "ID": "1d213a1d-3908-4e5b-b76c-59b730ccbbd6" + "ID": "53468bbc-91cc-4c9f-8b20-7473594156e7" } ] } @@ -2151,6 +2133,22 @@ "Margin": {} }, "CustomNames": [ + { + "Name": "父任务ID", + "Formula": "'任务-基本信息'!$L$8" + }, + { + "Name": "结束日期", + "Formula": "'任务-基本信息'!$L$10" + }, + { + "Name": "开始日期", + "Formula": "'任务-基本信息'!$C$10" + }, + { + "Name": "里程碑", + "Formula": "'任务-基本信息'!$L$4" + }, { "Name": "任务分组", "Formula": "'任务-基本信息'!$L$6" @@ -2159,33 +2157,17 @@ "Name": "任务类型", "Formula": "'任务-基本信息'!$C$6" }, - { - "Name": "执行者", - "Formula": "'任务-基本信息'!$C$12" - }, { "Name": "任务名称", "Formula": "'任务-基本信息'!$B$2" }, - { - "Name": "父任务ID", - "Formula": "'任务-基本信息'!$L$8" - }, - { - "Name": "里程碑", - "Formula": "'任务-基本信息'!$L$4" - }, { "Name": "预算工时", "Formula": "'任务-基本信息'!$L$12" }, { - "Name": "开始日期", - "Formula": "'任务-基本信息'!$C$10" - }, - { - "Name": "结束日期", - "Formula": "'任务-基本信息'!$L$10" + "Name": "执行者", + "Formula": "'任务-基本信息'!$C$12" } ] -}//wayzYEdSmQUOAmzQruVPB8BBnVbrFPtgmpFr1z+RKtnoykkSV3PPn8fPrcXbb82GC/B+8IRchRKacOpRNBZRx6mY2dX6J2sdBeEpBx1+RDNehdGm4vvpO6TEP/Wb0ukGp5VoYd1Wb1f5VSnmyjVq4cweCMyo6qo94aIaKhKb0BVt2hOgJjG93LVduFPAODnaeZ0hE2FUkJxLDEf5bAavOtdlutSqm2I8+PzUv3RriVPrUvkOuwbk7FAAG8ZSbeAt7O15e+fwtQNdrzs/Px5MEiViASA8MawaI+fnM9znWdclIKN+8WtQuDMPzBrQZinsL9K37mdfbk8p9PUnfrt1xedrV1tUrj7htnx4BHnrznHXEiRnXuhQeVkyD7Tn/DBlk6/K09ZsNXWBvL85ztGgVvPy74DWHpj8Bwew/zVvXamkRlh4UY/HIFQMiJaYs/Q+f96mUzZHDWvBzfxYvbEIra4+OdSpIpSy37Wd5CwoA/Qw5eO8wDe/rSrD3pPvN6zkb8pZiPTrdGYb7lDRFgHwBFif5Oay3YEqH6bAjLAwIp4GwCJ5HDX8w8BQn0UWrJBhnHVCX8zaRsvXfBa57ScVtwAs6mRMQ2JrncZ+ElwERcJgFJrYHTp1PY4rv2CcCehnyVby/l4yjRzV0496C4ARROkUtFnkDJ/W1AO/0pFEPV/gyZO5kf11Ronpki4KonuSRHJJNd/S8B3JtLl78Z/WkefSSy1HcU9Zv56M2gw0/sjPbD1MNB4i7O76it5zKLM7S6zg0Ya8D7QnMkH76BzP8WO4v8dd4eElk1lws3ecTgi7e2grinXDIOIZqdODuFi6afsmn/cy1o0TaiFwv1adMSx6ox/t/Jr40LMnxTVaICRRpeG/09hJLBOcngF9HYeh/25XbW1oFLofBMR1Q7YnDA==|920 \ No newline at end of file +}//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 diff --git a/Pages/任务/任务-基本信息.rd b/Pages/任务/任务-基本信息.rd index fa0bbf67..d9f6a144 100644 --- a/Pages/任务/任务-基本信息.rd +++ b/Pages/任务/任务-基本信息.rd @@ -3,10 +3,25 @@ "ColumnCount": 21, "RowCount": 14, "Formulas": { - "7,19": "L12-任务总计划工时", "7,2": "项目ID" }, "CustomNames": [ + { + "Name": "父任务ID", + "Formula": "'任务-基本信息'!$L$8" + }, + { + "Name": "结束日期", + "Formula": "'任务-基本信息'!$L$10" + }, + { + "Name": "开始日期", + "Formula": "'任务-基本信息'!$C$10" + }, + { + "Name": "里程碑", + "Formula": "'任务-基本信息'!$L$4" + }, { "Name": "任务分组", "Formula": "'任务-基本信息'!$L$6" @@ -15,33 +30,17 @@ "Name": "任务类型", "Formula": "'任务-基本信息'!$C$6" }, - { - "Name": "执行者", - "Formula": "'任务-基本信息'!$C$12" - }, { "Name": "任务名称", "Formula": "'任务-基本信息'!$B$2" }, - { - "Name": "父任务ID", - "Formula": "'任务-基本信息'!$L$8" - }, - { - "Name": "里程碑", - "Formula": "'任务-基本信息'!$L$4" - }, { "Name": "预算工时", "Formula": "'任务-基本信息'!$L$12" }, { - "Name": "开始日期", - "Formula": "'任务-基本信息'!$C$10" - }, - { - "Name": "结束日期", - "Formula": "'任务-基本信息'!$L$10" + "Name": "执行者", + "Formula": "'任务-基本信息'!$C$12" } ] } \ No newline at end of file diff --git a/Pages/任务/任务-工时.json b/Pages/任务/任务-工时.json index a3a17b09..d5ec7c30 100644 --- a/Pages/任务/任务-工时.json +++ b/Pages/任务/任务-工时.json @@ -231,6 +231,23 @@ "IconSize": 14.0 } }, + "1,19": { + "BindingInfo": { + "TableName": "任务平行视图", + "ColumnName": "项目ID", + "GUID": "28c08d4f-28a6-44b3-99c3-bf3af881287d", + "RelationBinding": { + "RelatedTable": "项目平行视图", + "RelatedColumn": "ID", + "DisplayColumn": "工时分配方式", + "NextRelationBinding": { + "RelatedTable": "工时分配方式", + "RelatedColumn": "ID", + "DisplayColumn": "分配方式" + } + } + } + }, "1,20": { "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", @@ -285,8 +302,8 @@ "4,4": { "BindingInfo": { "TableName": "任务平行视图", - "ColumnName": "成员计划工时", - "GUID": "d4228306-b932-4d00-aa87-be3efef5e2f3" + "ColumnName": "已分配工时", + "GUID": "3a1a5570-daf8-4c9f-a8cc-61ba96c060c0" }, "CellType": { "$type": "Forguncy.HyperlinkCellType, ServerDesignerCommon", @@ -315,7 +332,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "25807078-9764-4a29-a397-8daf7f416afa" + "ID": "50c7327b-0464-4d82-9ce4-ff01a67d5725" }, { "CommandList": [ @@ -354,12 +371,12 @@ "LoadBindingDataOption": 1 } ], - "ID": "99cdfabe-fcaa-471d-8349-ab3bd6355d50" + "ID": "d8845c4b-f31a-4615-b98b-15c24f2b1fb9" } ] } ], - "ID": "c3a1de6c-5b2d-4f11-a4ab-062a1cab69b9" + "ID": "700ddad3-3ccb-4251-b4a9-5373c7641cf7" } ] } @@ -396,7 +413,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "8a9f7ec2-778b-49dd-afea-ea7e3dbdf4d9" + "ID": "4d885980-2a1f-4c99-852d-761c252f4df3" }, { "CommandList": [ @@ -435,12 +452,12 @@ "LoadBindingDataOption": 1 } ], - "ID": "69da5f72-acdd-4ce5-a9c9-a30d7f5e1985" + "ID": "5145d874-a36a-46c6-b8c1-e0ab2e5254d7" } ] } ], - "ID": "2e1a0437-2ea7-4746-b002-88961812ecb4" + "ID": "dffc353b-942c-459d-9312-a3f0c1664bce" } ] } @@ -463,8 +480,8 @@ "8,4": { "BindingInfo": { "TableName": "任务平行视图", - "ColumnName": "成员实际工时", - "GUID": "2516549e-9623-4b43-ac23-4c485c9b5033" + "ColumnName": "实际工时", + "GUID": "67129f34-c488-4414-98be-114feed2eab1" }, "CellType": { "$type": "Forguncy.HyperlinkCellType, ServerDesignerCommon", @@ -493,7 +510,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "d90acc68-4f9a-49ef-bf92-a0157cb77a46" + "ID": "00fe2d7a-9994-481f-8a26-0044b697cb3c" }, { "CommandList": [ @@ -532,12 +549,12 @@ "LoadBindingDataOption": 1 } ], - "ID": "5f786957-ecca-4d41-a707-cc70e8aa020a" + "ID": "dd9c7775-5ae3-4969-9414-da9230d74704" } ] } ], - "ID": "3bf6a1b3-6d32-4f95-bee0-786fb27c23ed" + "ID": "be6260b8-309a-4e63-8e46-8ca5a264f36d" } ] } @@ -599,7 +616,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "3ad0bb3a-2938-4679-b9bb-2f553663831c" + "ID": "79962f11-e192-45b4-a503-9b41897d7ba9" }, { "CommandList": [ @@ -638,17 +655,17 @@ "LoadBindingDataOption": 1 } ], - "ID": "0194f2c9-13db-473b-94dc-75cb53850936" + "ID": "4b7c0cce-b0c1-4fd3-8bd3-49b160e7197e" } ] } ], - "ID": "36d9e3d0-afe7-437e-b31b-b9aecf36ae90" + "ID": "25737cab-e750-40b8-8094-6cf043daccdf" } ] } ], - "ID": "471eebf6-e80f-42f6-af56-83d594e38ab8" + "ID": "fd58ba28-f292-47dd-bd12-66b628e266db" }, { "CommandList": [ @@ -658,7 +675,7 @@ "Message": "当前任务状态，允许上报工时" } ], - "ID": "d62f5514-da97-4cbb-8c18-d0426d99b6a8" + "ID": "4bf7a7d2-1d66-4018-b012-23c8f3f54d2d" } ] } @@ -889,7 +906,7 @@ ] } ], - "ID": "a6feb4f1-824c-4742-8f06-8e62ff23f993" + "ID": "8abe279d-0fef-4644-85df-427d6cf0653b" }, { "CommandList": [ @@ -909,7 +926,7 @@ ] } ], - "ID": "e9fd5373-7032-4c81-bf32-901caa524ab4" + "ID": "49195b9e-0ca2-4ee5-a464-20847630d090" } ] } @@ -926,10 +943,16 @@ "Formatter": 2, "HorizontalAlignment": 3 }, + { + "FontSize": 12.0, + "Foreground": 4, + "TextIndent": 5, + "HorizontalAlignment": 5 + }, { "FontFamily": 0, "FontSize": 13.333333333333332, - "Foreground": 4 + "Foreground": 6 }, { "FontFamily": 0, @@ -938,35 +961,35 @@ { "FontFamily": 0, "FontSize": 13.333333333333332, - "Foreground": 5, + "Foreground": 7, "Formatter": 2, - "HorizontalAlignment": 6 + "HorizontalAlignment": 8 }, { "FontFamily": 0, "FontSize": 13.333333333333332, - "Foreground": 7, - "HorizontalAlignment": 6 + "Foreground": 4, + "HorizontalAlignment": 8 }, { - "Formatter": 8, + "Formatter": 9, + "TextIndent": 5, + "HorizontalAlignment": 3, + "Underline": false + }, + { + "Foreground": 6 + }, + { + "FontFamily": 0, + "FontSize": 13.333333333333332, + "Formatter": 9, "TextIndent": 5, "HorizontalAlignment": 3, "Underline": false }, { "Foreground": 4 - }, - { - "FontFamily": 0, - "FontSize": 13.333333333333332, - "Formatter": 8, - "TextIndent": 5, - "HorizontalAlignment": 3, - "Underline": false - }, - { - "Foreground": 7 } ], "Types": { @@ -975,19 +998,21 @@ "black", "[AUTO]General", "Left", + "Text 1 50", + "Right", "Accent 1 0", "Background 1 -25", "Center", - "Text 1 50", "General\"小时\"" ] }, "CellStyles": { "1,1": 0, - "1,20": 1, - "1,21": 2, - "1,22": 2, - "1,23": 3, + "1,19": 1, + "1,20": 2, + "1,21": 3, + "1,22": 3, + "1,23": 4, "2,1": 0, "2,2": 0, "2,3": 0, @@ -1009,107 +1034,107 @@ "2,19": 0, "2,20": 0, "2,21": 0, - "2,23": 3, - "4,2": 4, - "4,4": 5, - "4,20": 6, - "5,2": 4, - "5,3": 4, - "5,4": 5, - "5,5": 5, - "5,6": 5, - "5,7": 5, - "5,8": 5, - "5,9": 5, - "5,10": 5, - "5,11": 5, - "5,12": 5, - "5,13": 5, - "5,14": 5, - "5,15": 5, - "5,16": 5, - "5,17": 5, - "5,18": 5, - "8,2": 4, - "8,4": 7, - "8,19": 2, - "8,20": 1, - "8,21": 2, - "8,22": 2, - "8,23": 2, - "9,2": 4, - "9,23": 2, - "10,2": 4, - "10,23": 2, - "11,2": 4, - "11,3": 4, - "11,4": 7, - "11,5": 7, - "11,6": 7, - "11,7": 7, - "11,8": 7, - "11,9": 7, - "11,10": 7, - "11,11": 7, - "11,12": 7, - "11,13": 7, - "11,14": 7, - "11,15": 7, - "11,16": 7, - "11,17": 7, - "11,18": 7, - "11,19": 2, - "11,20": 1, - "11,21": 1, - "11,22": 1, - "11,23": 2, - "12,2": 4, - "12,3": 4, - "12,4": 7, - "12,5": 7, - "12,6": 7, - "12,7": 7, - "12,8": 7, - "12,9": 7, - "12,10": 7, - "12,11": 7, - "12,12": 7, - "12,13": 7, - "12,14": 7, - "12,15": 7, - "12,16": 7, - "12,17": 7, - "12,18": 7, - "12,19": 2, - "12,20": 1, - "12,21": 1, - "12,22": 1, - "12,23": 2, - "13,2": 4, - "13,3": 4, - "13,4": 7, - "13,5": 7, - "13,6": 7, - "13,7": 7, - "13,8": 7, - "13,9": 7, - "13,10": 7, - "13,11": 7, - "13,12": 7, - "13,13": 7, - "13,14": 7, - "13,15": 7, - "13,16": 7, - "13,17": 7, - "13,18": 7, - "13,19": 2, - "13,20": 1, - "13,21": 1 + "2,23": 4, + "4,2": 5, + "4,4": 6, + "4,20": 7, + "5,2": 5, + "5,3": 5, + "5,4": 6, + "5,5": 6, + "5,6": 6, + "5,7": 6, + "5,8": 6, + "5,9": 6, + "5,10": 6, + "5,11": 6, + "5,12": 6, + "5,13": 6, + "5,14": 6, + "5,15": 6, + "5,16": 6, + "5,17": 6, + "5,18": 6, + "8,2": 5, + "8,4": 8, + "8,19": 3, + "8,20": 2, + "8,21": 3, + "8,22": 3, + "8,23": 3, + "9,2": 5, + "9,23": 3, + "10,2": 5, + "10,23": 3, + "11,2": 5, + "11,3": 5, + "11,4": 8, + "11,5": 8, + "11,6": 8, + "11,7": 8, + "11,8": 8, + "11,9": 8, + "11,10": 8, + "11,11": 8, + "11,12": 8, + "11,13": 8, + "11,14": 8, + "11,15": 8, + "11,16": 8, + "11,17": 8, + "11,18": 8, + "11,19": 3, + "11,20": 2, + "11,21": 2, + "11,22": 2, + "11,23": 3, + "12,2": 5, + "12,3": 5, + "12,4": 8, + "12,5": 8, + "12,6": 8, + "12,7": 8, + "12,8": 8, + "12,9": 8, + "12,10": 8, + "12,11": 8, + "12,12": 8, + "12,13": 8, + "12,14": 8, + "12,15": 8, + "12,16": 8, + "12,17": 8, + "12,18": 8, + "12,19": 3, + "12,20": 2, + "12,21": 2, + "12,22": 2, + "12,23": 3, + "13,2": 5, + "13,3": 5, + "13,4": 8, + "13,5": 8, + "13,6": 8, + "13,7": 8, + "13,8": 8, + "13,9": 8, + "13,10": 8, + "13,11": 8, + "13,12": 8, + "13,13": 8, + "13,14": 8, + "13,15": 8, + "13,16": 8, + "13,17": 8, + "13,18": 8, + "13,19": 3, + "13,20": 2, + "13,21": 2 }, "ColStyles": { - "1": 8, - "2": 8, - "3": 8 + "1": 9, + "2": 9, + "3": 9 }, "SheetStyle": { "FontFamily": 0, @@ -1126,8 +1151,8 @@ "13,21,1,3", "1,1,1,6", "1,20,1,3", - "4,4,1,15", - "8,4,1,15" + "4,4,1,6", + "8,4,1,6" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -1236,4 +1261,4 @@ "Formula": "'任务-工时'!$V$14" } ] -}//hBWWp2rk63DwahYqrXde0p3GdddIcWiOm5SsKUCZD2PMH+uV8ZzqosGZPtwjYYLturXY1D84O1SGoITfFgeW4yj1Tx/BpomUpTmQEEZZ2Sohioc/NyY/wSk+1DYjeSjMl4kOVV83jHe7/4WZgy41UrgolsSLdCrFI2TUbuc/oFZA5LiwDL2Rsmd9sLaekp3ExdTlBsdu6UmbAYEuBsXn1GQo89yc2lpz6iJIa0rMQWy76f38y6MpRWAhPbU1t46C0Z70n3nV5JJyOz1YSEFtKnfu3Rgfd/pcLTdkPSZQfnyhwY/91N+3w3KMexJ1SgjdHEQUJr10g0Y8p+vWZbUKQg3xJITCZTFp/mcnzFlte37kxEIBR6RL+TXZSrJQfbjHU34Ebz+qYWDOjwyC4df0Mkr22pVwpo58CdEy7hbXUncbQf19JilJvKvsKrMaSOqUDrfLHw9stCR7uDEjOweAB6ZD0TTKH9doC4zjCjr30FkebqkyKly11hUPwr18RO0SU+RkfttzTO9tAVZqn/fJOHAdByS4E3aghlowYEV/0vEtENse4LALpdNvpFOWw/QvTdafZjE53FUaOW/4T7dVqkC2u2jtkF/xhv7Iu2agpjbOvxaYWzey5F5oKS3vG/6pKajq54tv98Du0+lIJOKL0fEY0bAsa6AJ9tOSiVltsrI9dUYs5joAg9O+IeOAjDO3+phn4WDpkZtkkaQ6dNn5tD6MMIHNk+DM9sZLkEsurCXc481bil08b9so7sogKahuq9CyMxd8qQhhwGSyO/ogkaMZ/RiXOdXvoSwcfUIscYsNqVprGnA83Uh9lBhdHCHr0lYSpkPWFPCQz8ikUkaiKvwIE3sYoYrpK29Yzyk83bqkqp3qoW5UCS7xWMDProHAMMhb43VqUXwWO8bE0VAiQQ==|920 \ No newline at end of file +}//xk9ySCug56ExEvsyztC0vNfUVwcNfYyxRS8mNn1EHnYqjqXF/xJkFjyHkK+3NbNzPVy454cLtXEs1rzEEyBeB7WdRhBtDVwdgxKoAf7xEuZkImDL7Vk9sp6sjGH4ptfGoYSbTO6wTCPT80OO71ygLmW96MZfIK5bROc1DHJWozL0ZXW29+KSog1qglvnhn7bGm+BE7jLqEGR1xnLFjjNmiRGJ64kiUZpTv1687Dmg2h43KNqzCAuQtAAbcirZh8uCF1KGu76rrlpgv7yU2A8yQIBSV3lKSRSp6omOmtsXfG00ey1n7Put4lYup9VcQEWy9Bgf4t0yJqOkYh0cd43+OQW8XaE0qcbpRpWt6qLuhy4nDqkmdJYunbM3oHNQiZmlbhNgkCRW4SuCCCp/P4K2ouRHCQs/iwLqEuwwgEJ8cgDkYRutrlDGPJnM9LnRJ5ryA1gvt/Oif0phTuIDf+xSmYzdSPthmHb57LFImK29m+FhKYQ0lDS061T5mvRqlXC2za4m0O3BPTTiPWyW3njMBXk/KXV6m5R3BZB0qOZsxLrvi0X3yakKauvVrvm9j09cl5+5JJe/joRLz2GuOHqJPMr6QuO9S/ml+eu+qlO17h9CBGjmiCw8TaDiCjAYn/rFtQPZxrQ88yzVKh5N8788ZpWsCqcw3OCJkMRje7JIqJg/o+M/bn6ewdX8sBDOY5e1FHjhycv0jY4tOousfbcWn3m1pFnW4zSdotlGd9pWJYNzHwljroes1hz2JuaLYk8tIObRNy29Y81Vqn0V3OQXRzxJg3knbNyyoG1gu3fE9+va/XZZC6t6Et7VI5G/g+vQAFW19n/mkspOfOibDq4Wl8sgFW9yXwk6ie2WEa6w/mhT8zrwgu6AtPeX+csaWNIKdquSG5kdl4+ayK76YSH6g==|920 \ No newline at end of file diff --git a/Pages/任务/任务首页.json b/Pages/任务/任务首页.json index 52d13c55..3815eedc 100644 --- a/Pages/任务/任务首页.json +++ b/Pages/任务/任务首页.json @@ -40,12 +40,14 @@ }, "6": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 32.0, + "IsHidden": true } }, "7": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 32.0, + "IsHidden": true } } }, @@ -368,12 +370,12 @@ "$type": "Forguncy.Model.StopCommand, ServerDesignerCommon" } ], - "ID": "4edfaf5c-34b7-4a8d-872f-36aa75dc4553" + "ID": "b22d1bf3-bd8e-4dfc-9e93-dc77b36810ef" } ] } ], - "ID": "afe687ae-b39d-4088-b2bf-35ebdfdf2903" + "ID": "b0822129-df64-4bff-9723-f4a22d533b4d" } ] } @@ -589,7 +591,7 @@ "MethodName": "Refresh" } ], - "ID": "1507f371-0b45-4e6a-8528-32867df9f24a" + "ID": "dee0c3b8-b862-4035-be07-fbba6e16dbce" }, { "CommandList": [ @@ -604,12 +606,12 @@ "BtnText": "知道了" } ], - "ID": "29443263-2e5a-4aa4-a75a-fa8b67058268" + "ID": "21a99d81-2140-44dd-808a-373978eb0198" } ] } ], - "ID": "ec974da0-5264-499a-b207-9e5d3f1b57e9" + "ID": "6d7b01aa-d6cb-407f-874e-ea4f05aa8493" } ] } @@ -703,7 +705,7 @@ "ReloadData": true } ], - "ID": "2feb95d8-7a69-4374-94d5-75214f7e3076" + "ID": "30ee5acc-cecc-4122-a5d6-3da83f8255f0" }, { "CommandList": [ @@ -718,7 +720,7 @@ "BtnText": "知道了" } ], - "ID": "84b72195-d1ba-4e64-b851-8120646a4ccc" + "ID": "0401df86-c667-4441-829f-3d93eddb672e" } ] } @@ -858,7 +860,7 @@ } } ], - "ID": "319df5eb-86e3-4a1d-a5c6-72d58bb5b941" + "ID": "d4e5cda8-1a06-4231-9d7c-046adcb772e6" } ] }, @@ -899,12 +901,12 @@ } } ], - "ID": "d3b2f41a-ec75-4734-b0f9-3ee653604670" + "ID": "4b71c551-bbe9-495a-8011-15f480b7108d" } ] } ], - "ID": "b50341b3-0015-4493-91e9-a40f41ea353c" + "ID": "31bb9c8a-f48c-442e-89a5-7493a2f4cab4" } ] } @@ -965,7 +967,7 @@ } } ], - "ID": "194682dc-5338-4cdd-9e91-49b2ed0fdd76" + "ID": "bfe01c3c-fafc-40a0-af97-c2797f62bdd9" } ] }, @@ -1006,7 +1008,7 @@ } } ], - "ID": "88fb1f22-3aaf-49f2-a01f-3b9f6b1b5c29" + "ID": "84a6eb88-5ce2-485e-9da4-d3403d37783a" } ] } @@ -1098,8 +1100,8 @@ "7,10": { "BindingInfo": { "TableName": "任务平行视图", - "ColumnName": "成员计划工时", - "GUID": "c0d94269-8d7e-425a-bdbf-3b3efdd787d4" + "ColumnName": "已分配工时", + "GUID": "9f4afb6b-ff78-4067-9c8e-244690e27646" } }, "7,17": { @@ -1136,6 +1138,35 @@ "JavaScript": "Forguncy.Page.recalc();\r\nForguncy.Page.reloadBindingData();\r\n", "ID": "8e45cfc63efd4a619b60ffad6e35ec0e" }, + { + "$type": "SetCurrentRowCommand.SetCurrentRowCommand, SetCurrentRowCommand", + "CurrentRowInfo": { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "ACT_RU_TASK_View", + "ColumnName": "PROC_INST_ID_", + "GUID": "7fc12bff-cffb-4af6-8b0c-b8ee0fda95e8" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务首页!流程实例ID" + } + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "ACT_RU_TASK_View", + "ColumnName": "ASSIGNEE_", + "GUID": "f71c3b95-acf7-4dcf-9261-5e9baacd1c72" + }, + "Value": "%CurrentUser.UserName%" + } + ] + } + }, { "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", "TargetPageElement": { @@ -1438,6 +1469,24 @@ "BorderLeft": 1, "BorderRight": 1 }, + { + "FontFamily": 1, + "FontSize": 13.333333333333332, + "Foreground": 6, + "HorizontalAlignment": 8, + "BorderBottom": 1, + "BorderTop": 1, + "BorderLeft": 1 + }, + { + "BorderBottom": 1, + "BorderTop": 1 + }, + { + "BorderBottom": 1, + "BorderTop": 1, + "BorderRight": 1 + }, { "FontSize": 13.333333333333332, "Foreground": 6, @@ -1639,10 +1688,10 @@ "7,7": 13, "7,8": 17, "7,9": 17, - "7,10": 21, - "7,11": 14, - "7,12": 14, - "7,13": 14, + "7,10": 22, + "7,11": 23, + "7,12": 23, + "7,13": 24, "7,14": 16, "7,15": 17, "7,16": 17, @@ -1662,7 +1711,7 @@ "8,1": 13, "8,2": 17, "8,3": 17, - "8,4": 22, + "8,4": 25, "8,5": 14, "8,6": 14, "8,7": 16, @@ -1688,7 +1737,7 @@ "8,27": 14, "8,28": 14, "8,29": 19, - "9,1": 23, + "9,1": 26, "9,2": 17, "9,3": 17, "9,4": 21, @@ -1699,19 +1748,19 @@ "9,9": 17, "9,10": 21, "9,11": 21, - "9,12": 24, - "9,13": 24, + "9,12": 27, + "9,13": 27, "9,14": 13, "9,15": 17, "9,16": 17, - "9,17": 25, + "9,17": 28, "9,18": 14, "9,19": 14, "9,20": 14, - "9,21": 25, + "9,21": 28, "9,22": 14, "9,23": 14, - "9,24": 26, + "9,24": 29, "9,25": 14, "9,26": 14, "9,27": 14, @@ -1719,7 +1768,7 @@ "9,29": 19 }, "RowStyles": { - "4": 27 + "4": 30 }, "SheetStyle": { "FontFamily": 1 @@ -1744,7 +1793,6 @@ "9,4,1,3", "9,7,1,3", "6,10,1,4", - "7,10,1,4", "8,10,1,4", "8,14,1,3", "8,17,1,4", @@ -1761,7 +1809,8 @@ "7,14,1,3", "7,17,1,4", "9,14,1,3", - "9,17,1,4" + "9,17,1,4", + "7,10,1,4" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -1808,7 +1857,19 @@ "Formula": "任务首页!$E$8" }, { - "Name": "任务总计划工时", + "Name": "流程实例ID", + "Formula": "任务首页!$R$7" + }, + { + "Name": "任务信息容器", + "Formula": "任务首页!$A$5" + }, + { + "Name": "任务状态码", + "Formula": "任务首页!$R$9" + }, + { + "Name": "任务已分配工时", "Formula": "任务首页!$K$8" }, { @@ -1823,10 +1884,18 @@ "Name": "收起侧栏", "Formula": "任务首页!$E$10" }, + { + "Name": "刷新任务", + "Formula": "任务首页!$B$10" + }, { "Name": "下箭头", "Formula": "任务首页!$M$10" }, + { + "Name": "项目名称", + "Formula": "任务首页!$E$9" + }, { "Name": "项目ID", "Formula": "任务首页!$K$7" @@ -1834,26 +1903,6 @@ { "Name": "折叠全部", "Formula": "任务首页!$H$10" - }, - { - "Name": "刷新任务", - "Formula": "任务首页!$B$10" - }, - { - "Name": "流程实例ID", - "Formula": "任务首页!$R$7" - }, - { - "Name": "项目名称", - "Formula": "任务首页!$E$9" - }, - { - "Name": "任务状态码", - "Formula": "任务首页!$R$9" - }, - { - "Name": "任务信息容器", - "Formula": "任务首页!$A$5" } ] -}//4e3D4dQdQhk/dvgdSFftgDcyf2Qk9dF7EYpnDR/YE6mQhG/fnia/IDPYX8JHkpBdSQq97cgcY3YNeDK3rVg/4oIqyTF1EEVfDLto29flw83T1JymWSOXZrTsteUXcUG9SiqzAMjXV9jqpKYbOPMikgJQMAoUv8I/OdjxcuvYwt5IVgtkCsh6XZP5UkQkcPJJs4DOxmVisT7waaxVQltID6ye0DbzlXA4HO/AGcaSszwQK9g7fpNoaAsTq/1nR78IWog4XQZIjtA+aIyQoJQtCsR5tPEHt1Of0cu4XJDetQRWRKZk5LYiLhfVKqZm/YzBpsi63HxAROciMoa5zBCaon5TQAdFnmbNqY0LEH6g1AHJaBasgetQsocCTY+g/6q4d8tLkyeTmJx0ogJgIqzesN7P0LSHxhn3Ew9GyeGH5k48OE7RYKd3pYSC86bVlG1+nQssYel4nbWoIalJIJUjUPCbkY08dIxK2zMwKSmPC4daf1VBU21Nx+fSpsUYvAuzn8nxwfks8yNpDU9ctnK2bq7S48inF8WDzL2tiM+RJTRHml7eMufXq2ZOLmbDLNCS+PBNu50t8t5sSnyQRRCNsNX4XQ0a0V88Jol4oZ6gQzy2Y0xg79P9T50b36/gzNIYpdrMIAJS4IBYGntRHlRADTi3412EWD+/jPdDbAXKNj94T3XAp+hvs9fA0C4x+wFB89MzFVbYoH2N5FR2cH2fCmNOfmu4NroAnk+qPlslC4/IHlMsMCN+uWuqL55EoCg2hGK50wR8uTF1iaiSgfuUYA0JPWeTBlPViF8G2H4oStN+ea+63q7Ej8UdUAxgRoViuARJyj//bdJ//iUNftrTievK19jWbG1yafdplIFiP86r78fc3I5eJyLMuxOoomUDYEVZPWNP+vIm7VL4mWVsxg==|920 \ No newline at end of file +}//eLB4YCUlDB5n6rOboBEhJzKUH8T7+gJxvF65pnCkpJu77oHpRdKUoAIvHvPtazYsJ9b85aFZziKsBdC8kUH29Uurx2MhOdFU7BykuSY95mDG91wc96Drb7f8mgMTRdLUCG89W9SLrTJFAHSX5h5T+W8Dsjexwfs0Tk5rA4YcJ4GKuBg62/5tVH1d5/vocPXtXP2uCi709mO/HX40xYfqJWM2TnPC4BAeccLb0El1b7fKFHmLB8nfEpodUu1rU/6BO4cnwbu0T/8ofH2wLYdQkegnzFIeKPdXE7oyaCJPLgC6904QR1QdZZ+0SdMtqsWO3RNEc/2FYZg/yYsdpYtuvRpaBHk/3I6EU0E1vas85pMtNjA2/Q8KOtMQuu8rwWfGyXsaByyiucNEsiQ0P64xGqgG1HkVw3BfDh4tNF4k05jiUaDjqfB/3B3wjY/nCyotUjDxIKQz4rHfdYK+Uy31B6x7HtWOmbeNtgSWGbA0WMOGPzBGpsA6QIz5X/Rmi7zElVpqoTYMbXALBJ0BjzDQCareDMARB1yRYl/PqzKw3P9Qykek6Eu9JSxc6gwZ/lZ9UHCnj0deBph3b6E/LlSb1Wv5x/qct7O8sukWgNUmdi8RQvCLv4UOo4uqWc69o1hf73qVXrd7lmR7ZwexdT1wSgmiwHCG+Yd9Rd2fU0E8Iw4Z4OAEW6aiHbF+xqMI4J2nG55LuU7C9Lz36qGJAoPWCUnm5c4FayFvQS3gjscQ5WfItIpC7n4LqHLdkFiotW+WPYF58ftNowGBnxJM5MNlJZiTP2KSZ/L5GJK9OhPEb0KOcfMcAw14Bus+B8NITlNklx5Pcr90uoKPDpVFrre8RasAoHfIbTGm45lYZS5kFt4rpswhMmJBJ/i/x7z7YrMoThDbcRRVXjjpKp7KyIA4Hw==|920 \ No newline at end of file diff --git a/Pages/任务/任务首页.rd b/Pages/任务/任务首页.rd index a48e4d62..8ac419ab 100644 --- a/Pages/任务/任务首页.rd +++ b/Pages/任务/任务首页.rd @@ -16,7 +16,19 @@ "Formula": "任务首页!$E$8" }, { - "Name": "任务总计划工时", + "Name": "流程实例ID", + "Formula": "任务首页!$R$7" + }, + { + "Name": "任务信息容器", + "Formula": "任务首页!$A$5" + }, + { + "Name": "任务状态码", + "Formula": "任务首页!$R$9" + }, + { + "Name": "任务已分配工时", "Formula": "任务首页!$K$8" }, { @@ -31,10 +43,18 @@ "Name": "收起侧栏", "Formula": "任务首页!$E$10" }, + { + "Name": "刷新任务", + "Formula": "任务首页!$B$10" + }, { "Name": "下箭头", "Formula": "任务首页!$M$10" }, + { + "Name": "项目名称", + "Formula": "任务首页!$E$9" + }, { "Name": "项目ID", "Formula": "任务首页!$K$7" @@ -42,26 +62,6 @@ { "Name": "折叠全部", "Formula": "任务首页!$H$10" - }, - { - "Name": "刷新任务", - "Formula": "任务首页!$B$10" - }, - { - "Name": "流程实例ID", - "Formula": "任务首页!$R$7" - }, - { - "Name": "项目名称", - "Formula": "任务首页!$E$9" - }, - { - "Name": "任务状态码", - "Formula": "任务首页!$R$9" - }, - { - "Name": "任务信息容器", - "Formula": "任务首页!$A$5" } ] } \ No newline at end of file diff --git a/Pages/任务/工时/新增报工.json b/Pages/任务/工时/新增报工.json index 6baaeaea..b7d2ffc0 100644 --- a/Pages/任务/工时/新增报工.json +++ b/Pages/任务/工时/新增报工.json @@ -327,7 +327,7 @@ "TableName": "任务表", "BindingInfos": [ { - "GUID": "bfcd8f5f-fc99-4c8f-9b81-57774c4c2b2c", + "GUID": "0d12b43d-6d98-4e6d-af5a-dcc86fe91b6e", "BindingInfo": { "TableName": "任务表", "ColumnName": "ID", @@ -336,7 +336,7 @@ "ColumnName": "value" }, { - "GUID": "8c54b2a7-fef9-428e-b043-16525a4b9a15", + "GUID": "bb7a15e2-b562-47d4-8a08-80db1654ae9c", "BindingInfo": { "TableName": "任务表", "ColumnName": "任务名称", @@ -346,16 +346,30 @@ } ], "SqlCondition": { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "任务表", - "ColumnName": "项目ID", - "GUID": "25809070-f2d3-4c8a-aa77-b00ec7760e83" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=新增报工!项目ID" - } + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务表", + "ColumnName": "项目ID", + "GUID": "25809070-f2d3-4c8a-aa77-b00ec7760e83" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增报工!项目ID" + } + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务表", + "ColumnName": "进度", + "GUID": "f1df6e65-db3e-4d71-8f3e-24958a07ec65" + }, + "Value": "2" + } + ] }, "CustomColumns": [] }, @@ -555,7 +569,7 @@ ] } ], - "ID": "45f46f1e-ef3d-4a74-b98b-1a68bc3d134f" + "ID": "a5293aa2-316a-4a3b-af61-fac6860e8b26" } ] } @@ -692,7 +706,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "2a5f91bc-4236-4206-8eaf-83c8d2a7e40f" + "ID": "c7f65013-95d7-45d0-a28d-91ac1348f5af" }, { "CommandList": [ @@ -804,7 +818,7 @@ } } ], - "ID": "e8f0f30f-dc17-45e0-9e40-727e8dc8c4da" + "ID": "08fe637d-0de7-4e60-ab6c-08fc9ef6c7b5" } ] }, @@ -818,7 +832,7 @@ "Title": "加载中" } ], - "ID": "da2eae93-452c-43e7-bd2b-a1980ed287aa" + "ID": "16ebeb33-6f8a-4f3e-90b4-53ef63568f97" } ] } @@ -1132,7 +1146,7 @@ "ReloadData": true } ], - "ID": "10582620-c86d-4d60-9e53-a488c3f99a17" + "ID": "82388974-49d2-4706-927e-33603bd48eba" }, { "CommandList": [ @@ -1147,12 +1161,12 @@ "BtnText": "知道了" } ], - "ID": "1a8ee6d7-831d-406c-a72e-1564175d08ff" + "ID": "a426b464-72ce-44fe-a92f-24d1178580ae" } ] } ], - "ID": "1e58143b-e41d-44bf-ac88-5e254778b33d" + "ID": "725cbf1f-08d3-4427-893d-ed62c31e1e7a" } ] } @@ -1229,7 +1243,7 @@ ] } ], - "ID": "ebfbfc1e-f449-4e1b-8055-52ac57ab2bfb" + "ID": "f8f31b87-4135-4c38-bdcb-86691219f0b9" }, { "CommandList": [ @@ -1244,7 +1258,7 @@ "BtnText": "知道了" } ], - "ID": "652dc1d8-9eca-4941-b2db-b6b1ed86e194" + "ID": "9f436a49-9bee-45c7-8b16-efa42f6d0302" } ] } @@ -1656,7 +1670,7 @@ ] } ], - "ID": "3f9f4d0a-fbda-4c76-8871-64a0b886ad50" + "ID": "1189092a-0588-4b5c-83d2-5eea7b58552f" }, { "CommandList": [ @@ -1673,7 +1687,7 @@ ] } ], - "ID": "3365816b-8067-46d2-8f98-dc34aa82cc8e" + "ID": "884df376-c65e-47eb-9374-9e342b5f6f7b" } ] } @@ -1702,17 +1716,21 @@ }, "CustomNames": [ { - "Name": "任务ID", - "Formula": "新增报工!$B$3" - }, - { - "Name": "项目ID", - "Formula": "新增报工!$B$30" + "Name": "版本ID", + "Formula": "新增报工!$B$32" }, { "Name": "报工人", "Formula": "新增报工!$B$7" }, + { + "Name": "仓库ID", + "Formula": "新增报工!$E$31" + }, + { + "Name": "分支名称", + "Formula": "新增报工!$B$31" + }, { "Name": "工时数", "Formula": "新增报工!$B$15" @@ -1721,25 +1739,21 @@ "Name": "工作进展", "Formula": "新增报工!$B$23" }, - { - "Name": "开始日期", - "Formula": "新增报工!$I$30" - }, { "Name": "结束日期", "Formula": "新增报工!$N$30" }, { - "Name": "分支名称", - "Formula": "新增报工!$B$31" + "Name": "开始日期", + "Formula": "新增报工!$I$30" }, { - "Name": "仓库ID", - "Formula": "新增报工!$E$31" + "Name": "任务ID", + "Formula": "新增报工!$B$3" }, { - "Name": "版本ID", - "Formula": "新增报工!$B$32" + "Name": "项目ID", + "Formula": "新增报工!$B$30" } ] -}//t1JPrwrnfmF2E1ERN6KRsKw6Nrv169QVUPCNjGdGTCKFBvcaXuKnBVdCkFz59e2JOsK5R3YKtDGOaqkADGhckcgkXsaUZyalAsVhqZgCQyX/9/0xnW+wM1c6XcmASA8QSiQ5LXIxdv7HPUVcecC7qi1r1TRP3XoX8bCcVwx2o4hb3oV7SJYfVuuTItPpPF2P40rTXn5UueR49eqBb5l1lz80fc9xEb9L4ah7yx2BvVA7t0YwQr8xm1OutXyPrVbw7/mMNFs+zYD0dbXPRB/JNa8soxEdcICQlpRj5xhXFDCc5EM49sAn5c/7JqbqlbaitGl/qDfQkLUr1HBHFntcV5aXXzDXF5J3lJVFXjl2sNbQYD4ipPUCfjbCtntmVRb94G7d2Nbhnbt7BpxAmYAcyEzrL8W/59xmmUGaeeElU0TBxoFhigMjLg0z0PCq69bfylGDs0GSnImbMzpBLZOx2O1yFG4Pu2DrnSs436TvJzRvu3uZsKV+tREcjGjlsOwAUEijYUq4JwxlR4ESjKzQp1wV5hzvkXDD9Q1MIWbEwOlQN991gxaLISLPEUn6A7QqynzebjFkR1dp1MCWdR6Q/udk877Pu9apJegsgluLzwgkJIaszT08s12z2/CD7cB08MvSmRdhDyq0r3jZ3mCpS+qrBgSIrM6CYsaUas+NinlEqg50i49BTETmh4otHZBChWILNkge3kunRbWhZYWAyFpDaFR/xCAEIRt6Cmj4NNKyn/s3dJR7T0S3hxpX6IJXw42YdNs7rnPq2Yqg6qqNNg6PAMWT1+OTgAzt5hfIBExvcBTP2mX+NNj3A8jIuCe4pTT6mvgXXDD92LY/iE0gfGtjDGuCbCX2g2Vooh1x2fYJD/QLT5v387dgY6Aa6+7gLbcwdmOq6/01BYWpwLvNGw==|920 \ No newline at end of file +}//UISP4TRBhhFniiNMvMwCV+kENdsOcSeWsUOBmQLtLtVHBmit6j5Hc1zbbYrC9diF+016Dl+wzwJESCUf9kY9ivvJ5X8MQBNi0NZ/Eqhax6EbNMMk6ASETwIb9p80Djg19SX7Uc6/fYa6AgzOVOtVfA/oR53hZR07xE5ZzPzm3DzFkQZDNB3/+aUgoggNB+9kF8U7lqLWZQZIu+tR8EqCsSevDGc65rBPw6CpvRH0BrTNZV7u9fnfOU3ugoWALEBFYqL2Gz4AzzLqHlG8o1eX9DkAYGVf+wr7hWPpTibVTFHb95OzTms0Z9/xyKGXZ/ap72D/zkUlLD1qcAu3AmEmHYOho13/joF98SVotvmKnyJmu059rDB3wVxSUYLWYV/kDaKxWUvxBcEVCxMkcLkCLfbkbwcP0hc4snpMYmj6dQiY7OJi06SnxZ0YRGSEJyUa0v+xv7VAKg3j1T4QkjRkVh1+DIuW8tsPrnt/JCqH6zSIEHGPkVuTFYmgCZUOpdyMK5QTbm3yQCtdtBZ8RYc9kvltMjKF7u47UaWFLQkrkX15oKQdaZpDBAHaerHJBdkGGOzil3jkwosePeEeY/vOY16lLWCImS6pCmdGv467XOGJj0Vh3Oy9ghyDTWLEJ8n2ryDbfZk4qANFHOH46QDMvQaEfSJKof2i49xGDX7HudvHw3B/C/qoWHjV5sA0DbRbfjWvQT3MaElb6rWL/ODOiHj0XvS7kjwCHkVXu6nqnWBbrSk7VBFmZFwH/Jg3X+zE6X34Yo+aX57ajaVeMljHF6pu2NxIvABIvs2mPmXjDdKlNdLQ84d3S9kdwl/u79mNc14jfLoiB5EBQYSclc/UOyhL1NlJEy59K7sesL3vK25pKFJXynvQaLTI41jESr9Jwej+m6K8H0xG/i5cnhURQQ==|920 \ No newline at end of file diff --git a/Pages/任务/工时/新增报工.rd b/Pages/任务/工时/新增报工.rd index e6493c36..a5205e20 100644 --- a/Pages/任务/工时/新增报工.rd +++ b/Pages/任务/工时/新增报工.rd @@ -8,17 +8,21 @@ }, "CustomNames": [ { - "Name": "任务ID", - "Formula": "新增报工!$B$3" - }, - { - "Name": "项目ID", - "Formula": "新增报工!$B$30" + "Name": "版本ID", + "Formula": "新增报工!$B$32" }, { "Name": "报工人", "Formula": "新增报工!$B$7" }, + { + "Name": "仓库ID", + "Formula": "新增报工!$E$31" + }, + { + "Name": "分支名称", + "Formula": "新增报工!$B$31" + }, { "Name": "工时数", "Formula": "新增报工!$B$15" @@ -27,25 +31,21 @@ "Name": "工作进展", "Formula": "新增报工!$B$23" }, - { - "Name": "开始日期", - "Formula": "新增报工!$I$30" - }, { "Name": "结束日期", "Formula": "新增报工!$N$30" }, { - "Name": "分支名称", - "Formula": "新增报工!$B$31" + "Name": "开始日期", + "Formula": "新增报工!$I$30" }, { - "Name": "仓库ID", - "Formula": "新增报工!$E$31" + "Name": "任务ID", + "Formula": "新增报工!$B$3" }, { - "Name": "版本ID", - "Formula": "新增报工!$B$32" + "Name": "项目ID", + "Formula": "新增报工!$B$30" } ] } \ No newline at end of file diff --git a/Pages/任务/工时详情.json b/Pages/任务/工时详情.json index 78676b78..2df99569 100644 --- a/Pages/任务/工时详情.json +++ b/Pages/任务/工时详情.json @@ -219,9 +219,9 @@ }, "Values": { "1,1": "整体进展", - "3,1": "预算工时", - "3,7": "计划工时", - "3,12": "实际工时", + "3,1": "可分配", + "3,7": "可报工", + "3,12": "可报工", "3,18": "完成比例", "6,1": "工时明细", "7,1": "工时详情-列头", @@ -233,27 +233,6 @@ "6,4": "\"当前项目采用的工时分配方式是【\"&工时分配方式&\"】\"" }, "AttachInfos": { - "3,3": { - "BindingInfo": { - "TableName": "任务平行视图", - "ColumnName": "任务预算工时", - "GUID": "18f09411-df60-4f43-9bde-6568a5ab20e2" - } - }, - "3,9": { - "BindingInfo": { - "TableName": "任务平行视图", - "ColumnName": "成员计划工时", - "GUID": "5af96d1d-0613-422f-b010-894384af003f" - } - }, - "3,14": { - "BindingInfo": { - "TableName": "任务平行视图", - "ColumnName": "成员实际工时", - "GUID": "26afde84-5430-48dc-a46a-cbe0a418c06a" - } - }, "3,20": { "CellType": { "$type": "ElementUI.ProgressCellType, ElementUI", @@ -656,9 +635,9 @@ "3,20,1,6", "12,7,1,3", "12,10,1,4", - "3,9,1,2", "3,14,1,2", - "3,3,1,2" + "3,3,1,2", + "3,9,1,2" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -712,6 +691,10 @@ "Margin": {} }, "CustomNames": [ + { + "Name": "工时分配方式", + "Formula": "工时详情!$K$13" + }, { "Name": "任务ID", "Formula": "工时详情!$B$13" @@ -719,10 +702,6 @@ { "Name": "执行人", "Formula": "工时详情!$E$13" - }, - { - "Name": "工时分配方式", - "Formula": "工时详情!$K$13" } ] -}//Yx72njDQTmUkwbboT0gfbOpio+BWK/W/exQ2yaSZrv86RcYDMbca/8Owt6GbGL5CICiodsnTYVRXQOij7YoehwroVxIOar7n1lYbohKM4J4JHiAqszNpbg+2XN96yXoArD4/ngj8+nK1jfcvGkjbbRVMRefQTg1+VHnKuTT9u9EzF1D3SOEVFgivbiBwjoKcx6kYjpwPLaedE5+Kga3hL84veWaKdNrsEPKDV29l6Pqw1kzPKBxuv0ruS5FtpMnoWaZO/Ypqk35G7qCNgKxNoj/UIqhNsB0yInektowZ2l3xHhRnz9Nfaln2EtW/p4W+TeHnQ4mxvkE4Df4fOS3VebJUQ1Ord0R66ylaP2oUBH/Sxlk+UfmRwUuJfGio/r12CF7r6fD9c4gHQ66YHzZVXtqCsItLAicqI9yOZAjrfu6dXFc8CI896qswOSGXjmdNM3DYYNBwtUuiZjeGtxBlH2eWbx6dS4ibGDOPLos4DJBnbb1COzaSV2Wglw2QfKWblywZbWzNXSLdn3tCaHpwkFPncduttbFU1RscVvG3kecfKfzOS2Us8GBTgkUCn9K2U+4gKiNx7E6vxahHE2GycDtRFX9V27Ts3fF9+HU9G/aH4I5RzGh7d4hYIvELhCFWDW0RpxmpCX13EuW2atXjbQ9YArJ9ymawFVIbzPgPAEsnmBuok9+OC14g7sfCLAp8JEsfjXY39cxEq9garBVvJ9uNQzlqn36s3NPUIucOviUfAXtuDGkNPRyZtt0jvlwAFbgqa3uUD4VS815jSEWN9WtbvY7r+U7w1th+4zTNgNjOcIHziJfcArBV9yxrziqFdC19Mer3NifCr0iOdpqr8aERmQWtebEhfGBGH2afFcY6BP/SEcnOIvsX85+UJ1N/T7lKR4fd/9wZBOK0QxLklA==|920 \ No newline at end of file +}//q5i0UYeToEoiWOrZvUlA+Az+urNpyIkanCO3zUbrS1vLN+bSkABk6lQc7sU6v69BtbrP25yR320pI0KEF4pQ772L3CFSGg6+hpb1Ww/kdikh4ht0OhcUVVsCX2pXdbaBsZZa6FOb8co2yZyb28yn7O543r8couSIN06pASPxiXiQwrzjofgGBMPlzXZ6mOQOkhXaLYE1Mj9wcgQ6zxhdAz4vBvJtZkkfoKpOz0AiktjXc/TjXMuc6qSFu3D34doHGGaAI2a+r7hB03F+tz27orCkrpfq6EgdHXoJwiHJgJWDj8hnRNo7/vthlfLLWGXC27waP4dSB98Tb/4E2WiCK4VLqBQPIG/5/b+CBWvl/FyWl6IGjEDLqOhl3DbJzOLsgNBZrLfnrS7lg69mgVh+T9pfnORlnE7AXLSGochTYXlgAsYN5psQ6/0vXfRR3ctINZIoC11BPosnV+u/CNggS/9CMsJmwdwzt5MNLu8r6IAjv/aMfcOY+rrKaIQxXvHctOpomFzWT2xxpJAwVibf2MmgAsIcLX/WTTd79vzIF2yoDAxjkPClJ0yJ/puZR5b1wl49Vnym3SXK3MzS2ULrfFoDRozkMiAOPlOss2NRLvR1AWNgIMfelzvVu6XOhkAzFqrKVnZl5G0pnGqpYVU2O8MYekvLgZCrQD4wjpy9ZsX5PHorpIMJK4WYEZXMaPQdrdaOgQbEdGf+UKBioCN50dfO/EGeIQj95oD5yDw9r5bljAroFNBGINL2EvUN/dv7VHoQw826HzcQmMsgmptiTnkh9o2P3qBF2AZG6iVxPQXvEe55VOU0trT0vqr+EID9tL2ACHZsltOoofOh6bZW2t6KDPyWjqommr8/3XaJCKylhF5t/YwXL54cPIYn7V7X+MrJ8m8Z5VhHbIYScU6cBw==|920 \ No newline at end of file diff --git a/Pages/任务/工时详情.rd b/Pages/任务/工时详情.rd index b97e23ad..68d18302 100644 --- a/Pages/任务/工时详情.rd +++ b/Pages/任务/工时详情.rd @@ -7,6 +7,10 @@ "6,4": "\"当前项目采用的工时分配方式是【\"&工时分配方式&\"】\"" }, "CustomNames": [ + { + "Name": "工时分配方式", + "Formula": "工时详情!$K$13" + }, { "Name": "任务ID", "Formula": "工时详情!$B$13" @@ -14,10 +18,6 @@ { "Name": "执行人", "Formula": "工时详情!$E$13" - }, - { - "Name": "工时分配方式", - "Formula": "工时详情!$K$13" } ] } \ No newline at end of file diff --git a/Pages/项目/项目反馈/页面反馈录入.json b/Pages/项目/项目反馈/页面反馈录入.json index f0713eb4..9ca72e13 100644 --- a/Pages/项目/项目反馈/页面反馈录入.json +++ b/Pages/项目/项目反馈/页面反馈录入.json @@ -1336,36 +1336,32 @@ ], "CustomNames": [ { - "Name": "项目ID", - "Formula": "页面反馈录入!$E$23" + "Name": "当前用户", + "Formula": "页面反馈录入!$Q$23" }, { "Name": "反馈表ID", "Formula": "页面反馈录入!$K$23" }, { - "Name": "当前用户", - "Formula": "页面反馈录入!$Q$23" + "Name": "反馈类型", + "Formula": "页面反馈录入!$D$14" + }, + { + "Name": "功能说明", + "Formula": "页面反馈录入!$D$10" }, { "Name": "任务ID", "Formula": "页面反馈录入!$D$6" }, { - "Name": "反馈类型", - "Formula": "页面反馈录入!$D$14" - }, - { - "Name": "优先级", - "Formula": "#REF!" + "Name": "项目ID", + "Formula": "页面反馈录入!$E$23" }, { "Name": "需求描述", "Formula": "页面反馈录入!$D$18" - }, - { - "Name": "功能说明", - "Formula": "页面反馈录入!$D$10" } ] -}//24tyr2Q+7LGWwNV22MQ3Sm3sEggzvBh8iJP8EUHbRcJnHeJwjc2UTm0GsXEsBFRZFxlphgMPKzYqpVNrtbU8ivwmjZ66jg3FHa7j2kaHsqDnjJFraOWR/HtLnYfo4AkBataujKDLKq4JsW8mNTYeayN5dxhIQ4jesOfsQmk4YVe57l4m8+iD7UV5X5tPtSpr0+Xmkp1XJ8m2Qb/zQ/Q9xpb9pQXwnBB/oK2+B+TnHtUJvFQNn8sqFNpc8IbUeJvTF5qBGeFij4v5+qhCqor0asPEyfoBUDGjDvNCiPuXYjZB5e2yI8OZt1OTk1gMe0Idl2ykHHVVgiWvsKQ5Gndd82w+F2zhhFIgqrnm8Sq9CPxyN94VR388R54ZnjDaoah9ZeCGmP6K4Xb61XXPPFGaQEa+zKHhB9DP2TzJjYTyCqC5oaZH4nucSiUeJqmoF5x6fF4JjtIHeDlX6QrnB/sbO9ar7EP8uZ6w75D3YLYNpa5BDr1rl4mrGL8JMvI8O8ElZFYB8ecmy5Gg/ibq5tgBLIISaPqv1hhXypvfCv2j5OGsKUmp2wa/MGEJPA2kcoFZHD1HJ5r8mk2Z0B7dbAzRGe4zUd7kudVdv2Oa3r0Iad/mBaVWScVBoOuHTe4ahC6jA9pvETWThfqNJnu6GxNzQn1JdQlBBJCcPrn59fYBjBHLGymqchDcLpNeaJLn21dZuAQH4wBQBWp5DturzdaThTIiRydssnV+06Dqo/xcJW2DsUssMS57LbZotAgbxsywNM3dfWEjK0ExU5JXLlfFzysbAHqXfeRlZhlm02I13PInH3hWn3gD8V31uSdXolGDJNrSb8cieJEGzIGcWd7BwmA9C1TP+3RQut/XPBS2jQZlS2JXgjv0Jw8ibs3/oha5EbH5LqEZxMst20u5g1t4oQ==|920 \ No newline at end of file +}//RUYljyoYl98wRl+91zSyRI+gtdW1iESdN5ArAQzJyumt5g2Q13czM3jtHGNp+R/ANGdRENxekbcIOmcDSIMtlYdPzYy15L7BYvky+CH+ucQiV5M9nSFzazhz/L8o6YwgYMWb0M0SWw/14r5JVVc2+zos0r1rDl1yNOaSXaWu2nLN+elYUfn3lY8vlRGyc6Fa5rIQR1M7ZakfqVesbEdD6cooEF3U4Abh+Mczq3YdM73gIKK7xwtakfoEDY/T8XY17iJ46GwY6d33gd9KKl9Oi1rJ5UIJePK1NPisDPBoj/GM4r9IihyuQBRVtGTsfASdds+lQVNwjkN9KbsQFdyZY2gC/t65fgfTesOAf6L+kHHuCUa09c/eF1EQSuyr/21nZH4UUIXD6ungFKZKXH81luj9m6o+NIizU/fCvNrSTci6tXZfoefjVIWAV9jxkYiqgqkD2UrWKgFss1zwLqlZvz+IobB8NxKlCNBdjDJcigF+Wi7YsznCbmflsslZoq+gKHawX6Hl5C1ytKfJQWAsFD02RxDgvWXwpRwqc5DlSB7hItecdWNbUgpC2LduUtby9tG+plkxehdtsXDrHLr2xWIwBeaYlv5oxUZCT7295mtd84ilG2Stg+qneo46aV+rPGS5t4YMBp5HSS9O3g+k3fSS/pNCEWp/02rs9hsCy0UQLWorq+vrVcIN8M1AQRSBgmr1pFglYBg29snAWr6SH2/EvPWixJdhMlBsHMJvZ/LKZNzdaqpmKqOJDdrtOcm49i10qylk7a3xoR0DDqpUd6F2nW7yqg5eNkV0O88mxiWF3W0CdxpibLtAvmN7113D3nC5ghJBNgHxykcNIyRzPEtloqFtqTwLRMUnUy6sTfOVKgpzXwqHXaw1jmMy93eZ1vQFO0IgZYEqonL+b3R5JA==|920 \ No newline at end of file diff --git a/Pages/项目/项目反馈/页面反馈录入.rd b/Pages/项目/项目反馈/页面反馈录入.rd index bc1018d6..481f25eb 100644 --- a/Pages/项目/项目反馈/页面反馈录入.rd +++ b/Pages/项目/项目反馈/页面反馈录入.rd @@ -4,36 +4,32 @@ "RowCount": 24, "CustomNames": [ { - "Name": "项目ID", - "Formula": "页面反馈录入!$E$23" + "Name": "当前用户", + "Formula": "页面反馈录入!$Q$23" }, { "Name": "反馈表ID", "Formula": "页面反馈录入!$K$23" }, { - "Name": "当前用户", - "Formula": "页面反馈录入!$Q$23" + "Name": "反馈类型", + "Formula": "页面反馈录入!$D$14" + }, + { + "Name": "功能说明", + "Formula": "页面反馈录入!$D$10" }, { "Name": "任务ID", "Formula": "页面反馈录入!$D$6" }, { - "Name": "反馈类型", - "Formula": "页面反馈录入!$D$14" - }, - { - "Name": "优先级", - "Formula": "#REF!" + "Name": "项目ID", + "Formula": "页面反馈录入!$E$23" }, { "Name": "需求描述", "Formula": "页面反馈录入!$D$18" - }, - { - "Name": "功能说明", - "Formula": "页面反馈录入!$D$10" } ] } \ No newline at end of file diff --git a/Pages/项目/项目成员详情.json b/Pages/项目/项目成员详情.json index fec85e07..c64707ec 100644 --- a/Pages/项目/项目成员详情.json +++ b/Pages/项目/项目成员详情.json @@ -165,7 +165,7 @@ "4,1": "成员默认时薪", "7,1": "岗位", "10,1": "默认时薪", - "10,14": "*优先级低于岗位成员时薪", + "10,14": "*优先级高于岗位成员时薪", "14,1": "取消", "14,12": "保存" }, @@ -224,7 +224,7 @@ "TableName": "用户信息视图", "BindingInfos": [ { - "GUID": "ed9f5481-ba07-48ba-8bb1-bad3d9ca8bea", + "GUID": "6a9f920d-a7a4-4be4-90d6-9a5f08c9cc8e", "BindingInfo": { "TableName": "用户信息视图", "ColumnName": "用户名", @@ -233,7 +233,7 @@ "ColumnName": "value" }, { - "GUID": "87d1b625-d8a1-4184-8abe-612e03c5b71a", + "GUID": "98a7b679-0997-4b81-87d5-c2f70b1b6eca", "BindingInfo": { "TableName": "用户信息视图", "ColumnName": "全名", @@ -242,19 +242,6 @@ "ColumnName": "label" } ], - "SqlCondition": { - "$type": "ForguncyDataAccess.TextCESqlCondition, ForguncyDataAccess", - "CompareType": 9, - "ColumnBindingInfo": { - "TableName": "用户信息视图", - "ColumnName": "用户名", - "GUID": "6570c271-53c6-4c7a-8964-8af5ea6c9ec8" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目成员详情!已有项目成员" - } - }, "NullFormulaValueQueryPolicy": 1, "CustomColumns": [] }, @@ -268,7 +255,10 @@ }, "DataValidationInfo": { "IgnoreBlank": false - } + }, + "RulesGuidList": [ + "e3b0f7dd-9e6d-4807-ad47-eb02ebbce0be" + ] }, "5,1": { "BindingInfo": { @@ -446,17 +436,17 @@ ] } ], - "ID": "294c01fd-4ba6-437b-ade1-7a1638150ec6" + "ID": "23e37a20-d547-42c3-8ac7-85c6a426ab4d" } ] } ], - "ID": "cafecec1-57df-4486-93a2-fca660ff06c3" + "ID": "d86e289c-8833-4889-82d2-2e167bd3eba0" } ] } ], - "ID": "c0c632ff-354f-4f4a-8cd5-053b21b66ec8" + "ID": "186d402d-216b-4bee-8704-0937ed990a37" } ] } @@ -545,7 +535,10 @@ }, "DataValidationInfo": { "IgnoreBlank": false - } + }, + "RulesGuidList": [ + "73cb25ad-6c05-48cd-84e5-b28c2dd119b0" + ] }, "11,1": { "BindingInfo": { @@ -571,10 +564,10 @@ } ], "step": 1, - "controlsPosition": true + "placeholder": "留空则跟随岗位时薪设置", + "controls": false }, "DataValidationInfo": { - "IgnoreBlank": false, "InputMessageTitle": "提示", "InputMessage": "如果任务没有设置时薪，则采用此处设置的时薪来计算收益" } @@ -671,7 +664,7 @@ ] } ], - "ID": "25d31902-37e1-4bd2-9883-609a71f0a127" + "ID": "5af2164b-96a5-4810-a1ec-c3ff3ebd9840" }, { "CommandList": [ @@ -681,12 +674,12 @@ "Message": "请不要重复添加成员" } ], - "ID": "2de17b3b-d25a-4b59-b6ed-2d076b0f4aec" + "ID": "6185053c-0982-4797-b4dc-14b579ca7313" } ] } ], - "ID": "0d241129-0de2-4188-a351-665953304a32" + "ID": "a5759e29-407d-4a98-b3d2-9075bb004262" }, { "CommandList": [ @@ -696,7 +689,7 @@ "ShowConfirm": false } ], - "ID": "0b63e0b9-f159-4c98-9aa1-5e85d250fe75" + "ID": "156e9190-e44d-4184-aa7f-5230e65f6f1a" } ] }, @@ -718,7 +711,7 @@ ] } ], - "ID": "db290d31-2338-4330-b213-5fcf77b8ae4e" + "ID": "7fd353da-f007-4404-b494-e03948a52089" }, { "CommandList": [ @@ -728,7 +721,7 @@ "Message": "请指定项目" } ], - "ID": "574aa4c6-64fb-477a-80c7-d1d15e8bec30" + "ID": "3a8e364e-7dc1-4376-ab74-15fd64454a63" } ] } @@ -757,6 +750,18 @@ "ColumnName": "项目成员", "GUID": "f8e37c92-932d-4893-8ba6-0af354a81936" } + }, + "16,11": { + "BindingInfo": { + "TableName": "项目成员表", + "ColumnName": "项目ID", + "GUID": "5e7a8e37-985b-422b-acdc-a6d34b4babbb", + "RelationBinding": { + "RelatedTable": "项目表", + "RelatedColumn": "ID", + "DisplayColumn": "项目经理" + } + } } }, "StyleDatas": { @@ -945,7 +950,8 @@ "16,4,1,3", "5,1,1,14", "16,7,1,4", - "16,0,1,4" + "16,0,1,4", + "16,11,1,3" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -965,7 +971,40 @@ }, "RowBreakLines": [], "RepeatRangeSettings": [], - "RelatedDataTableName": "项目表" + "RelatedDataTableName": "项目成员表", + "ConditionFormatRulesCollection": { + "Rules": [ + { + "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon", + "Formula": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目成员详情!$B$3=项目成员详情!$L$17" + }, + "Priority": 1, + "GUID": "73cb25ad-6c05-48cd-84e5-b28c2dd119b0", + "StyleInfo": { + "Underline": null, + "Strikethrough": null + }, + "IsDisabled": true + }, + { + "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon", + "Formula": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目成员详情!$B$3=项目成员详情!$L$17" + }, + "GUID": "e3b0f7dd-9e6d-4807-ad47-eb02ebbce0be", + "StyleInfo": { + "Underline": null, + "Strikethrough": null + }, + "IsDisabled": true, + "IsInvisible": false, + "IsReadOnly": false + } + ] + } }, "PrintInfo": { "PaperSize": {}, @@ -976,13 +1015,13 @@ "Name": "项目ID", "Formula": "项目成员详情!$A$17" }, - { - "Name": "ID", - "Formula": "项目成员详情!$E$17" - }, { "Name": "已有项目成员", "Formula": "项目成员详情!$H$17" + }, + { + "Name": "ID", + "Formula": "项目成员详情!$E$17" } ] -}//LzJZzq7JaNBODbgB2MdkmSyfPKz/7Gd+uNNCXuOask2hwQcMfVMRHoY6SRfImM5A+0C9lp7Jvz2FCCkj5KLlJCbLFxoABNoRMersWft1QtM6VzQ+v1n+HG3qQo+0TICJd5bBYeendNdbR0z25lZPrYcKO1tMNLc/Q2/nEVzAvFetmMzp5vghzrKQpPIuxS00+9okTPEA8DEB8Ay8p/o4AXvDuJxM2zLptA7vf/OK+ct/oFg1/U4mvysNRwG4q4m0Z42YuHShyDNodqU/dv605qJnUUZkEhCtlSSSn0O3+1y/QXjHagx5JOH5mo2pB8iOpsEvN+XyaRfp5SgBRb+T7G/BsVgAsU4oYqaFRlR1LF7zufUdNHtFX0JH0OZpxXOyqSUTonWItnoC4+qmUo0qRiqyl7MERK19Z0iiCBLD9D3MfnN8GhHW4A3DJJ5EpY5EKzedeh3SL4itjfl5Vd/v/GcxhOmllHE1MIFZg2oFXZ3j9IvqOjzdP9dmdKekObpkECCDmYrYeJU6x4CAh4vC5DBj/1hCI/8JBzCmekLSAquQRzkhO//W/S+206SIvpO6Re4LNCZjI0Com+Aya2o+GGk52AZCtQEJhhgRyygmvGkHT9EBrN8SMchmQCOUxDTWgmZnxopGsJ6jOm71rzjUh/EuYSHKJBOjGed1ueig/CtcbzwMVPHn/xQysT8dqpy6JhCa1Ppzd/H0cAYmTxDMtifFrFIGh3BmiK/dBjEtdBBwdxNqRwuc77Nd/mxDobo9//LuMbFtzst10fIK/igRX4EM17ePU7d9yc/EbasA3gBPJqAszSFqAS8T6NUVkT1Q/EJ3BZWI8kN/Vk2tgegPFMxgX4aVBDR9eRS84y5xvoPaRNXL0jZRG2No9GnVAyL9Hyp/Ng1P5SYOWHCtL91CVA==|920 \ No newline at end of file +}//Lt2xtp3SRLptemXLBM6YLklmT2DVHUFRUl1pZn9m941Mee10P/c3X38VuuoJLwYOVH0gWx33LXQl+HUOMo4xieQt4OJxqzcjVY0jmvCDrQFyjYTp2zNJt8tx+rnSM4bU7JiZvbpMcWW1SOIUgQEX8gekI0cksEV9V+qMOYg3l8mvNANVtK0BNmpBeJ/N37vd7LobBJRjgjgBK37j5qIqE6LVNslo7v7m2F7W/qSuqopQgVOmGoVyXejf/5eRqSoodh5d0dLlO2XAYRoPGNdrhEROBpeYRbrTlG3h1Nx5nwiofrqkVYw48VXyMuKXP6snFQfj9mBOvP3Tj/AkjMkFbseSqKmBEatUvCFMgIMPeRaPqse5mtSNg4VU4GfWnFjbKeUjh72pdbU1iglVZPemRxecrRpVO99D0OiOUUnJaCZooN+3AWRVIAJJkZsz7u5busP4xmqt5BTneN0hWudBqnV08SrwNWNkO68GQtDFGq/F4bA9cCyFheXY74Xh1JYjUwk641fS2n56lTbXY6Vq0TnqegOn6p0ShPMqKPu/Gnn+kLvyVunyF042cM++JY9SrLlkdZJvlqMr0R+uvMAGkb2EsmzhQLooTEeurxs2l79wE3N6XLwbWqqEqvOA23WRiSvVrXum9cIjpfWEt66wwqkL2AvfKW4IYxF+vXPFEF/wkqFLJImvpG3R2oqQHol6zO2dMw+A55ooUKvmXrVyjAuHhe4jad9dgPSlG2TfJzc8eF/fvqKu3A7+AllOVboDSo4nkzSl4ZjXr7VQ8g5zPN33I8xQmkLSZlIdlMrg6Gr0tDZp3q0OgXMHNiisdgpX0i5pInC2POcs0hizhBbRj/5bMZVvMCO8v27paR4iGVK/ZrsD+xPW9jdp0D8bnmPnyyJ9zb1tvJccHpELWpGzbA==|920 \ No newline at end of file diff --git a/Pages/项目/项目成员详情.rd b/Pages/项目/项目成员详情.rd index 865768a3..4416d85c 100644 --- a/Pages/项目/项目成员详情.rd +++ b/Pages/项目/项目成员详情.rd @@ -10,13 +10,13 @@ "Name": "项目ID", "Formula": "项目成员详情!$A$17" }, - { - "Name": "ID", - "Formula": "项目成员详情!$E$17" - }, { "Name": "已有项目成员", "Formula": "项目成员详情!$H$17" + }, + { + "Name": "ID", + "Formula": "项目成员详情!$E$17" } ] } \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/任务列表.json b/Pages/项目/项目首页/项目首页-容器页面/任务列表.json index 68a4b8a6..eed83952 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/任务列表.json +++ b/Pages/项目/项目首页/项目首页-容器页面/任务列表.json @@ -495,7 +495,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "ea072306-af79-49d0-b829-e11cc3f69e5d" + "ID": "f71c94ae-010b-4c3d-bc5e-6dd50958d3d0" }, { "Condition": { @@ -529,7 +529,7 @@ ] } ], - "ID": "05992dab-e806-4678-b0f9-7b289d9ff745" + "ID": "f81cf588-b8db-4705-92fd-3cc1fcb2df74" }, { "CommandList": [ @@ -620,12 +620,12 @@ "LoadBindingDataOption": 2 } ], - "ID": "6c4d6215-0a81-406c-b411-d287a01361aa" + "ID": "4aca30e9-4578-4f6e-a0a8-9de9765c978c" } ] } ], - "ID": "ad8175d3-3608-4f75-9c7a-a5ed7b5785d7" + "ID": "8496f60e-010c-4b57-92ab-3aa855f494c0" }, { "CommandList": [ @@ -640,12 +640,12 @@ "BtnText": "知道了" } ], - "ID": "ed264fc5-090b-4596-abcf-bad2a95a8917" + "ID": "553f9ee0-90e7-448b-94ea-3185c417541e" } ] } ], - "ID": "10d31287-9011-4698-b974-ccb9fcc30d63" + "ID": "772d53b7-da5b-45be-9166-c2278dfb1af3" } ] } @@ -842,7 +842,7 @@ "TableName": "任务平行视图", "BindingInfos": [ { - "GUID": "dfb188c9-c354-4dc9-bd51-796de8f70c11", + "GUID": "b644a677-ce2b-4bb9-a607-3c65e14bba37", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "ID", @@ -851,7 +851,7 @@ "ColumnName": "value" }, { - "GUID": "77b196a9-3267-4681-bf7c-c3f325aaf9a6", + "GUID": "80782e03-37e4-4f73-85fa-f117234866bb", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "父任务ID", @@ -860,7 +860,7 @@ "ColumnName": "parentValue" }, { - "GUID": "4adfff24-4eba-4cff-8110-2bee6b0a6d2e", + "GUID": "10cac797-0f55-4530-b08e-fafb344d4c82", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "任务状态", @@ -874,7 +874,7 @@ "ColumnName": "状态" }, { - "GUID": "1a31174a-5883-48e5-a0e7-f119f1cb9e3b", + "GUID": "18e883db-a5a3-4b44-a867-0e56641bba8f", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "任务名称", @@ -883,7 +883,7 @@ "ColumnName": "任务名称" }, { - "GUID": "1238b995-8f81-4c3f-8e45-96faa971b359", + "GUID": "6107d837-a833-4f22-9578-e4cf0ad73253", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "任务负责人", @@ -896,7 +896,7 @@ "ColumnName": "执行者" }, { - "GUID": "ae6c015a-edbf-4daa-bb5e-54e4e65b4d7c", + "GUID": "6c503e40-34e7-4b95-8314-17751e4400f9", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "开始时间", @@ -905,7 +905,7 @@ "ColumnName": "开始时间" }, { - "GUID": "a7f43ffe-a2ed-4b3e-9acb-fa0cef848336", + "GUID": "cddbbd38-c887-4fc5-838c-a90cfaad98ce", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "结束时间", @@ -914,38 +914,29 @@ "ColumnName": "结束时间" }, { - "GUID": "0d18c678-96b4-4bc9-a115-3a88b223b732", + "GUID": "0f43fabd-a4b2-4bd8-9c67-11155a44ad93", "BindingInfo": { "TableName": "任务平行视图", - "ColumnName": "任务预算工时", - "GUID": "a1cce7c8-5d22-4d6c-93e0-8412aef88ced" + "ColumnName": "已分配工时_总分配工时", + "GUID": "3cc97be0-d9e6-4d8c-8917-9deab5db5201" }, - "ColumnName": "任务预算工时" + "ColumnName": "已分配工时_总分配工时" }, { - "GUID": "a067432f-8437-4521-b790-6631bec41a36", + "GUID": "8b1a6f71-60de-4fbb-9aa4-a9c7a5cdc9ee", "BindingInfo": { "TableName": "任务平行视图", - "ColumnName": "成员计划工时", - "GUID": "847e45cf-dc3c-4ccd-9663-d9ebfb3346dd" + "ColumnName": "总核定工时_已分配工时", + "GUID": "0014444c-201a-4d2e-88b1-57a0264fbbc9" }, - "ColumnName": "成员计划工时" + "ColumnName": "总核定工时_已分配工时" }, { - "GUID": "722ac557-e79a-4111-8b20-37a459c30741", - "BindingInfo": { - "TableName": "任务平行视图", - "ColumnName": "成员实际工时", - "GUID": "99312781-bdef-4256-afee-fabdfa2de70d" - }, - "ColumnName": "成员实际工时" - }, - { - "GUID": "5751d27c-c819-41b1-8a67-da8fc877b427", + "GUID": "044a0a6f-9ad7-40af-a3b2-51e0d3f2f342", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "成员数量", - "GUID": "c5dfa9df-c416-4160-b096-6a578c24bbc6" + "GUID": "3f9fbcc4-3353-4302-b0ab-4c50cd54bbaf" }, "ColumnName": "成员数量" } @@ -1040,9 +1031,8 @@ "执行者", "开始时间", "结束时间", - "任务预算工时", - "成员计划工时", - "成员实际工时", + "已分配工时_总分配工时", + "总核定工时_已分配工时", "成员数量" ] }, @@ -1051,7 +1041,7 @@ "$type": "ElementUI.VirtualizedTableColumnSetting, ElementUI", "DataColumnName": "任务名称", "Label": "任务名称", - "Width": 230, + "Width": 250, "Fixed": "left", "Align": "left", "HeaderAlign": "left" @@ -1060,6 +1050,7 @@ "$type": "ElementUI.VirtualizedTableColumnSetting, ElementUI", "DataColumnName": "状态", "Label": "状态", + "Width": 150, "Fixed": "none", "Align": "center", "HeaderAlign": "center" @@ -1092,28 +1083,16 @@ }, { "$type": "ElementUI.VirtualizedTableColumnSetting, ElementUI", - "DataColumnName": "任务预算工时", - "Label": "任务预算工时", - "FormatStr": "0.0\"小时\"", - "Width": 120, + "DataColumnName": "已分配工时_总分配工时", + "Label": "已分配/总分配", "Fixed": "none", "Align": "center", "HeaderAlign": "center" }, { "$type": "ElementUI.VirtualizedTableColumnSetting, ElementUI", - "DataColumnName": "成员计划工时", - "Label": "成员计划工时", - "FormatStr": "0.0\"小时\"", - "Fixed": "none", - "Align": "center", - "HeaderAlign": "center" - }, - { - "$type": "ElementUI.VirtualizedTableColumnSetting, ElementUI", - "DataColumnName": "成员实际工时", - "Label": "成员实际工时", - "FormatStr": "0.0\"小时\"", + "DataColumnName": "总核定工时_已分配工时", + "Label": "总核定/已分配", "Fixed": "none", "Align": "center", "HeaderAlign": "center" @@ -1201,7 +1180,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "ae31ca53-82c0-4803-abef-119a4ad06a13" + "ID": "122250b1-4cbb-4e74-978c-498703efda3b" }, { "CommandList": [ @@ -1240,12 +1219,12 @@ "LoadBindingDataOption": 1 } ], - "ID": "7eda32bc-02b2-4bb5-938c-d03fddeada63" + "ID": "1cdc34d2-03fb-44aa-8536-2bfda72f59af" } ] } ], - "ID": "d5275af0-d5fe-4b5a-90ae-4a97b5dd19e4" + "ID": "f749cbf6-0ff2-45ee-b7b4-79a68cd312be" } ] } @@ -1625,17 +1604,17 @@ } ], "CustomNames": [ - { - "Name": "任务分组区域", - "Formula": "任务列表!$B$4" - }, { "Name": "当前分组", "Formula": "任务列表!$B$13" }, + { + "Name": "任务分组区域", + "Formula": "任务列表!$B$4" + }, { "Name": "任务EL表格", "Formula": "任务列表!$K$6" } ] -}//kV73BZCx4FEq3+p/xnEY/NYMR9F6XY9sy3AInLr2YCKUfHsXpcK42YRL/JQJxGT6DEKZHyrkmgdHBc5OCa25RqBmybvINIF+Y9RTE0S4zTmUmnSHsCmwQyNRVAqA+HwZKqaq/nC2PjYXGizQxcGbCTGjHXRACYj531fU2BbXRWm0pzMKMOZngoV70jI2nIbCS4YEtkSnHHI/3uBA574OCZ8hl/5gy/bQ+0Y4eLCzNj/Z8p4LDCC5PuXfIq51WS2Q85cXvzg00/uk4h15w0EwDJrdztwN7/fc3N2wrfZWTc6d+D/c1377VUsatk0hsRnT/jfh3qVUnGcz29/q0uzjMpTnam2hY5P3ZU3t6zFB8E+za4GhqFsRt8JmHoD/hl/X7xWoizDBeT4cdxUd37QejKH3+Z6p69HqVrSSYQMBAF6dWN6rGRuvHLJwbwC48MQdzq9e6e2g1XXwyeKMFGOnNOuAalxvzZDszHvvTLQrhTy+TTVsMiIDJfylDOsNcJFuYvYbO1bsQOwx8pYY41FPA715OkqdInS0WT6L23EcIVmhhLl7qmIjJpz0Xv2AEqdMMChYtmmVk8N8u27l/6XZYOUCHwNa188GBxZObFMIBtNeGoQvfyMtyhNUI5nGmhmxnrF2YTPNmrGxzdrkfMyRF1noPUWDkyfGh/rXBJG7kSSuNEPwLidAd6RRquo8KCtvXSRMyLsYINmSNZTmcs/yNQDgx1FxRdOJiZ/Vm5t5UOoDpICIFMhe1lVVWiE7EEHa0xP982U4bAjqKfXZRhxxY0XJnZLswUQds5N91tCG6U361PlvhhMaJZXQeZYSCdQBsYrbRf1lZCCpH+cLiAtQAdwfGmT7bAHnHNtcqN8AzO4cYcQmSKrOxTwj1dZBC7ePrNWiVAevB0BqSHdHSfzWpA==|920 \ No newline at end of file +}//I51cCKLhjZOUERJXzD3o1SN8J4I0LqYBg8w0C3GWTtrcCkN6l9MsGNHOXWVKt6KuMs3wQnZT2E4SxeAWCDL+GbQHNqwtkW7bBbLi/IzBukbwoanhtigd/WXh0eyCseSvc/mk3u8Zg0f61Ji8eTk8g9b42mhmpkiA+Mn9XCqDovoHtl5hyLcsh07MARLT7de3zxALQ0HuISxExiglxkPa8nUnO8VazAxXBZvs9akq948y7sgi1KiJZ1QjVFf1bmC58BmOkkOqZfyFqbDsnXU2vaFW/hQrBn8dbs3Pe6/SKVbCVYXdrQ3h0oixG9m/o9ok1oupngFswRv3guWuvgaKQ2mLOUqmP8JuUXslfv3g+uLWqgDQHh5P97d52thULlwfqQtyQ0pJhPE/m5PXDrT/VSXSdIG2e2acUxUbPm8mmK7uHq/KYwmKDrbJc3ltpj0QnRNDZ01i1NchON0xVrlYklD08WILYtfisOcA3IWhtA0eTnlGDYvawTvyIGSmlSVhGh+WTecJPh31ke1JjZd90f8yV2epPqSEvoIWzaBRIVtD6dJ4rSwc+NEi0LEBPEtSC+Zia/nnqhSxLat1ZSXNG5AtsBu+hSqiO98lQsGS/s8+lMHY9RycjxsnElxne9BxE4aLKhvtq4Bqd5mCzB3ZWkP9U70um/xUbw7sk0jBFiU2XuMqkSDq6Bs3W6bhTR9ILZbEUijvRcBEqUKBnFx/zkGz+JUQ1Vbb7kCKIyGwIdlpCjl7QREqFclRZxQKEOn/W8N7BTmsPfOdCITxBjsdd9wSKKSzpdxmtCa/h/vZuEZ6kRylcr4lt74OvdoKLsp+PEjA7/8+3krwM3QBSER6AbnuwNYMa8ivCh3YqWiDK2WSrOQHf8yZE/K6JOhtkC0/Qi7auX8VDKad2G0McZBomQ==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/任务列表.rd b/Pages/项目/项目首页/项目首页-容器页面/任务列表.rd index ced8bbfb..084a5eda 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/任务列表.rd +++ b/Pages/项目/项目首页/项目首页-容器页面/任务列表.rd @@ -3,14 +3,14 @@ "ColumnCount": 40, "RowCount": 13, "CustomNames": [ - { - "Name": "任务分组区域", - "Formula": "任务列表!$B$4" - }, { "Name": "当前分组", "Formula": "任务列表!$B$13" }, + { + "Name": "任务分组区域", + "Formula": "任务列表!$B$4" + }, { "Name": "任务EL表格", "Formula": "任务列表!$K$6" diff --git a/Process/新增任务流程.bpmn b/Process/新增任务流程.bpmn index 59d448aa..c57f6d46 100644 --- a/Process/新增任务流程.bpmn +++ b/Process/新增任务流程.bpmn @@ -4,7 +4,7 @@ - + @@ -21,7 +21,7 @@ - + Flow_0otbu5x Flow_1bfvbmv diff --git a/Process/项目立项流程.bpmn b/Process/项目立项流程.bpmn index 109c9638..71aa15fc 100644 --- a/Process/项目立项流程.bpmn +++ b/Process/项目立项流程.bpmn @@ -4,7 +4,7 @@ 用于项目的立项申请审批 - + @@ -57,12 +57,12 @@ - + - + @@ -85,7 +85,7 @@ - + diff --git a/ServerCommands/任务/任务发起流程前校验.json b/ServerCommands/任务/任务发起流程前校验.json index a386bac7..dd8c9b4f 100644 --- a/ServerCommands/任务/任务发起流程前校验.json +++ b/ServerCommands/任务/任务发起流程前校验.json @@ -43,7 +43,7 @@ "TableValueType": 1, "BindingInfos": [ { - "GUID": "ba455dea-c603-4f25-85ad-acf820a7e0c0", + "GUID": "f545696a-35eb-4ba7-966e-6165b2631ea9", "BindingInfo": { "TableName": "任务表", "ColumnName": "项目ID", @@ -52,7 +52,16 @@ "ColumnName": "项目ID" }, { - "GUID": "900d46b7-3532-4567-91cb-57aca96a546e", + "GUID": "033c1005-0793-4527-86f6-c740ac54d7dc", + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "任务名称", + "GUID": "753ddaa6-f324-4828-ad56-f66e0d8de234" + }, + "ColumnName": "任务名称" + }, + { + "GUID": "ae271fc0-b4c3-45d2-8c25-843bb35c9d85", "BindingInfo": { "TableName": "任务表", "ColumnName": "父任务ID", @@ -61,7 +70,7 @@ "ColumnName": "父任务ID" }, { - "GUID": "d73e44fd-2e43-4116-b585-333ca2562fc6", + "GUID": "72820fcd-2acd-4d24-8bf0-123388c2ab5b", "BindingInfo": { "TableName": "任务表", "ColumnName": "父任务ID", @@ -75,7 +84,7 @@ "ColumnName": "父任务任务状态" }, { - "GUID": "da8b6abf-5d57-46f6-874a-3fc3147afcd7", + "GUID": "c7a73e35-dbb7-4b5b-bc10-d995fc872f33", "BindingInfo": { "TableName": "任务表", "ColumnName": "项目ID", @@ -94,7 +103,7 @@ "ColumnName": "项目预算工时" }, { - "GUID": "e74e3554-e9ed-45bd-b47c-1f1d33211bd3", + "GUID": "6969b599-8082-4a30-9444-27ba08043e08", "BindingInfo": { "TableName": "任务表", "ColumnName": "项目ID", @@ -113,7 +122,7 @@ "ColumnName": "已分配任务工时" }, { - "GUID": "818c62b8-cdcd-46ea-8ea9-ae9858011d1b", + "GUID": "b5714ec5-9660-4d97-8ec9-f6333bc5e838", "BindingInfo": { "TableName": "任务表", "ColumnName": "项目ID", @@ -127,7 +136,7 @@ "ColumnName": "项目经理" }, { - "GUID": "2f826e88-d8ea-4d6d-84ae-9ed11f948656", + "GUID": "40e6a4ac-0999-45e7-9d08-6c0adec2a91e", "BindingInfo": { "TableName": "任务表", "ColumnName": "项目ID", @@ -141,7 +150,7 @@ "ColumnName": "工时分配方式" }, { - "GUID": "931496b5-6162-4e8c-890a-14c022b7b92a", + "GUID": "e2faa23a-5fba-4627-a664-7fee287549cc", "BindingInfo": { "TableName": "任务表", "ColumnName": "任务预算工时", @@ -150,7 +159,7 @@ "ColumnName": "任务预算工时" }, { - "GUID": "b325857a-1e57-4233-93d0-78ca004b9f8a", + "GUID": "2b5f11cd-87dc-4299-a6e5-07ac1a082d63", "BindingInfo": { "TableName": "任务表", "ColumnName": "项目ID", @@ -164,7 +173,7 @@ "ColumnName": "严格模式" }, { - "GUID": "ad0b06ae-6b5e-4d6f-9a57-5c2918c2cf04", + "GUID": "c69bfc11-e266-4e61-9f7a-dc68a17ea092", "BindingInfo": { "TableName": "任务表", "ColumnName": "任务负责人", @@ -173,7 +182,20 @@ "ColumnName": "执行者" }, { - "GUID": "a0d5f139-812d-4bea-9a3f-cc0ee388f3dc", + "GUID": "6af3e8d3-4379-42bb-b62d-43a2ec075aff", + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "任务负责人", + "GUID": "42d851ed-8e39-4a1d-bc06-92731c8fd223", + "AttachType": { + "$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess", + "UserColumnAttachType": 1 + } + }, + "ColumnName": "任务负责人_全名" + }, + { + "GUID": "e3b08944-6249-43fb-9158-37cbc10abcdf", "BindingInfo": { "TableName": "任务表", "ColumnName": "任务类型", @@ -182,7 +204,7 @@ "ColumnName": "任务类型" }, { - "GUID": "64cb157e-5ff8-41b9-a1cc-eabdd1e74f85", + "GUID": "5020402d-35fe-4d89-82c7-7460745e82eb", "BindingInfo": { "TableName": "任务表", "ColumnName": "版本", @@ -191,13 +213,22 @@ "ColumnName": "版本" }, { - "GUID": "c52c4d94-9d70-4366-a948-2799e4043614", + "GUID": "1f62db51-8d14-4582-bf8b-480ef7c155e4", "BindingInfo": { "TableName": "任务表", "ColumnName": "任务状态", "GUID": "8b3ea124-961b-4d9c-8342-d06a89709702" }, "ColumnName": "任务状态" + }, + { + "GUID": "d6e8b372-a40c-400c-b4f5-71f537318a9d", + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "流程实例ID", + "GUID": "f0756ea2-7301-436d-8004-e5d0bed1ae01" + }, + "ColumnName": "流程实例ID" } ], "SqlCondition": { @@ -215,23 +246,52 @@ "NullFormulaValueQueryPolicy": 0, "TopCount": "1" }, - "ID": "05732b16f68a40aea1411edf257a1a75" + "ID": "b03a1cfd7eac4938992501f57ff5cc2d" + }, + { + "$type": "Forguncy.Model.ProcessInstanceCommand, ServerDesignerCommon", + "ProcessInstanceId": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务信息.流程实例ID" + }, + "OperateType": 400, + "ProcessInstanceName": { + "$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": "=任务信息.父任务任务状态" + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务信息.父任务ID" + } + }, + "value": "%Null%", + "compareType": 1 + }, + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务信息.父任务任务状态" + } + }, + "value": "2", + "compareType": 1 } - }, - "value": "2", - "compareType": 1 + ] }, "CommandList": [ { @@ -240,7 +300,7 @@ "Message": "请等待父任务审批后方可发起！" } ], - "ID": "0ffd4993-3dcd-4726-bd66-951c44d1ce9d" + "ID": "abdcd957-d6e5-46d4-9572-9e3fed0c35e9" } ] }, @@ -266,7 +326,7 @@ "Message": "当前项目未指定项目经理，请指定后再试" } ], - "ID": "03745930-4d16-4d69-9c87-a81e35683b88" + "ID": "98d0fe1a-dabf-426e-9ab9-bbd52407d6fa" } ] }, @@ -292,7 +352,7 @@ "Message": "请指定任务执行者" } ], - "ID": "e244e7d0-6f12-499f-bac0-3e6e3adee3d9" + "ID": "374ece9e-326f-4236-85c7-7ddfb05e868b" } ] }, @@ -318,7 +378,7 @@ "Message": "请指定任务类型" } ], - "ID": "1c3d6abb-4f24-4101-8804-9d9f17fcd996" + "ID": "b9a77a62-17a9-4364-9b06-c08856687b0f" } ] }, @@ -344,7 +404,7 @@ "Message": "请为任务指定版本" } ], - "ID": "81e2f52f-7bca-4c27-9a80-e4a9b7a4df10" + "ID": "4e736f1c-d439-4d1f-a6e3-9d8001981de8" } ] }, @@ -390,7 +450,7 @@ "ID": "f067411d74064d7b94eaa375d9410597" } ], - "ID": "42b18717-7bb8-4288-96d3-22c208d5ce83" + "ID": "5ce8861b-e3b4-40f6-b857-6df105d63ce6" }, { "CommandList": [ @@ -456,7 +516,7 @@ "ID": "d9c75d72e3cb44e1928346d49e88b7da" } ], - "ID": "6bf73aa0-951b-4080-b09e-8c0b2c968796" + "ID": "4fb958b0-134a-4c34-a18f-93b81a22771e" } ], "Comments": "严格模式下，根据是否有父任务来计算本次预算工时的上限" @@ -490,12 +550,12 @@ } } ], - "ID": "51343141-8cfe-414d-ac01-7a82d052ac51" + "ID": "40842093-b2f4-4f75-b8ab-4accb87d869e" } ] } ], - "ID": "5a4607f9-f6cf-4e93-a344-74c178029992" + "ID": "851dc9d6-5375-499f-bfed-05ec00eaa385" } ], "Comments": "校验工时情况是否通过" diff --git a/ServerCommands/任务/修改任务预算工时.json b/ServerCommands/任务/修改任务预算工时.json index ffc111ef..73753c42 100644 --- a/ServerCommands/任务/修改任务预算工时.json +++ b/ServerCommands/任务/修改任务预算工时.json @@ -37,126 +37,109 @@ } ], "Commands": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "任务表", + "TableValue": { + "TableName": "任务平行视图", + "TableValueType": 1, + "BindingInfos": [ + { + "GUID": "be2a7c85-71fb-4976-9af2-507b573c92d6", + "BindingInfo": { + "TableName": "任务平行视图", + "ColumnName": "项目ID", + "GUID": "5719fcb2-167f-46e2-a595-f2694094d3d4" + }, + "ColumnName": "项目ID" + }, + { + "GUID": "4a1fe1bc-8729-4b6a-881f-bd2eb810527b", + "BindingInfo": { + "TableName": "任务平行视图", + "ColumnName": "项目ID", + "GUID": "14189ead-62a9-4601-a206-b4ce4e6c9b79", + "RelationBinding": { + "RelatedTable": "项目平行视图", + "RelatedColumn": "ID", + "DisplayColumn": "严格模式" + } + }, + "ColumnName": "严格模式" + }, + { + "GUID": "af5ce581-9c03-4823-a5f7-e60ba0f56d62", + "BindingInfo": { + "TableName": "任务平行视图", + "ColumnName": "项目ID", + "GUID": "589e85bb-a515-4946-bbba-0fd990283805", + "RelationBinding": { + "RelatedTable": "项目平行视图", + "RelatedColumn": "ID", + "DisplayColumn": "项目可分配工时" + } + }, + "ColumnName": "项目可分配工时" + }, + { + "GUID": "2f207def-1824-4e7e-9d3c-d85442d4ada5", + "BindingInfo": { + "TableName": "任务平行视图", + "ColumnName": "任务名称", + "GUID": "027d069e-aaad-494d-adfc-ce3116a4e006" + }, + "ColumnName": "任务名称" + }, + { + "GUID": "a4e87092-f4a7-463a-bfd8-49784aee4291", + "BindingInfo": { + "TableName": "任务平行视图", + "ColumnName": "总分配工时", + "GUID": "6f70bc63-6e7f-4cdb-b495-564ead523b05" + }, + "ColumnName": "总分配工时" + }, + { + "GUID": "f2e98909-a670-46b0-96d5-48fcbc7f404f", + "BindingInfo": { + "TableName": "任务平行视图", + "ColumnName": "已分配工时", + "GUID": "4a2a9325-8cad-4111-b6fd-0d9cfda9ed22" + }, + "ColumnName": "已分配工时" + }, + { + "GUID": "f751f581-8165-4008-9483-6a81f235fb1f", + "BindingInfo": { + "TableName": "任务平行视图", + "ColumnName": "父任务ID", + "GUID": "d91016f5-5a46-4636-8dac-33b23d21f90a" + }, + "ColumnName": "父任务ID" + }, + { + "GUID": "99d812f4-55d1-4297-b6f6-37ea4cf3097e", + "BindingInfo": { + "TableName": "任务平行视图", + "ColumnName": "父任务ID", + "GUID": "7fa493a6-7867-4a57-bc91-7c846e7a4b76", + "RelationBinding": { + "RelatedTable": "任务平行视图", + "RelatedColumn": "ID", + "DisplayColumn": "可分配工时" + } + }, + "ColumnName": "父任务可分配工时" + } + ], + "TopCount": "1" + }, + "ID": "7106ec79fbd74d16a4200f5775065b5a" + }, { "$type": "Forguncy.Model.CatchExceptionCommand, ServerDesignerCommon", "TryCommandPart": { "CommandList": [ - { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "任务表", - "TableValue": { - "TableName": "任务表", - "TableValueType": 1, - "BindingInfos": [ - { - "GUID": "e4efa15a-3c9e-4cfe-a495-00030d11e9c5", - "BindingInfo": { - "TableName": "任务表", - "ColumnName": "项目ID", - "GUID": "8fc75aad-be22-4706-bfc1-5d2a9e34ee8c" - }, - "ColumnName": "项目ID" - }, - { - "GUID": "96c4a14f-f7be-4ca1-8882-36a1c2feba42", - "BindingInfo": { - "TableName": "任务表", - "ColumnName": "父任务ID", - "GUID": "b3058106-27e3-4405-825a-c6317d65dbba" - }, - "ColumnName": "父任务ID" - }, - { - "GUID": "a1090bc3-3a03-4758-ae63-4bf90f90913d", - "BindingInfo": { - "TableName": "任务表", - "ColumnName": "任务名称", - "GUID": "efdec58c-5625-4843-a75d-ff21aec11dff" - }, - "ColumnName": "任务名称" - }, - { - "GUID": "ef8a7ac8-87a8-4687-8382-b81c6df691ca", - "BindingInfo": { - "TableName": "任务表", - "ColumnName": "任务预算工时", - "GUID": "3db7c756-c246-409a-abb4-19c211e4658e" - }, - "ColumnName": "任务预算工时" - } - ], - "SqlCondition": { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "任务表", - "ColumnName": "ID", - "GUID": "23383ca7-120e-436c-8f7b-3b828003fcfe" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务ID" - } - }, - "TopCount": "1" - }, - "ID": "86690732be6d422cbe4dd8b8b862d941" - }, - { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "项目统计", - "TableValue": { - "TableName": "View_项目统计信息", - "TableValueType": 1, - "BindingInfos": [ - { - "GUID": "1071aaed-c888-40f1-960a-cb391e04daf9", - "BindingInfo": { - "TableName": "View_项目统计信息", - "ColumnName": "项目ID", - "GUID": "e2c10b48-d276-43ff-92d3-6982554995d3", - "RelationBinding": { - "RelatedTable": "项目表", - "RelatedColumn": "ID", - "DisplayColumn": "严格模式" - } - }, - "ColumnName": "严格模式" - }, - { - "GUID": "280bf59f-50d3-47ce-9900-bdd1d38770ef", - "BindingInfo": { - "TableName": "View_项目统计信息", - "ColumnName": "项目预算工时", - "GUID": "df4b665e-bf05-415f-b1d6-44ef6268356f" - }, - "ColumnName": "项目预算工时" - }, - { - "GUID": "1eed9f7a-0f20-496c-822e-57487829c330", - "BindingInfo": { - "TableName": "View_项目统计信息", - "ColumnName": "已分配任务工时", - "GUID": "e0b92957-2058-4acf-8f85-c8cb21e7751c" - }, - "ColumnName": "已分配任务工时" - } - ], - "SqlCondition": { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "View_项目统计信息", - "ColumnName": "项目ID", - "GUID": "a21318d5-5050-4baa-a025-483041bba932" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务表.项目ID" - } - }, - "TopCount": "1" - }, - "ID": "be3e901989ee48be8342a779529ecad0" - }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", "ConditionAndCommandPairList": [ @@ -167,98 +150,51 @@ "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", "ParamObject": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目统计.严格模式" + "SerializeProperty": "=任务表.严格模式" } }, "value": "1" }, "CommandList": [ - { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "子任务总预算工时", - "TableValue": { - "TableName": "任务表", - "TableValueType": 1, - "BindingInfos": [ - { - "GUID": "40bd1e33-4105-4ded-8088-c30758b2397d", - "BindingInfo": { - "TableName": "任务表", - "ColumnName": "总任务预算工时", - "GUID": "511457d9-7abf-404b-82ae-ba26a29ab5a8" - }, - "ColumnName": "总任务预算工时" - } - ], - "SqlCondition": { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "任务表", - "ColumnName": "父任务ID", - "GUID": "d129907c-cb5f-4eb3-bf88-b3aa460dfb44" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务ID" - } - }, - "NullFormulaValueQueryPolicy": 0 - }, - "ID": "de31cf4feec24851abbeeaab23503aba" - }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", "ConditionAndCommandPairList": [ { "Condition": { - "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", - "SubConditions": [ - { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", - "ParamObject": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=子任务总预算工时" - } - }, - "value": "%Null%", - "compareType": 1 - }, - { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", - "ParamObject": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=新预算工时" - } - }, - "value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=子任务总预算工时.总任务预算工时" - }, - "compareType": 4 + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新预算工时" } - ] + }, + "value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务表.已分配工时" + }, + "compareType": 4 }, "CommandList": [ { "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", "ErrorCode": "400", - "Message": "此操作会导致子任务预算工时不足，无法修改！", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=\"任务已被分配消耗\"&任务表.已分配工时&\"小时，修改后工时，不可低于此值。\"" + }, "CustomReturns": [ { "ReturnPropertyName": "新工时", "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务表.任务预算工时" + "SerializeProperty": "=任务表.总分配工时" } } ] } ], - "ID": "08d32666-d901-4736-8b9d-f3a37b9b3f72" + "ID": "026c2ec7-65d0-4edf-b63f-f4811efbbbce" } ] }, @@ -280,85 +216,45 @@ "CommandList": [ { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "预算工时上限", + "ParameterName": "上级剩余工时", "ParameterValue": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目统计.项目预算工时-项目统计.已分配任务工时-任务表.任务预算工时" + "SerializeProperty": "=任务表.项目可分配工时" }, - "ID": "e583a0048e5044a0b325443e28146bdb" + "ID": "a3983825d9f2443291e18e51a11fb868", + "Comments": "如果没有父任务，则将项目可分配工时+任务当前的总分配工时 （相当于这个任务没有分）" } ], - "ID": "c3e577e2-28e8-46f1-bb0d-0bed874a00b3" + "ID": "e6a81e42-cfe2-4679-aedd-095c2e63bbd7" }, { "CommandList": [ { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "父任务", - "TableValue": { - "TableName": "任务平行视图", - "TableValueType": 1, - "BindingInfos": [ - { - "GUID": "561e2df3-b364-4b71-82d7-e257f78c6b8f", - "BindingInfo": { - "TableName": "任务平行视图", - "ColumnName": "层级", - "GUID": "a5e920a4-a2a4-4af1-ae02-5f800213a048" - }, - "ColumnName": "层级" - }, - { - "GUID": "e21efd11-6c4b-447c-b4b8-e8dae1f3a23e", - "BindingInfo": { - "TableName": "任务平行视图", - "ColumnName": "任务预算工时", - "GUID": "c8f84a0f-d253-4d60-942d-a1473cb8f830" - }, - "ColumnName": "任务预算工时" - }, - { - "GUID": "2375b49f-a344-481d-b24f-255535146b39", - "BindingInfo": { - "TableName": "任务平行视图", - "ColumnName": "成员计划工时", - "GUID": "9644df0b-6bd7-483b-8aaf-96d5c3fa435a" - }, - "ColumnName": "总计划工时" - } - ], - "SqlCondition": { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "任务平行视图", - "ColumnName": "ID", - "GUID": "aa8ca1bc-889e-404f-a711-80fc6a865711" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务表.父任务ID" - } - }, - "NullFormulaValueQueryPolicy": 0, - "TopCount": "1" - }, - "ID": "30e709ea5084438aa023a958fc494046" - }, - { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "预算工时上限", + "ParameterName": "上级剩余工时", "ParameterValue": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=父任务.任务预算工时-父任务.总计划工时--任务表.任务预算工时" + "SerializeProperty": "=任务表.父任务可分配工时" }, - "ID": "423c3d6d0618419c9eac630be5066c46" + "ID": "7178f06751f243fabad088261b05e67a", + "Comments": "如果没有父任务，则将项目可分配工时+任务当前的总分配工时 （相当于这个任务没有分）" } ], - "ID": "2aa16f65-1c6d-44aa-96ca-127cf34ed417" + "ID": "569ab419-0803-49c9-b7bd-e781ae76f27a" } ], "Comments": "严格模式下，根据是否有父任务来计算本次预算工时的上限" }, + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "预算工时上限", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=上级剩余工时+任务表.总分配工时" + }, + "ID": "8dffb4efb5bf4fac85b5b1e0b20a83f6", + "Comments": "上级任务剩余可用的工时+当前任务的总工时，相当于没有分给它" + }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", "ConditionAndCommandPairList": [ @@ -384,7 +280,7 @@ "ErrorCode": "400", "Message": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=IF(任务表.父任务ID>0,\"预算工时超标：父任务可支配计划工时不足，请修改后提交！\",\"预算工时超标：项目可只配计划工时不足，请修改后提交！\")" + "SerializeProperty": "=\"任务工时超标，无法修改，当前任务最大上线为：\"&预算工时上限&\"小时\"" }, "CustomReturns": [ { @@ -393,12 +289,12 @@ ] } ], - "ID": "a466e785-7cc9-4ce8-a45f-3204e491ed05" + "ID": "1013396d-e163-4e74-ba8b-802635b85aac" } ] } ], - "ID": "56c7dbed-d2e5-428f-86dc-f27e0e1d489f" + "ID": "09e64e05-f637-4227-a9cd-b0037d52dd86" } ] }, @@ -427,7 +323,7 @@ "BindingInfo": { "TableName": "任务表", "ColumnName": "任务预算工时", - "GUID": "0eb570fc-b0ce-4140-be2e-a2151dd6f191" + "GUID": "c97c73f6-9c2f-4287-bbaf-507466d52b51" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -447,7 +343,7 @@ "BindingInfo": { "TableName": "项目动态", "ColumnName": "项目ID", - "GUID": "b30d67e3-974e-49c6-b555-58d77f4aead7" + "GUID": "d7ffa3b0-6f55-478f-b1f9-bbf7d3a49549" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -458,7 +354,7 @@ "BindingInfo": { "TableName": "项目动态", "ColumnName": "项目动态", - "GUID": "8337d1ea-3d21-49bd-9e46-8e81777cafc2" + "GUID": "a8e4db37-d2d2-4f37-a5f8-e9205b6c6c2c" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -469,7 +365,7 @@ "BindingInfo": { "TableName": "项目动态", "ColumnName": "执行人", - "GUID": "d13db88a-278c-4c08-a328-db04b1d4606b" + "GUID": "d7524510-f1ac-415a-bb26-50b182b3c50a" }, "Value": "%CurrentUser%" } @@ -510,12 +406,72 @@ "ReturnPropertyName": "新工时", "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务表.任务预算工时" + "SerializeProperty": "=任务表.总分配工时" } } ] } ] + }, + "FinallyCommandPart": { + "CommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "项目统计", + "TableValue": { + "TableName": "View_项目统计信息", + "TableValueType": 1, + "BindingInfos": [ + { + "GUID": "e712cac8-db4c-4e49-bbf4-22db3754f7be", + "BindingInfo": { + "TableName": "View_项目统计信息", + "ColumnName": "项目ID", + "GUID": "e2c10b48-d276-43ff-92d3-6982554995d3", + "RelationBinding": { + "RelatedTable": "项目表", + "RelatedColumn": "ID", + "DisplayColumn": "严格模式" + } + }, + "ColumnName": "严格模式" + }, + { + "GUID": "0f378adc-4c2f-4583-9380-29ab9162a247", + "BindingInfo": { + "TableName": "View_项目统计信息", + "ColumnName": "项目预算工时", + "GUID": "df4b665e-bf05-415f-b1d6-44ef6268356f" + }, + "ColumnName": "项目预算工时" + }, + { + "GUID": "365bbef0-0c71-4147-8ca1-6fae9781df36", + "BindingInfo": { + "TableName": "View_项目统计信息", + "ColumnName": "已分配任务工时", + "GUID": "e0b92957-2058-4acf-8f85-c8cb21e7751c" + }, + "ColumnName": "已分配任务工时" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "View_项目统计信息", + "ColumnName": "项目ID", + "GUID": "a21318d5-5050-4baa-a025-483041bba932" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务表.项目ID" + } + }, + "TopCount": "1" + }, + "ID": "62875afcfcce4e3995ac1f427b544e8c" + } + ] } } ], diff --git a/ServerCommands/工时/上报实际工时.json b/ServerCommands/工时/上报实际工时.json index 8b31f268..2f1b815c 100644 --- a/ServerCommands/工时/上报实际工时.json +++ b/ServerCommands/工时/上报实际工时.json @@ -84,7 +84,7 @@ "TableValueType": 1, "BindingInfos": [ { - "GUID": "2c2767fc-9c55-4efe-b6b2-224ecc020029", + "GUID": "73cab051-4981-451d-8e25-12bfcb1b7d6f", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "项目ID", @@ -93,7 +93,7 @@ "ColumnName": "项目ID" }, { - "GUID": "c530784c-9ec7-4b10-8b13-2a2e2313ed0f", + "GUID": "a661203f-2a9a-425c-9a70-0bd2c108c0dd", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "任务名称", @@ -102,39 +102,7 @@ "ColumnName": "任务名称" }, { - "GUID": "a5925b6c-d337-4cbe-8923-c518ef23d291", - "BindingInfo": { - "TableName": "任务平行视图", - "ColumnName": "任务预算工时", - "GUID": "88baaaea-577c-4e64-ac91-fc6821062c8e" - }, - "ColumnName": "任务预算工时" - }, - { - "GUID": "76a3c299-61b1-4dba-a237-9afee0c01605", - "BindingInfo": { - "TableName": "任务平行视图", - "ColumnName": "任务状态", - "GUID": "dbce198e-cb11-4ac9-96e3-d3747a2ca23b" - }, - "ColumnName": "任务状态" - }, - { - "GUID": "74266711-61bf-4bed-8222-9b4e6266bb1c", - "BindingInfo": { - "TableName": "任务平行视图", - "ColumnName": "任务状态", - "GUID": "b316af2a-362c-4368-87f3-06a450cf885f", - "RelationBinding": { - "RelatedTable": "任务状态", - "RelatedColumn": "状态码", - "DisplayColumn": "任务状态" - } - }, - "ColumnName": "任务状态文本" - }, - { - "GUID": "791f2501-5a1c-4ffd-9005-1cc0715b34de", + "GUID": "4397f439-0ebf-4569-a805-e551990474ab", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "项目ID", @@ -148,35 +116,7 @@ "ColumnName": "严格模式" }, { - "GUID": "167a9561-3e96-4434-84bc-48fe9e2ebb6b", - "BindingInfo": { - "TableName": "任务平行视图", - "ColumnName": "项目ID", - "GUID": "b4ff6da3-d41f-42f4-a431-d660f7993661", - "RelationBinding": { - "RelatedTable": "项目平行视图", - "RelatedColumn": "ID", - "DisplayColumn": "项目预算工时" - } - }, - "ColumnName": "项目预算工时" - }, - { - "GUID": "0e30f9f8-40aa-492f-a9dc-d1b865a53a5c", - "BindingInfo": { - "TableName": "任务平行视图", - "ColumnName": "项目ID", - "GUID": "1b694496-49f0-4511-ab3d-00cdd03bc6c8", - "RelationBinding": { - "RelatedTable": "项目平行视图", - "RelatedColumn": "ID", - "DisplayColumn": "项目预算费用" - } - }, - "ColumnName": "项目预算费用" - }, - { - "GUID": "0f4ec208-cb60-4f19-a38f-710e101dfceb", + "GUID": "67003c11-d82c-4a3d-938a-50483ce1dfe9", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "项目ID", @@ -190,36 +130,27 @@ "ColumnName": "工时分配方式" }, { - "GUID": "d374362a-62bf-4271-9401-da087b8ad5e6", + "GUID": "414b51d3-0095-42b6-ba3d-0d6260b0a59a", "BindingInfo": { "TableName": "任务平行视图", - "ColumnName": "任务类型", - "GUID": "c0e462ce-e3de-494a-bcf8-309a62d6279a", + "ColumnName": "任务状态", + "GUID": "dbce198e-cb11-4ac9-96e3-d3747a2ca23b" + }, + "ColumnName": "任务状态" + }, + { + "GUID": "cbc00a12-b92b-4d89-bf75-62a2d10c760e", + "BindingInfo": { + "TableName": "任务平行视图", + "ColumnName": "任务状态", + "GUID": "b316af2a-362c-4368-87f3-06a450cf885f", "RelationBinding": { - "RelatedTable": "任务类型", - "RelatedColumn": "ID", - "DisplayColumn": "提成系数" + "RelatedTable": "任务状态", + "RelatedColumn": "状态码", + "DisplayColumn": "任务状态" } }, - "ColumnName": "提成系数" - }, - { - "GUID": "2380db01-cfa4-414b-87d6-1c6b1851e275", - "BindingInfo": { - "TableName": "任务平行视图", - "ColumnName": "成员计划工时", - "GUID": "8607fe01-1f38-41f0-a9d2-ac602ee7f344" - }, - "ColumnName": "总计划工时" - }, - { - "GUID": "939b27b6-1d20-44b2-a1a4-f100a4b5c510", - "BindingInfo": { - "TableName": "任务平行视图", - "ColumnName": "成员实际工时", - "GUID": "51709060-4e4c-4a5f-8e70-ee6a68823f4d" - }, - "ColumnName": "总实际工时" + "ColumnName": "任务状态文本" } ], "SqlCondition": { @@ -237,7 +168,7 @@ "NullFormulaValueQueryPolicy": 0, "TopCount": "1" }, - "ID": "0d9ae2153be64cb98c234c175b166743" + "ID": "3b8850e5b77640ff80ac3afe2028fda2" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -300,7 +231,10 @@ }, "ReturnPropertiesTo": [ { - "ResultPropertyName": "提交工时" + "ResultPropertyName": "提交工时", + "ResultTo": { + "SerializeProperty": "提交工时" + } }, { "ResultPropertyName": "核定工时", @@ -333,7 +267,10 @@ } }, { - "ResultPropertyName": "核定工时说明" + "ResultPropertyName": "核定工时说明", + "ResultTo": { + "SerializeProperty": "工时核定说明" + } } ], "RefreshAfterFinish": true, @@ -362,7 +299,7 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=DATEDIF(开始日期,结束日期,\"d\")+1" }, - "ID": "6c71d95a7c3b4623870467ca0311eb97" + "ID": "9e168dd0c268433e9bcc733a6477cf2e" }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", @@ -371,7 +308,7 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=核定工时" }, - "ID": "b42dac8b18d84c598f870fe2f9ae199d" + "ID": "c1be037a352d4956b4a3e8ec240b20fe" }, { "$type": "Forguncy.Model.ServerTransactionCommand, ServerDesignerCommon", @@ -395,7 +332,7 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=开始日期+(index-1)" }, - "ID": "f7725b3448fe402eb5bc32aaa4d6b224" + "ID": "e3a8e9da07c247d2bf471c00cdd5dac9" }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", @@ -405,7 +342,7 @@ "TableValueType": 1, "BindingInfos": [ { - "GUID": "a7a1a922-a3ad-49f7-93dc-b86b73212252", + "GUID": "77edb895-c01f-4f57-9d1b-ebd22738e87a", "BindingInfo": { "TableName": "View_任务工时统计", "ColumnName": "总计划工时", @@ -414,7 +351,7 @@ "ColumnName": "总计划工时" }, { - "GUID": "f2f3a120-2e1f-4b4c-aea8-bf34d3bdaef9", + "GUID": "f84fce9c-f3ff-449d-825e-eb0da9a68372", "BindingInfo": { "TableName": "View_任务工时统计", "ColumnName": "总实际工时", @@ -465,7 +402,7 @@ ] } }, - "ID": "1be412269af54be3bd653f7be7590390" + "ID": "11c2430cef2041938ec503c42a76bf4f" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -494,10 +431,10 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=ROUNDUP(核定工时/分配天数,1)" }, - "ID": "ca981e56b58e4a889cce1e811fc89764" + "ID": "cff28432d5014558ac644801dc83bcd4" } ], - "ID": "32da7772-2352-4727-a743-12e932b048f6" + "ID": "2314f0bf-605f-4995-9ad9-bfa5472c8bd8" }, { "CommandList": [ @@ -508,10 +445,10 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=ROUNDUP(待分配工时,1)" }, - "ID": "5e88c98d260e4a2bacdc4d385f1855f1" + "ID": "51d76eb5504747bea615fccffb11a13d" } ], - "ID": "d3887aec-b6e0-4e95-a04d-3a465aacf5b8" + "ID": "17de5519-67a1-4f83-9cb1-449b7ad3bc88" } ] }, @@ -520,16 +457,34 @@ "ConditionAndCommandPairList": [ { "Condition": { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", - "ParamObject": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=统计工时.总实际工时+计算本次分配工时" + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=统计工时.总实际工时+计算本次分配工时" + } + }, + "value": "24", + "compareType": 5 + }, + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务信息.严格模式" + } + }, + "value": "1", + "compareType": 1 } - }, - "value": "24", - "compareType": 5 + ], + "RelationType": 1 }, "CommandList": [ { @@ -537,15 +492,31 @@ "ConditionAndCommandPairList": [ { "Condition": { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", - "ParamObject": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务信息.工时分配方式" + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务信息.严格模式" + } + }, + "value": "1" + }, + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务信息.工时分配方式" + } + }, + "value": "2" } - }, - "value": "2" + ] }, "CommandList": [ { @@ -555,11 +526,11 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=IF(计算本次分配工时>(个人工时情况.总计划工时-个人工时情况.总实际工时),(个人工时情况.总计划工时-个人工时情况.总实际工时),计算本次分配工时)" }, - "ID": "01501a2b7fbf48c5a85ab2382177039b" + "ID": "82d3168ea8de46269eb8cb8d04263bc9" } ], "Comments": "如果是按天分配，则需要检测这一天的实际工时是否超出，", - "ID": "8e22e0b4-8ce1-4d2e-b400-a1d79b02f195" + "ID": "8e1f5f08-5161-44f0-8b85-769226d15d7e" }, { "CommandList": [ @@ -570,10 +541,10 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=计算本次分配工时" }, - "ID": "9f4c8206193a47cfa79333c2dbb3d2a7" + "ID": "3b52a13937d84916b9d9d54635e2270c" } ], - "ID": "305e1798-58b1-4155-84a6-9c87d15b4c0c" + "ID": "01636c53-f2ca-4c1a-9cde-44a709781fef" } ] }, @@ -587,7 +558,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "项目ID", - "GUID": "ef3e72ab-2719-4a4b-9c5e-1022779f94c4" + "GUID": "b769367b-ed5b-431e-b215-c1deeac30f51" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -598,7 +569,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "任务ID", - "GUID": "2f0b6f3e-8c93-4d60-97ad-10162af5559f" + "GUID": "dec98623-67dd-4c81-a24e-2f15d7c2614c" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -609,7 +580,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "工时日期", - "GUID": "6998850f-50af-4735-9060-f75e9024c849" + "GUID": "e72f9c26-62b4-46de-8fa1-c4ee0a7ebf29" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -620,7 +591,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "工时类型", - "GUID": "182162e5-f28d-4b1c-b373-8920f4f22a43" + "GUID": "5af4b16e-fe30-495e-999d-9bf946ac7749" }, "Value": "实际" }, @@ -628,7 +599,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "执行人", - "GUID": "d4cd13c5-cfd1-4a21-a983-e46b993cfb87" + "GUID": "f32490b1-8e5d-4595-b960-baa6887370d5" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -639,7 +610,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "执行内容", - "GUID": "26d85a47-4c9a-4c76-b000-0fa84620efca" + "GUID": "8efab63a-5684-4be7-9daf-53ba1629eac8" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -650,7 +621,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "工时", - "GUID": "39c63dac-4155-4f4e-80e7-d5461dd5ff95" + "GUID": "12be422a-6063-40fc-a875-f8e01c176a33" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -661,7 +632,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "上报工时", - "GUID": "c6884584-fd8e-4fe8-8078-8b8c82c08754" + "GUID": "cb8cb8d8-d865-493b-91b7-5cf4c4167d5d" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -672,7 +643,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "时薪单价", - "GUID": "40e5c2e0-ff4d-4d0f-a8ca-bc85923ac8d4" + "GUID": "ba1bf86e-ef9d-4bd4-9a93-c96f83850200" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -683,7 +654,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "提成系数", - "GUID": "61b2b2ef-6a68-4c91-baa0-190818f161dd" + "GUID": "0c691d92-25a7-4381-a6d8-e85f04ee0041" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -694,7 +665,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "时薪来源", - "GUID": "2f57acba-81cd-466c-b67d-f5c1900d5427" + "GUID": "dfc2ba05-a453-404a-9872-267524c707fa" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -710,10 +681,10 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=ROUNDUP(待分配工时-计算本次分配工时,1)" }, - "ID": "d9e13b85ae5640d5972aeb4ea3180a34" + "ID": "1109a11b52d24ce892de81be12b029ce" } ], - "ID": "de26dda8-6dfa-4256-be45-54fa0959b0c1" + "ID": "2ee034e5-adfe-4ea5-a165-1006467aa11c" }, { "CommandList": [ @@ -726,7 +697,7 @@ } } ], - "ID": "1ec64c0b-7d1e-460c-83c6-afd589a81356" + "ID": "65a446c2-48a7-469a-bf05-4e01cd229bd4" } ] } @@ -742,7 +713,7 @@ "BindingInfo": { "TableName": "项目动态", "ColumnName": "项目ID", - "GUID": "d56ef504-b228-4a69-8150-9aa4ca29702d" + "GUID": "dd6b9c66-2ace-4db3-829f-d2fccfd5de44" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -753,7 +724,7 @@ "BindingInfo": { "TableName": "项目动态", "ColumnName": "项目动态", - "GUID": "c1d71456-ff2c-49cc-8865-c5c6e33d4c91" + "GUID": "4716c534-e2b0-46a3-91f1-7f6c0c2e2776" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -764,7 +735,7 @@ "BindingInfo": { "TableName": "项目动态", "ColumnName": "执行人", - "GUID": "a37c71d3-42b6-4cd0-8b66-73fd55c2ffb5" + "GUID": "db952fe7-2f9e-4ac5-9b95-f8c332427640" }, "Value": "%CurrentUser%" } @@ -778,7 +749,7 @@ "Message": "报工成功" } ], - "ID": "9608b992-43bb-4946-974c-1e27fe2262fe" + "ID": "a0f122c7-49b1-4d3d-b7b4-a93bd2f38872" }, { "CommandList": [ @@ -794,12 +765,12 @@ } } ], - "ID": "096a36f8-a45c-422d-9d85-23f79628f686" + "ID": "175ccd6e-ff57-4f9a-ab7e-a949afe20f49" } ] } ], - "ID": "e4daf810-27cd-4975-8afa-4e05f4809c5c" + "ID": "53d9c708-8fdd-409d-b551-a0306f4d4e3d" }, { "CommandList": [ @@ -812,7 +783,7 @@ } } ], - "ID": "9006973d-7417-42af-b4be-a0e20783258e" + "ID": "dd27d16b-7644-44b7-b966-37d14a2cf317" } ] } diff --git a/ServerCommands/工时/分配任务工时.json b/ServerCommands/工时/分配任务工时.json index b4aab05e..0f77f2fa 100644 --- a/ServerCommands/工时/分配任务工时.json +++ b/ServerCommands/工时/分配任务工时.json @@ -76,7 +76,7 @@ "TableValueType": 1, "BindingInfos": [ { - "GUID": "38530c9c-55ce-4b58-aeb6-41fd0cd410ca", + "GUID": "d70fbe4e-6b17-426f-814a-ca333b61e544", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "项目ID", @@ -85,7 +85,7 @@ "ColumnName": "项目ID" }, { - "GUID": "75a0c7ab-3df4-41d5-9d5c-3c76c7faf0e4", + "GUID": "3af3de5a-0e95-4e4e-8b88-5acd176de61f", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "任务名称", @@ -94,16 +94,7 @@ "ColumnName": "任务名称" }, { - "GUID": "9bc18e2f-094e-4c66-b126-11d2ed71e566", - "BindingInfo": { - "TableName": "任务平行视图", - "ColumnName": "任务预算工时", - "GUID": "8520efd4-9787-45fb-9ff8-62d895ac5d91" - }, - "ColumnName": "任务预算工时" - }, - { - "GUID": "9f12fb1e-573e-4f5e-8390-60aa0e2d7bd7", + "GUID": "215fef37-f138-47fc-89a8-df8782920810", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "任务状态", @@ -112,7 +103,7 @@ "ColumnName": "任务状态" }, { - "GUID": "bd611fd0-85d4-40d2-94c1-e18624451231", + "GUID": "83d114d4-8d25-4d00-8d8f-7aa1d22fba08", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "任务状态", @@ -126,7 +117,7 @@ "ColumnName": "任务状态文本" }, { - "GUID": "8dc3ccf2-e6f7-4ba3-9431-e2f8061fdc5f", + "GUID": "4a5b48e7-bb1f-4726-8e21-ceaaa11f2022", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "项目ID", @@ -140,35 +131,7 @@ "ColumnName": "严格模式" }, { - "GUID": "867a17b9-b513-4a95-b51a-3d54fefeff42", - "BindingInfo": { - "TableName": "任务平行视图", - "ColumnName": "项目ID", - "GUID": "65e3a033-3a0b-4c52-901a-9618d6a0e040", - "RelationBinding": { - "RelatedTable": "项目平行视图", - "RelatedColumn": "ID", - "DisplayColumn": "项目预算工时" - } - }, - "ColumnName": "项目预算工时" - }, - { - "GUID": "a6c64613-6b4c-48e2-b5f6-8dbf4dfcd97f", - "BindingInfo": { - "TableName": "任务平行视图", - "ColumnName": "项目ID", - "GUID": "c3d0bc58-22c8-42ad-82f4-10d13ecb7b7a", - "RelationBinding": { - "RelatedTable": "项目平行视图", - "RelatedColumn": "ID", - "DisplayColumn": "项目预算费用" - } - }, - "ColumnName": "项目预算费用" - }, - { - "GUID": "c0a645c0-4604-4fa9-b081-1152376d75cf", + "GUID": "2a8af634-7280-46a3-8f3a-f1837b6401e5", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "任务类型", @@ -182,7 +145,7 @@ "ColumnName": "提成系数" }, { - "GUID": "3909f85c-a724-46ce-b341-b75f2c5d9352", + "GUID": "3c6b7687-5711-448e-b490-9aabb156e498", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "项目ID", @@ -196,7 +159,7 @@ "ColumnName": "工时分配方式" }, { - "GUID": "73bd10b2-6cbb-4c92-93a0-ed1db85cf781", + "GUID": "f7fbe8b6-9f82-43b5-8ec8-52205a2152f9", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "开始时间", @@ -205,7 +168,7 @@ "ColumnName": "开始时间" }, { - "GUID": "ecf738aa-2e2d-4b4e-9a0a-52b60bcf8d7e", + "GUID": "3bb8328a-b934-488d-a1bd-805072bf2328", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "任务负责人", @@ -214,22 +177,13 @@ "ColumnName": "执行者" }, { - "GUID": "a87c068d-26b1-44c8-8b58-5514df5a139a", + "GUID": "5adaea42-50c9-4b24-94cf-daa981707cf0", "BindingInfo": { "TableName": "任务平行视图", - "ColumnName": "成员计划工时", - "GUID": "f355236f-a6cc-49a5-8ce3-a184a4a90b78" + "ColumnName": "可分配工时", + "GUID": "6054feca-ba74-4e7f-989e-c9a201859a2e" }, - "ColumnName": "总计划工时" - }, - { - "GUID": "23318a88-ce48-4abb-afe9-9b6f2914b87b", - "BindingInfo": { - "TableName": "任务平行视图", - "ColumnName": "成员实际工时", - "GUID": "85ccdc21-2211-4e56-914f-90445409db03" - }, - "ColumnName": "总实际工时" + "ColumnName": "可分配工时" } ], "SqlCondition": { @@ -247,7 +201,7 @@ "NullFormulaValueQueryPolicy": 0, "TopCount": "1" }, - "ID": "05d2877d0b384aa5b7afc3b3f2225489" + "ID": "04187475662c442396affecd4e52794f" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -271,39 +225,19 @@ "ConditionAndCommandPairList": [ { "Condition": { - "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", - "SubConditions": [ - { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", - "ParamObject": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=工时数" - } - }, - "value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务信息.任务预算工时" - }, - "compareType": 4 - }, - { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", - "ParamObject": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=工时数" - } - }, - "value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务信息.任务预算工时-任务信息.总计划工时" - }, - "compareType": 4 + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=工时数" } - ] + }, + "value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务信息.可分配工时" + }, + "compareType": 4 }, "CommandList": [ { @@ -314,7 +248,7 @@ "TableValueType": 1, "BindingInfos": [ { - "GUID": "8dc569c6-5d7d-435c-9e25-9384593acfdd", + "GUID": "ee221b91-2992-463b-9493-acc5b7663f33", "BindingInfo": { "TableName": "项目成员表", "ColumnName": "ID", @@ -323,7 +257,7 @@ "ColumnName": "ID" }, { - "GUID": "900d917f-11e0-42c7-8ce2-44783dea1cb6", + "GUID": "c1732deb-776f-49d7-8563-7d9058f5b468", "BindingInfo": { "TableName": "项目成员表", "ColumnName": "项目成员", @@ -332,7 +266,7 @@ "ColumnName": "项目成员" }, { - "GUID": "a22fbeeb-ea30-4420-b3c1-c4a7f7600491", + "GUID": "bfa78a83-ddf3-4e65-8bc8-47f34976a30e", "BindingInfo": { "TableName": "项目成员表", "ColumnName": "默认时薪", @@ -341,7 +275,7 @@ "ColumnName": "成员时薪" }, { - "GUID": "35ccd89d-5316-4952-88cf-42403f181492", + "GUID": "45ac5922-6553-416d-9fa5-456c90450ff7", "BindingInfo": { "TableName": "项目成员表", "ColumnName": "岗位ID", @@ -355,7 +289,7 @@ "ColumnName": "岗位时薪" }, { - "GUID": "b55c41c6-2f85-474b-b253-f5a5fcc733f5", + "GUID": "bf119452-c85b-4e1e-b6bc-8caa94231883", "BindingInfo": { "TableName": "项目成员表", "ColumnName": "项目成员", @@ -369,7 +303,7 @@ "ColumnName": "用户时薪" }, { - "GUID": "0ff49b9c-2d0d-45db-92a1-25bc5c083363", + "GUID": "7fcdba55-5874-49c8-af9d-5bba537ebbf5", "BindingInfo": { "TableName": "项目成员表", "ColumnName": "项目成员", @@ -415,7 +349,7 @@ "NullFormulaValueQueryPolicy": 0, "TopCount": "1" }, - "ID": "1ce0f23ab033498c9e4cf43fef25e86d" + "ID": "2c47908cb40649a4b37a29783b09b61b" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -441,7 +375,7 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=任务信息.提成系数" }, - "ID": "58c7218ea48d4bf088891cc7a0af834a" + "ID": "cf9f329698f54d8e9b353d2f024fd2de" }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", @@ -480,7 +414,7 @@ }, "NullFormulaValueQueryPolicy": 0 }, - "ID": "85f05fa8d3b844e9afb58b9ac148bf1a" + "ID": "94021ae43c984221ba0c00ffdd38ae06" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -508,7 +442,7 @@ "BindingInfo": { "TableName": "任务成员表", "ColumnName": "项目ID", - "GUID": "754d8031-358c-4e31-b85c-a32646177485" + "GUID": "46dbbe16-5e29-4001-848b-9cde33e91cfd" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -519,7 +453,7 @@ "BindingInfo": { "TableName": "任务成员表", "ColumnName": "任务ID", - "GUID": "9e181156-cf0c-4f43-afd6-a9b9e1bf6a24" + "GUID": "bff7cde1-d988-4f23-9830-f719f199a6b3" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -530,7 +464,7 @@ "BindingInfo": { "TableName": "任务成员表", "ColumnName": "任务成员", - "GUID": "d674cbcf-a85a-4265-820f-d8b4645be281" + "GUID": "80d935fe-3363-4157-bfb4-4bd12910115f" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -541,7 +475,7 @@ "ParamNameToSaveNewRowValue": "" } ], - "ID": "f8e075eb-d389-4c05-9d02-adb7467c1fd2" + "ID": "31d7ecc8-104d-48fc-96e8-4df28627f256" } ] }, @@ -584,7 +518,7 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=TODAY()" }, - "ID": "b001c8aa74dd4f8382a375f3912a62da" + "ID": "c784c1c888af40a18ac06d86dd9aa3c1" }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", @@ -593,10 +527,10 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=TODAY()" }, - "ID": "91295edff0c44f608a14d5c9f9594f3e" + "ID": "f1babee3af9a4401b69d66a5728facf3" } ], - "ID": "332b9caa-2069-4b23-ad1a-41a9d4840a14" + "ID": "5a43c6fd-9734-49aa-9002-a256e7d7f7ed" }, { "Condition": { @@ -618,7 +552,7 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=开始日期" }, - "ID": "234119e808564ed7acaf62c2c6b38398" + "ID": "f23c325e19c74deaac8b0bd00de7bb0c" }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", @@ -627,10 +561,10 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=结束日期" }, - "ID": "727f49edcb914303adf91ed9a40e4355" + "ID": "d184eff4cba7445a955fa8144ebd3951" } ], - "ID": "8620cd87-3273-476a-8635-dfed055b4715" + "ID": "cec86543-c168-4c2e-81a8-3769b332781c" } ], "Comments": "如果是按人分配，则把计划工时分到一天中" @@ -642,7 +576,7 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=工时数" }, - "ID": "e384d36ab63b4ebd80ab9bb4d389c9d6" + "ID": "d0c562049a03431f8bd7b16dc05571a8" }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", @@ -651,7 +585,7 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=DATEDIF(开始日期,结束日期,\"d\")+1" }, - "ID": "4fb6ad850e174b6a85aded16a0b82e91" + "ID": "e885f0713e4446d59779d8102dfa7ca5" }, { "$type": "Forguncy.Model.ServerTransactionCommand, ServerDesignerCommon", @@ -675,7 +609,7 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=开始日期+(index-1)" }, - "ID": "f631633dde2d48c39491e29455a3fb28" + "ID": "89d195a8f1f34d1ba004d79dc714d5ab" }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", @@ -685,7 +619,7 @@ "TableValueType": 1, "BindingInfos": [ { - "GUID": "b2045f09-df40-4815-8068-2112ed5d1925", + "GUID": "4ae72769-fd2f-4b8c-9ca5-cd1bb5f84b30", "BindingInfo": { "TableName": "任务工时表", "ColumnName": "总工时", @@ -734,7 +668,7 @@ }, "NullFormulaValueQueryPolicy": 0 }, - "ID": "b17117425ffb4ebe8fb149578b3d52df" + "ID": "7e69c5b18dbc4befa21da00cc4b1487f" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -763,10 +697,10 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=ROUNDUP(工时数/分配天数,1)" }, - "ID": "622dd1eb09094e29b7b7201423479597" + "ID": "954da7d900d44d068c49c0775cbb66ad" } ], - "ID": "da2889e3-da14-4e63-a66e-c250ddb7d809" + "ID": "79688b2f-93a6-42bf-b9e9-6cdd65d33e7d" }, { "CommandList": [ @@ -777,10 +711,10 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=ROUNDUP(待分配工时,1)" }, - "ID": "22bbafd761814075a115c7c935a993c0" + "ID": "bd03cd955f4449cf9d84c422471b58ac" } ], - "ID": "578e7635-09da-41e0-bcb8-fa9836f23531" + "ID": "c81b405e-c3a5-4733-8918-ac465fe4d0a8" } ] }, @@ -791,7 +725,7 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=IF(统计工时.总工时=\"\",0,统计工时.总工时)+计算本次分配工时" }, - "ID": "02c134ab677047ef9f05766105a85c57" + "ID": "cdea7fa17c4a44c5ba0ae697ab76f6e5" }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", @@ -800,7 +734,7 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=IF(OR(项目成员.成员负荷=\"\",项目成员.成员负荷=0,项目成员.成员负荷>24),24,项目成员.成员负荷)" }, - "ID": "eb8fa08ae96c4c81bace7556eeea279b" + "ID": "5af95d7b590044bd919ee967c7ce6ae3" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -846,7 +780,7 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=ROUNDUP(待分配工时-计算本次分配工时,1)" }, - "ID": "7ac0d2f1abf7464682eb5962f48e2868" + "ID": "8762d3868c56480ebf590a29716e9f32" }, { "$type": "Forguncy.Model.ServerTransactionCommand, ServerDesignerCommon", @@ -861,7 +795,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "项目ID", - "GUID": "bf8f469d-4b9b-4904-bacf-1496956bda22" + "GUID": "ca5a3d90-f76a-4612-a67a-7c2bf36c3aa6" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -872,7 +806,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "任务ID", - "GUID": "518a4412-a28d-4938-a3cb-6099930a0b6f" + "GUID": "019b582a-4594-409d-b829-edf35f98b6e4" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -883,7 +817,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "工时日期", - "GUID": "ad1c8f81-00b1-4c33-b49c-8a43c27b1fc8" + "GUID": "f22bd597-15b2-4d6d-97d9-e170e3aa5b0b" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -894,7 +828,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "工时类型", - "GUID": "3adc128c-6b4f-4636-aaec-5e69f3ffb08d" + "GUID": "91caa3f1-8ae3-4f93-88ae-9fca29adafc1" }, "Value": "计划" }, @@ -902,7 +836,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "执行人", - "GUID": "78a763a5-332c-4cd7-86e6-bb1fbed3e553" + "GUID": "c578c59d-5fa9-4424-8c61-f1230195ea85" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -913,7 +847,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "执行内容", - "GUID": "8fcd4935-3c9d-49ca-aa1d-6de6ae29d21a" + "GUID": "98b6d94b-9796-4c91-8ca4-4245ff59587b" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -924,7 +858,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "工时", - "GUID": "b74e9a17-2d24-4156-88b7-eb2f41f00ced" + "GUID": "a6b55b11-0242-4631-8bcf-7922ab6bce46" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -935,7 +869,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "时薪单价", - "GUID": "48b863e9-ca60-4d29-a23d-de37e0b00c08" + "GUID": "9635331d-aeae-43e3-a89b-c34570f6058c" }, "Value": "0" }, @@ -943,7 +877,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "提成系数", - "GUID": "2f756808-6964-4e0b-9ecf-262337984419" + "GUID": "f2cee9cd-2d00-40d0-970b-c94c90ea9415" }, "Value": "0" }, @@ -951,7 +885,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "时薪来源", - "GUID": "09a998b1-3b57-4d29-ae08-58e215b1502d" + "GUID": "e53d2e82-3206-4faa-8aec-b464aa95a62b" } } ] @@ -966,7 +900,7 @@ "BindingInfo": { "TableName": "项目动态", "ColumnName": "项目ID", - "GUID": "dbda7c11-89e3-46b3-9878-6542c1573be8" + "GUID": "db36359f-e763-408e-a6ea-83c3e530edb1" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -977,7 +911,7 @@ "BindingInfo": { "TableName": "项目动态", "ColumnName": "项目动态", - "GUID": "85746779-19f7-4a95-9e17-c874ad036526" + "GUID": "ee984db3-7339-4498-aa0a-e0f891fe3888" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -988,7 +922,7 @@ "BindingInfo": { "TableName": "项目动态", "ColumnName": "执行人", - "GUID": "9310fd02-1c73-480f-b38d-ec60a02a6964" + "GUID": "34733e1c-c4d9-4f27-8669-097ae7ef3e15" }, "Value": "%CurrentUser%" } @@ -998,7 +932,7 @@ } ], "Comments": "如果不是按人分配，且分配后的工时超过负荷，则报错", - "ID": "ae4f8c95-9b35-45e1-830d-ce0c525eb6d7" + "ID": "eafc2770-e4d5-4169-b5f5-ff14fa5f7f41" }, { "CommandList": [ @@ -1011,7 +945,7 @@ } } ], - "ID": "3d372284-136c-4c92-abc2-5561242c303a" + "ID": "b36283f4-76f4-4a4e-84fe-4999b8ed82ee" } ] } @@ -1025,7 +959,7 @@ "Message": "分配计划工时成功" } ], - "ID": "04a63f83-c351-40a2-841a-5b8f14d5e783" + "ID": "789c1dbc-6599-4582-8242-e2c39e6d10c5" }, { "CommandList": [ @@ -1038,12 +972,12 @@ } } ], - "ID": "402ab5e2-b6c8-465f-93e7-dbf0d4e52ee5" + "ID": "4fda4e38-33d6-4718-ac39-5cb8948b633f" } ] } ], - "ID": "63bb8572-4f70-41c3-b2a3-7edd8736d4e5" + "ID": "72d12494-04ee-4c3d-8dd3-4318c75f9144" }, { "CommandList": [ @@ -1053,13 +987,13 @@ "Message": "该用户不是项目成员" } ], - "ID": "4158fbd4-5c6a-4ba8-9f82-ebf5e096c543" + "ID": "45d5ac8d-19fe-4399-9de8-f7a875a732d5" } ], "Comments": "如果任务成员中没有，则自动加一个" } ], - "ID": "ca047f4b-b6e4-4fb8-b7a2-80f8b518f08f" + "ID": "8edb92cd-bfb1-49c3-a1b8-66936a463200" }, { "CommandList": [ @@ -1069,12 +1003,12 @@ "Message": "您提交的工时超过任务预算工时，请修改后重新提交" } ], - "ID": "1d9ed9f0-3590-43b7-b42f-b1573d9212ba" + "ID": "d782d30a-c268-4d2a-a437-2e3d97fe30fb" } ] } ], - "ID": "c0d0927b-98c4-4224-a3fa-38651c5b9c3f" + "ID": "7c9540a9-b064-436f-815e-93c653252939" }, { "CommandList": [ @@ -1084,7 +1018,7 @@ "Message": "任务不存在" } ], - "ID": "d3f6e687-6364-4e9d-b9aa-287ee721db7d" + "ID": "6d828dea-09c2-477b-9c7f-964aefd974e2" } ] } diff --git a/ServerCommands/工时/计算报工数据.json b/ServerCommands/工时/计算报工数据.json index 4edc2dd1..23b65a24 100644 --- a/ServerCommands/工时/计算报工数据.json +++ b/ServerCommands/工时/计算报工数据.json @@ -61,7 +61,7 @@ "TableValueType": 1, "BindingInfos": [ { - "GUID": "39dab506-e2ad-412b-9975-9de2594ff0c5", + "GUID": "95889f2c-407e-4b58-b8eb-c7eb5e879a4a", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "项目ID", @@ -70,7 +70,7 @@ "ColumnName": "项目ID" }, { - "GUID": "0bf5e3d4-b8b3-48de-af22-cd832c4b4483", + "GUID": "e0600daa-fd38-4fc7-8c8a-92aaef9e1b9f", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "任务名称", @@ -79,16 +79,16 @@ "ColumnName": "任务名称" }, { - "GUID": "e31a79b4-5df6-4605-bf94-041384467291", + "GUID": "d185e6d0-6604-4e8f-88d8-fe95df8c0090", "BindingInfo": { "TableName": "任务平行视图", - "ColumnName": "任务预算工时", - "GUID": "9eadb3da-071f-490d-9a93-52bd6ab236c9" + "ColumnName": "总分配工时", + "GUID": "5bd82d2d-ef35-4d87-8acf-e4db9c4caadf" }, - "ColumnName": "任务预算工时" + "ColumnName": "总分配工时" }, { - "GUID": "a86844a7-eaa6-40df-bf96-e4e505bd9a5b", + "GUID": "6299fa5a-b50c-4983-809a-91031142323d", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "任务状态", @@ -97,7 +97,7 @@ "ColumnName": "任务状态" }, { - "GUID": "fa19a3b2-6f1b-4d06-b704-a21bc83a679c", + "GUID": "8859a2de-a0a8-4942-a71a-f84f39f00ed7", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "任务状态", @@ -111,7 +111,7 @@ "ColumnName": "任务状态文本" }, { - "GUID": "3e739d34-6043-4507-a64a-bfd99fdf804c", + "GUID": "fbde045a-4658-4f0c-bb28-88983a027ac6", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "项目ID", @@ -125,7 +125,7 @@ "ColumnName": "严格模式" }, { - "GUID": "8a5fde98-bfd2-49ec-a770-a31211258766", + "GUID": "9738956e-9050-4887-b7e4-d43affe5272a", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "项目ID", @@ -139,7 +139,7 @@ "ColumnName": "项目预算工时" }, { - "GUID": "b00b7fc4-00f6-467b-9475-2d387b010d54", + "GUID": "0985789f-7c08-4439-bd60-0d6fe7176ab1", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "项目ID", @@ -153,7 +153,7 @@ "ColumnName": "项目预算费用" }, { - "GUID": "c318a143-56b7-4628-b82c-467f4f506d43", + "GUID": "cf077cde-0ae7-4440-bea0-cb8ff50b84a5", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "项目ID", @@ -167,7 +167,7 @@ "ColumnName": "工时分配方式" }, { - "GUID": "0a1b96c1-f955-4ce8-ae6d-3d1ce15d3ad3", + "GUID": "9dcdca43-2581-46cb-acf6-6b0f622e5e5c", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "任务类型", @@ -181,22 +181,13 @@ "ColumnName": "提成系数" }, { - "GUID": "797a4cf1-880a-4657-bd17-166491e52aa6", + "GUID": "201eb364-2514-4e50-bc54-a1d95b922927", "BindingInfo": { "TableName": "任务平行视图", - "ColumnName": "成员计划工时", - "GUID": "9b9f88c0-c367-46c7-948c-5b43579844d0" + "ColumnName": "可分配工时", + "GUID": "009ee24a-cbef-4445-a1c5-143dd462d4c3" }, - "ColumnName": "总计划工时" - }, - { - "GUID": "77eb05f5-194d-42b2-8ed0-24fe75365b7b", - "BindingInfo": { - "TableName": "任务平行视图", - "ColumnName": "成员实际工时", - "GUID": "980d85ec-3b78-448b-b4de-3987fd4e4f28" - }, - "ColumnName": "总实际工时" + "ColumnName": "可分配工时" } ], "SqlCondition": { @@ -214,7 +205,7 @@ "NullFormulaValueQueryPolicy": 0, "TopCount": "1" }, - "ID": "9f98969e7d3c42dc958ba4881eba224b" + "ID": "6d034ee5d87f4991aafb8e5dc0b7e9c9" }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", @@ -224,7 +215,7 @@ "TableValueType": 1, "BindingInfos": [ { - "GUID": "95107486-9b29-4c73-8f89-62be80d0240d", + "GUID": "a5be516e-8331-4006-88c0-c5e22f067f4e", "BindingInfo": { "TableName": "任务成员视图", "ColumnName": "任务成员", @@ -233,7 +224,7 @@ "ColumnName": "参与人" }, { - "GUID": "6723495f-8637-4d58-bdb2-649aa4fb1d93", + "GUID": "c8fc8a28-48eb-4f48-b2a5-61025f73e102", "BindingInfo": { "TableName": "任务成员视图", "ColumnName": "任务成员", @@ -246,7 +237,7 @@ "ColumnName": "参与人_全名" }, { - "GUID": "27eded30-6e46-43a3-865e-519f92fcb92f", + "GUID": "76651da6-ade4-4ebe-a8e0-1011fe218cfc", "BindingInfo": { "TableName": "任务成员视图", "ColumnName": "任务成员", @@ -260,7 +251,7 @@ "ColumnName": "参与人负荷" }, { - "GUID": "655461f1-c357-428f-990d-5cbb79baf4ed", + "GUID": "b9a92701-8211-4ec9-9202-50162854ee19", "BindingInfo": { "TableName": "任务成员视图", "ColumnName": "默认时薪", @@ -269,7 +260,7 @@ "ColumnName": "成员时薪" }, { - "GUID": "8d8eef54-67cd-4ecd-beac-5635c6f5134e", + "GUID": "372d652b-8dcc-4061-ac4d-e286baeaafaa", "BindingInfo": { "TableName": "任务成员视图", "ColumnName": "岗位ID", @@ -283,7 +274,7 @@ "ColumnName": "岗位时薪" }, { - "GUID": "3ccae4c3-7547-4909-8821-4bacc610fa9b", + "GUID": "c1eae37d-9de2-4f8d-ad1d-0f221210eddc", "BindingInfo": { "TableName": "任务成员视图", "ColumnName": "任务成员", @@ -329,7 +320,7 @@ "NullFormulaValueQueryPolicy": 0, "TopCount": "1" }, - "ID": "29b01c80875b4c53b56afeb8829c0df6" + "ID": "caac35624fd348c88813516f23ecd04d" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -352,72 +343,7 @@ "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", "ParameterName": "核定工时说明", "ParameterValue": "按正常核定", - "ID": "b16e7b987bb04c70a410df753fbeee20" - }, - { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "项目成员", - "TableValue": { - "TableName": "项目成员表", - "TableValueType": 1, - "BindingInfos": [ - { - "GUID": "81cfbfdb-2497-4c80-8969-4d3a0e6a8e74", - "BindingInfo": { - "TableName": "项目成员表", - "ColumnName": "岗位ID", - "GUID": "e72fecb8-c4b6-4ef0-a802-f18cb6d6ba24", - "RelationBinding": { - "RelatedTable": "项目岗位", - "RelatedColumn": "ID", - "DisplayColumn": "默认时薪" - } - }, - "ColumnName": "项目岗位时薪" - }, - { - "GUID": "906b9a8e-10ce-4c3c-9d1b-55de074e0938", - "BindingInfo": { - "TableName": "项目成员表", - "ColumnName": "默认时薪", - "GUID": "90991267-4d34-4537-8be3-0ef990118f3e" - }, - "ColumnName": "项目成员时薪" - } - ], - "SqlCondition": { - "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", - "SubConditions": [ - { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "项目成员表", - "ColumnName": "项目ID", - "GUID": "25c7933c-8b27-4163-ad03-a22d7efe88fb" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务信息.项目ID" - } - }, - { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "项目成员表", - "ColumnName": "项目成员", - "GUID": "02b01205-9bbb-4e4f-8534-f52ea963c907" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=执行人" - } - } - ] - }, - "NullFormulaValueQueryPolicy": 0, - "TopCount": "1" - }, - "ID": "17f1d03afb8745f49c7c4bb15b1cb482" + "ID": "25360003dd544c19b8e90209180aa4ee" }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", @@ -426,7 +352,7 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=任务信息.提成系数" }, - "ID": "7edb658f76be4a2aafd12f785ba10d11" + "ID": "199c55eec5134d38bbab871c06c3d4df" }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", @@ -435,7 +361,7 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=工时数" }, - "ID": "ef1b4fe8bc0048d880ef5985f778eebe" + "ID": "513208670e2048768df441f7e683b0e1" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -477,17 +403,17 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=任务成员.成员时薪" }, - "ID": "c33d7341c73745a9ad4d94f64bc0a06c" + "ID": "e239398731d64f5ab4487f359a7b68d2" }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", "ParameterName": "时薪计算来源", "ParameterValue": "成员时薪", - "ID": "fbfb1d421b85425d8db5b6b2bac8aed1" + "ID": "3495ffc5934e49b3811032b982d3be49" } ], "Comments": "项目成员设置的时薪", - "ID": "46c598ab-4477-4e2a-b2a0-35359b41127d" + "ID": "62dc3fdd-5786-40be-a3f1-43e706f15e9a" }, { "Condition": { @@ -510,17 +436,17 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=任务成员.岗位时薪" }, - "ID": "24e1b15423514fa898c3e849e6641a3e" + "ID": "1c99efd220cc49e49849137de836e5b0" }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", "ParameterName": "时薪计算来源", "ParameterValue": "项目岗位时薪", - "ID": "621753f632544315879bf59e65625f4e" + "ID": "e274eb97ae084105b74b649d06290524" } ], "Comments": "项目岗位设置的时薪", - "ID": "1d2c0e6a-69a1-475e-91cb-e6202a7e80f5" + "ID": "e73280c2-9a0a-4365-9288-184feaecbf5d" }, { "Condition": { @@ -543,17 +469,17 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=任务成员.用户时薪" }, - "ID": "ae5b39531d3b4679acfe463b62dd8cac" + "ID": "ae993cad96d24c45959b377a9573f78d" }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", "ParameterName": "时薪计算来源", "ParameterValue": "用户默认时薪", - "ID": "eb64126e247b4986831480c66ca84918" + "ID": "f058c2d1ef7d45dbaf239b859a434b76" } ], "Comments": "成员用户的默认时薪", - "ID": "2d070011-4179-409d-b9b1-2cead8e93f68" + "ID": "9bfa3901-4bf0-42b0-a497-236460fd6397" }, { "CommandList": [ @@ -561,22 +487,22 @@ "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", "ParameterName": "计算时薪", "ParameterValue": "0", - "ID": "671f14a1ad5949f7afcfc30d28fc477e" + "ID": "7cb8676765614a4b913a540495f8dc63" }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", "ParameterName": "时薪计算来源", "ParameterValue": "无时薪配置", - "ID": "eb0ba1839ebc4ec58750e971080fc72b" + "ID": "1034a8bcf12a49328a31314e519829f0" } ], - "ID": "d0b758f9-0d2e-4d2e-a28c-2f6ace22299d" + "ID": "863cf643-953c-4ca0-9948-81672bad50bb" } ] } ], "Comments": "优先使用手动指定的提成金额", - "ID": "84056f4d-6445-40f0-bd6e-556cde5e8ab7" + "ID": "dcedba1d-9312-417b-8894-8715d6f1a998" }, { "CommandList": [ @@ -587,16 +513,16 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=指定时薪单价" }, - "ID": "fc60439fc8cf41048b1245fd93c999ea" + "ID": "7d2e6e5fc0034ca387253b6ca5b1d760" }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", "ParameterName": "时薪计算来源", "ParameterValue": "特殊指定", - "ID": "2eafc4d65af44d18adfcd21c68734df8" + "ID": "c9b6eb8cb30e4eaa839a7e1e28ee50a1" } ], - "ID": "b922bfd5-212e-48d6-a05b-98369f91b9f2" + "ID": "acbc5b5c-c45a-4e00-94e7-dae4808b26a5" } ], "Comments": "计算成员的时薪" @@ -657,16 +583,7 @@ "TableValueType": 1, "BindingInfos": [ { - "GUID": "1b238274-dd6b-4c25-82ac-9b61d4efba32", - "BindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "任务ID", - "GUID": "976cf4f1-2ec3-4537-8ca8-aac1d965131e" - }, - "ColumnName": "任务ID" - }, - { - "GUID": "1f313c9e-4960-484d-984f-75ab3965ccf5", + "GUID": "7ba9ad71-19d0-4c44-bde8-61bf640eb2a7", "BindingInfo": { "TableName": "View_任务工时统计", "ColumnName": "总计划工时", @@ -675,7 +592,7 @@ "ColumnName": "总计划工时" }, { - "GUID": "bd3ba593-9a1e-4864-b038-670ae01756f1", + "GUID": "a0e8cca8-cfb4-407d-ba93-9517cf57ac42", "BindingInfo": { "TableName": "View_任务工时统计", "ColumnName": "总实际工时", @@ -712,19 +629,20 @@ } } ] - } + }, + "NullFormulaValueQueryPolicy": 0 }, - "ID": "bd1036451d524ce98a641c7eac350ccb", + "ID": "25784160778c4690b0e3bfef48e0a277", "Comments": "从视图统计项目的信息" }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "个人工时余额", + "ParameterName": "个人剩余总工时", "ParameterValue": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=个人工时情况.总计划工时-个人工时情况.总实际工时" }, - "ID": "d4e74f0bc6954a9db41a98ed631026b8" + "ID": "6dc07a32702540ba8c1c8e67f4d7f66b" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -736,7 +654,7 @@ "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", "ParamObject": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=个人工时余额" + "SerializeProperty": "=个人剩余总工时" } }, "value": { @@ -751,25 +669,25 @@ "ParameterName": "核定工时", "ParameterValue": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=个人工时情况.总计划工时-个人工时情况.总实际工时" + "SerializeProperty": "=个人剩余总工时" }, - "ID": "bde7738eb3154f93a0e189ea107db3ea" + "ID": "9d3acc4ac63a4609981e0d4c77223315" }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", "ParameterName": "核定工时说明", "ParameterValue": "个人工时余额不足，按剩余工时核定！", - "ID": "58bcc74765f1449baceb214856d42160" + "ID": "35f0050c10914815a69f515fbe6fcaae" } ], "Comments": "先检查个人工时余额够不够，如果不够，直接提成为0", - "ID": "acb9a740-8314-43da-a91a-575d2386bcc9" + "ID": "4cec407b-9671-4f84-b2b9-b57a1ec4a2f0" } ] } ], "Comments": "如果分配到人头，则判断该人总计划工时还够不够", - "ID": "ec9432b0-8712-488a-b7b2-51451d9bc122" + "ID": "58c9c042-b704-4faf-b04d-79dcb7fd6c06" }, { "Condition": { @@ -784,66 +702,6 @@ "value": "3" }, "CommandList": [ - { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "任务工时情况", - "TableValue": { - "TableName": "View_任务工时统计", - "TableValueType": 1, - "BindingInfos": [ - { - "GUID": "88e5a9aa-873c-46c3-b76f-69a424956526", - "BindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "任务ID", - "GUID": "976cf4f1-2ec3-4537-8ca8-aac1d965131e" - }, - "ColumnName": "任务ID" - }, - { - "GUID": "5fed6798-5151-4540-b566-d913b4615d93", - "BindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "总计划工时", - "GUID": "37b1cd46-749c-4870-9e65-639974e237b4" - }, - "ColumnName": "总计划工时" - }, - { - "GUID": "a30f02c0-4c0f-4308-a747-49bd5ac545dc", - "BindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "总实际工时", - "GUID": "58613864-7f3d-4ab2-9b2e-f1e1b7a86879" - }, - "ColumnName": "总实际工时" - } - ], - "SqlCondition": { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "任务ID", - "GUID": "b732175b-c55c-4a15-b703-223f45ab07a1" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务ID" - } - } - }, - "ID": "9dac211ac8804f90a07ac0a1924d99ca", - "Comments": "从视图统计项目的信息" - }, - { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "任务工时余额", - "ParameterValue": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务工时情况.总计划工时-任务工时情况.总实际工时" - }, - "ID": "b8f71de2a6994493970617644965cf31" - }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", "ConditionAndCommandPairList": [ @@ -854,7 +712,7 @@ "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", "ParamObject": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务工时余额" + "SerializeProperty": "=任务信息.可分配工时" } }, "value": { @@ -869,25 +727,25 @@ "ParameterName": "核定工时", "ParameterValue": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务工时情况.总计划工时-任务工时情况.总实际工时" + "SerializeProperty": "=任务信息.可分配工时" }, - "ID": "08d1a4cf3838487ea7f3a88f433c1b4a" + "ID": "1028323a56304b2a8bbae167d5ed2720" }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", "ParameterName": "核定工时说明", "ParameterValue": "任务工时余额不足，按剩余工时核定！", - "ID": "8ebb8fba5ce4400ca854cb1156c86f66" + "ID": "5563dc9e651a48df988d02a51bef94f2" } ], "Comments": "先检查个人工时余额够不够，如果不够，直接提成为0", - "ID": "718f1af5-b069-444c-a889-19e2f7649321" + "ID": "da6d4340-bb40-4cae-a762-18d743014fcc" } ] } ], "Comments": "如果是共用任务工时，则查看任务计划工时够不够", - "ID": "f2793059-ef01-42fb-80db-9baf1d00af5b" + "ID": "ffa15652-79d8-4df6-a66c-6967db33261b" } ] }, @@ -899,7 +757,7 @@ "TableValueType": 1, "BindingInfos": [ { - "GUID": "5c1bf627-4570-41ca-b626-c506b3a2d24f", + "GUID": "d5112f23-c686-4543-a368-36de9071418f", "BindingInfo": { "TableName": "View_项目统计信息", "ColumnName": "项目预算费用", @@ -908,7 +766,7 @@ "ColumnName": "项目预算费用" }, { - "GUID": "839f4ce0-15f4-4ac3-b60a-ac60f4f97665", + "GUID": "3cf0425f-b400-4d94-8ffb-823e77ff9805", "BindingInfo": { "TableName": "View_项目统计信息", "ColumnName": "总成本", @@ -931,7 +789,7 @@ }, "TopCount": "1" }, - "ID": "65e64feb95fa49a69eff18abf13b2d81", + "ID": "d27566a7c6b44b408b1ef9869716aa75", "Comments": "从视图统计项目的信息" }, { @@ -941,7 +799,7 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=项目统计信息.总成本+(计算时薪*工时数*任务信息.提成系数)" }, - "ID": "83e6abcf3cd543139068512f4079445a" + "ID": "1fc467f0e1674ebb93537f83530a0877" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -1020,7 +878,7 @@ ] } ], - "ID": "3215c3e4-48c4-46b5-824b-6d1a9f45f724" + "ID": "b5cf4ed1-ed2a-405c-963f-6fc86cb4f604" }, { "CommandList": [ @@ -1081,12 +939,12 @@ ] } ], - "ID": "0844e4a5-2170-4994-b15e-0aedc6dc925e" + "ID": "7a45ed77-0fad-47fd-8c10-dcb17aee93b7" } ] } ], - "ID": "6673745e-9fa5-4654-90d9-e48dafb4bc58" + "ID": "0018d44e-ba07-42de-802b-c4d6d18a1312" }, { "CommandList": [ @@ -1119,13 +977,13 @@ ] } ], - "ID": "9b7bf5ad-256e-4fd1-a224-f23b23c2ca61" + "ID": "9ee71a89-22c4-4276-a78d-a58d5eb799f3" } ] } ], "Comments": "如果提交的工时类型等于项目工时的核定方式且开启严格模式就校验本次有没有超标", - "ID": "93f0876c-6b08-4a3f-a164-ba0bb5ab67f8" + "ID": "eeddc237-5387-48dc-b4aa-23ec869ed39c" }, { "CommandList": [ @@ -1182,12 +1040,12 @@ ] } ], - "ID": "8c2b57c1-1304-4c18-8b62-8a43f65248d6" + "ID": "eaa19a22-1f7e-444b-8ce1-c69ffa07cf07" } ] } ], - "ID": "20958383-bc4f-40d1-b302-1ff23f3f385b" + "ID": "24c817ab-b6f2-4d38-af84-a055f56042f4" }, { "CommandList": [ @@ -1220,7 +1078,7 @@ ] } ], - "ID": "b795ba2b-32f7-4ce9-b5e3-614e7784b0b8" + "ID": "3e5378ed-6258-4053-8d12-d49828ae063d" } ] } diff --git a/ServerCommands/项目/项目流程发起前校验.json b/ServerCommands/项目/项目流程发起前校验.json index b034f684..bb342758 100644 --- a/ServerCommands/项目/项目流程发起前校验.json +++ b/ServerCommands/项目/项目流程发起前校验.json @@ -289,6 +289,18 @@ }, "ID": "2b983ad184f144caa4a3f2adb3435fbc" }, + { + "$type": "Forguncy.Model.ProcessInstanceCommand, ServerDesignerCommon", + "ProcessInstanceId": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目信息.立项流程示例ID" + }, + "OperateType": 400, + "ProcessInstanceName": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目信息.创建者_全名&\"发起的\"&\"[\"&项目信息.项目名称&\"]项目立项申请\"" + } + }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", "ConditionAndCommandPairList": [ @@ -328,7 +340,7 @@ "Message": "项目名称及代号不能为空" } ], - "ID": "826a9461-8d70-4b86-a344-ce2e74b23d3e" + "ID": "67dc248f-a0f8-4993-98d1-76bbc52aab96" } ] }, @@ -354,7 +366,7 @@ "Message": "项目经理不能为空" } ], - "ID": "eca5304b-a76f-4805-9c0c-b1706d9d0da4" + "ID": "581984ca-729a-4b01-a938-7fb9705c656b" } ] }, @@ -396,7 +408,7 @@ "Message": "项目所属客户及部门不能为空" } ], - "ID": "c272cadc-018f-46eb-8f3e-5582fba2e3bf" + "ID": "65b1ae4d-df27-48b0-a56c-ab1c2e6ff668" } ] }, @@ -439,7 +451,7 @@ "Message": "项目计划日期不能为空" } ], - "ID": "61aa6f1b-2dfa-47fb-95cf-047819ef8ac1" + "ID": "39a702b1-bc56-45e1-94dc-6c3b4f916d48" } ] }, @@ -481,29 +493,17 @@ "Message": "严格模式下，预算工时必须提供" } ], - "ID": "5372fae7-3a3a-4a40-9f66-39e227661097" + "ID": "3c1c2e13-f6ae-4806-8d85-e0d95a256140" } ] }, - { - "$type": "Forguncy.Model.ProcessInstanceCommand, ServerDesignerCommon", - "ProcessInstanceId": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目信息.立项流程示例ID" - }, - "OperateType": 400, - "ProcessInstanceName": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目信息.创建者_全名&\"发起的\"&\"[\"&项目信息.项目名称&\"]项目立项申请\"" - } - }, { "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", "ErrorCode": "0", "Message": "校验通过" } ], - "ID": "49232066-4d29-4b7f-b0b0-304cf1035123" + "ID": "3a297371-5af1-4b51-8c75-d72eea8b849f" }, { "CommandList": [ @@ -513,7 +513,7 @@ "Message": "项目不存在" } ], - "ID": "956b4636-f761-4cc0-beb0-2b37d525bfdd" + "ID": "64651437-a3cd-47cb-bf1c-05d173b6b205" } ] } diff --git a/Tables/任务/任务平行视图.json b/Tables/任务/任务平行视图.json index 0b3c0e92..f378ed06 100644 --- a/Tables/任务/任务平行视图.json +++ b/Tables/任务/任务平行视图.json @@ -16,20 +16,6 @@ "Name": "项目ID", "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, - { - "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", - "DatabaseColumnType": "bigint", - "MaxLength": -1, - "Name": "父任务ID", - "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" - }, - { - "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", - "DatabaseColumnType": "bigint", - "MaxLength": -1, - "Name": "层级", - "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" - }, { "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", "DatabaseColumnType": "nvarchar", @@ -66,13 +52,6 @@ "Name": "任务类型", "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, - { - "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", - "DatabaseColumnType": "bigint", - "MaxLength": -1, - "Name": "分组ID", - "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" - }, { "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", "DatabaseColumnType": "bigint", @@ -94,6 +73,27 @@ "Name": "备注", "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "DatabaseColumnType": "bigint", + "MaxLength": -1, + "Name": "父任务ID", + "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "DatabaseColumnType": "bigint", + "MaxLength": -1, + "Name": "任务状态", + "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "DatabaseColumnType": "bigint", + "MaxLength": -1, + "Name": "分组ID", + "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, { "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", "DatabaseColumnType": "nvarchar", @@ -101,6 +101,34 @@ "Name": "关联资源", "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "DatabaseColumnType": "nvarchar", + "MaxLength": -1, + "Name": "FGC_Creator", + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "DatabaseColumnType": "datetime", + "MaxLength": -1, + "Name": "FGC_CreateDate", + "ColumnType": "System.DateTime, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "DatabaseColumnType": "nvarchar", + "MaxLength": -1, + "Name": "FGC_LastModifier", + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "DatabaseColumnType": "datetime", + "MaxLength": -1, + "Name": "FGC_LastModifyDate", + "ColumnType": "System.DateTime, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, { "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", "DatabaseColumnType": "float", @@ -108,6 +136,13 @@ "Name": "任务预算工时", "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "DatabaseColumnType": "bigint", + "MaxLength": -1, + "Name": "层级", + "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, { "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", "DatabaseColumnType": "bigint", @@ -150,13 +185,6 @@ "Name": "功能名称", "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, - { - "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", - "DatabaseColumnType": "nvarchar", - "MaxLength": -1, - "Name": "功能描述", - "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" - }, { "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", "DatabaseColumnType": "bigint", @@ -166,10 +194,10 @@ }, { "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", - "DatabaseColumnType": "bigint", + "DatabaseColumnType": "nvarchar", "MaxLength": -1, - "Name": "任务状态", - "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + "Name": "功能描述", + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, { "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", @@ -180,24 +208,55 @@ }, { "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", - "DatabaseColumnType": "nvarchar", + "DatabaseColumnType": "float", "MaxLength": -1, - "Name": "任务成员", - "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + "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", "MaxLength": -1, - "Name": "子任务预算工时", + "Name": "可分配工时", "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, { "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", - "DatabaseColumnType": "int", + "Required": true, + "DatabaseColumnType": "float", "MaxLength": -1, - "Name": "子任务数量", - "ColumnType": "System.Int32, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + "Name": "总核定工时", + "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "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": "nvarchar", + "MaxLength": -1, + "Name": "任务成员", + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, { "$type": "Forguncy.SaveLoad.StatisticColumnSaveData, ServerDesignerCommon", @@ -250,6 +309,18 @@ "DetailTableName": "View_任务工时统计", "Name": "成员剩余工时", "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.SaveLoad.FormulaColumnSaveData, ServerDesignerCommon", + "Formula": "[已分配工时]&\"/\"&[总分配工时]", + "Name": "已分配工时_总分配工时", + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.SaveLoad.FormulaColumnSaveData, ServerDesignerCommon", + "Formula": "[总核定工时]&\"/\"&[已分配工时]", + "Name": "总核定工时_已分配工时", + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" } ], "ExternalDatabaseInfo": { @@ -258,7 +329,7 @@ "ConnectionId": "业务表", "SourceTableName": "任务平行视图", "SourceTableSchema": "dbo", - "CreateViewSql": "SELECT\r\n a.[ID],\r\n a.[项目ID],\r\n a.[父任务ID],\r\n a.[层级],\r\n a.[任务名称],\r\n a.[任务负责人],\r\n a.[开始时间],\r\n a.[结束时间],\r\n a.[任务类型],\r\n a.[分组ID],\r\n a.[版本],\r\n a.[任务说明],\r\n a.[备注],\r\n a.[关联资源],\r\n a.[任务预算工时],\r\n a.[前置任务],\r\n a.[工期],\r\n a.[次序],\r\n a.[里程碑],\r\n a.[进度],\r\n a.[功能名称],\r\n a.[功能描述],\r\n a.[收集反馈],\r\n a.[任务状态],\r\n a.[流程实例ID],\r\n (\r\n SELECT\r\n STRING_AGG([任务成员], ',')\r\n FROM\r\n [任务成员表]\r\n WHERE\r\n [任务ID] = a.ID\r\n ) AS 任务成员,\r\n SUM(b.[任务预算工时]) AS 子任务预算工时,\r\n count(b.ID) AS 子任务数量\r\nFROM\r\n [任务表] a\r\n LEFT JOIN [任务表] b ON a.ID = b.[父任务ID]\r\n AND b.[任务状态] > 0\r\nGROUP BY\r\na.[ID],\r\n a.[项目ID],\r\n a.[父任务ID],\r\n a.[层级],\r\n a.[任务名称],\r\n a.[任务负责人],\r\n a.[开始时间],\r\n a.[结束时间],\r\n a.[任务类型],\r\n a.[分组ID],\r\n a.[版本],\r\n a.[任务说明],\r\n a.[备注],\r\n a.[关联资源],\r\n a.[任务预算工时],\r\n a.[前置任务],\r\n a.[工期],\r\n a.[次序],\r\n a.[里程碑],\r\n a.[进度],\r\n a.[功能名称],\r\n a.[功能描述],\r\n a.[收集反馈],\r\n a.[任务状态],\r\n a.[流程实例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 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];", "ViewInfo": { "ViewName": "任务平行视图", "QueryColumns": [ diff --git a/Tables/任务/任务表.json b/Tables/任务/任务表.json index bcb7e14e..6801b7ce 100644 --- a/Tables/任务/任务表.json +++ b/Tables/任务/任务表.json @@ -161,7 +161,6 @@ "前置任务": 5, "功能名称": 5, "功能描述": 5, - "参与人": 5, "备注": 5, "层级": 5, "工期": 5, @@ -175,7 +174,8 @@ "结束时间": 5, "进度": 5, "里程碑": 5, - "项目ID": 5 + "项目ID": 5, + "子任务数量": 5 }, "subTableOperations": { "任务表": 5, @@ -207,7 +207,6 @@ "前置任务": 5, "功能名称": 5, "功能描述": 5, - "参与人": 5, "备注": 5, "层级": 5, "工期": 5, @@ -221,7 +220,8 @@ "结束时间": 5, "进度": 5, "里程碑": 5, - "项目ID": 5 + "项目ID": 5, + "子任务数量": 5 }, "subTableOperations": { "任务表": 5, @@ -253,7 +253,6 @@ "前置任务": 5, "功能名称": 5, "功能描述": 5, - "参与人": 5, "备注": 5, "层级": 5, "工期": 5, @@ -267,7 +266,8 @@ "结束时间": 5, "进度": 5, "里程碑": 5, - "项目ID": 5 + "项目ID": 5, + "子任务数量": 5 }, "subTableOperations": { "任务表": 5, @@ -379,13 +379,6 @@ "Name": "备注", "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, - { - "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", - "DatabaseColumnType": "nvarchar", - "MaxLength": -1, - "Name": "参与人", - "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" - }, { "$type": "Forguncy.SaveLoad.AttachmentBindingColumnSaveData, ServerDesignerCommon", "DatabaseColumnType": "nvarchar", diff --git a/Tables/需求反馈/反馈收集任务匿名视图.json b/Tables/需求反馈/反馈收集任务匿名视图.json index 6804d657..f56facb3 100644 --- a/Tables/需求反馈/反馈收集任务匿名视图.json +++ b/Tables/需求反馈/反馈收集任务匿名视图.json @@ -42,7 +42,7 @@ "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", "DatabaseColumnType": "nvarchar", "MaxLength": -1, - "Name": "执行者", + "Name": "任务负责人", "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, { @@ -59,7 +59,7 @@ "ConnectionId": "业务表", "SourceTableName": "反馈收集任务匿名视图", "SourceTableSchema": "dbo", - "CreateViewSql": "SELECT\r\n[ID],\r\n[项目ID],\r\n[任务名称],\r\n[功能名称],\r\n[功能描述],\r\n[执行者],\r\n[任务类型]\r\nFROM[任务表]\r\nWHERE [收集反馈]=1 AND [功能名称] is not null;", + "CreateViewSql": "SELECT\r\n[ID],\r\n[项目ID],\r\n[任务名称],\r\n[功能名称],\r\n[功能描述],\r\n[任务负责人],\r\n[任务类型]\r\nFROM[任务表]\r\nWHERE [收集反馈]=1 AND [功能名称] is not null", "ViewInfo": { "ViewName": "反馈收集任务匿名视图", "IsUpdatable": true, diff --git a/Tables/项目/项目平行视图.json b/Tables/项目/项目平行视图.json index 5f3ead1d..c22b6167 100644 --- a/Tables/项目/项目平行视图.json +++ b/Tables/项目/项目平行视图.json @@ -282,7 +282,6 @@ { "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", "Required": true, - "AutoIncrement": true, "DatabaseColumnType": "bigint", "MaxLength": -1, "Name": "ID", @@ -436,20 +435,6 @@ "Name": "立项流程示例ID", "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, - { - "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", - "DatabaseColumnType": "bigint", - "MaxLength": -1, - "Name": "删除", - "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" - }, - { - "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", - "DatabaseColumnType": "nvarchar", - "MaxLength": -1, - "Name": "项目成员", - "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" - }, { "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", "DatabaseColumnType": "nvarchar", @@ -470,6 +455,61 @@ "MaxLength": -1, "Name": "FGC_LastModifier", "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "DatabaseColumnType": "nvarchar", + "MaxLength": -1, + "Name": "项目成员", + "ColumnType": "System.String, 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, + "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, + "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" } ], "ExternalDatabaseInfo": { @@ -478,7 +518,7 @@ "ConnectionId": "业务表", "SourceTableName": "项目平行视图", "SourceTableSchema": "dbo", - "CreateViewSql": "SELECT\n\t[ID],\n\t[项目名称],\n\t[项目代号],\n\t[项目简介],\n\t[项目封面],\n\t[项目经理],\n\t[项目分组],\n\t[所属客户],\n\t[所属客户部门],\n\t[工时分配方式],\n\t[项目预算工时],\n\t[项目预算费用],\n\t[公开],\n\t[严格模式],\n\t[计划开始日期],\n\t[计划完成日期],\n\t[项目方案],\n\t[预算方案],\n\t[网络资源],\n\t[开启反馈收集],\n\t[项目状态],\n\t[立项流程示例ID],\n [删除],\n\t( SELECT STRING_AGG ( [项目成员], ',' ) FROM [项目成员表] WHERE [项目ID] = [项目表].ID ) AS 项目成员,\n\tFGC_Creator,\n\tFGC_CreateDate,\n\tFGC_LastModifier\n\t\nFROM\n\t[dbo].[项目表];", + "CreateViewSql": "SELECT\r\n p.[ID],\r\n p.[项目名称],\r\n p.[项目代号],\r\n p.[项目简介],\r\n p.[项目封面],\r\n p.[项目经理],\r\n p.[项目分组],\r\n p.[所属客户],\r\n p.[所属客户部门],\r\n p.[工时分配方式],\r\n p.[项目预算工时],\r\n p.[项目预算费用],\r\n p.[公开],\r\n p.[严格模式],\r\n p.[计划开始日期],\r\n p.[计划完成日期],\r\n p.[项目方案],\r\n p.[预算方案],\r\n p.[网络资源],\r\n p.[开启反馈收集],\r\n p.[项目状态],\r\n p.[立项流程示例ID],\r\n\tp.FGC_Creator,\r\n p.FGC_CreateDate,\r\n p.FGC_LastModifier,\r\n (\r\n SELECT\r\n STRING_AGG([项目成员], ',')\r\n FROM\r\n [项目成员表]\r\n WHERE\r\n [项目ID] = p.ID\r\n ) AS 项目成员,\r\n ISNULL(SUM(t.[总分配工时]), 0) AS 项目总分配工时,\r\n ISNULL(SUM(t.[已分配工时]), 0) AS 项目已分配工时,\r\n ISNULL(SUM(t.[可分配工时]), 0) AS 项目可分配工时,\r\n ISNULL(SUM(t.[总核定工时]), 0) AS 项目总核定工时,\r\n ISNULL(SUM(t.[可核定工时]), 0) AS 项目可核定工时,\r\n ISNULL(SUM(t.[实际工时]), 0) AS 项目实际工时\r\n\r\nFROM [dbo].[项目表] p\r\nLEFT JOIN [任务平行视图] t ON p.ID = t.[项目ID]\r\nGROUP BY\r\n p.[ID],\r\n p.[项目名称],\r\n p.[项目代号],\r\n p.[项目简介],\r\n p.[项目封面],\r\n p.[项目经理],\r\n p.[项目分组],\r\n p.[所属客户],\r\n p.[所属客户部门],\r\n p.[工时分配方式],\r\n p.[项目预算工时],\r\n p.[项目预算费用],\r\n p.[公开],\r\n p.[严格模式],\r\n p.[计划开始日期],\r\n p.[计划完成日期],\r\n p.[项目方案],\r\n p.[预算方案],\r\n p.[网络资源],\r\n p.[开启反馈收集],\r\n p.[项目状态],\r\n p.[立项流程示例ID],\r\n\tp.FGC_Creator,\r\n p.FGC_CreateDate,\r\n p.FGC_LastModifier", "ViewInfo": { "ViewName": "项目平行视图", "QueryColumns": [ diff --git a/UserControlPages/任务统计信息.json b/UserControlPages/任务统计信息.json new file mode 100644 index 00000000..34a532f9 --- /dev/null +++ b/UserControlPages/任务统计信息.json @@ -0,0 +1,315 @@ +{ + "Rows": { + "RowColumnAttachedInfos": { + "0": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 21.0, + "Mode": 2, + "MinLength": { + "Unit": 1 + }, + "MaxLength": { + "Value": 1.0 + } + } + }, + "1": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "2": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 38.0 + } + }, + "3": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 21.0 + } + }, + "4": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "5": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 38.0 + } + }, + "6": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 21.0, + "Mode": 2, + "MinLength": { + "Unit": 1 + }, + "MaxLength": { + "Value": 1.0 + } + } + } + }, + "Count": 7, + "DefaultSize": 21.0 + }, + "Cols": { + "RowColumnAttachedInfos": { + "0": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 24.0 + } + }, + "1": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 201.0 + } + }, + "2": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 215.0 + } + }, + "3": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 50.0 + } + }, + "4": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 121.0 + } + }, + "5": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 15.0 + } + }, + "6": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 121.0 + } + }, + "7": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 15.0 + } + }, + "8": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 121.0 + } + }, + "9": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 47.0, + "Mode": 2, + "MinLength": { + "Unit": 1 + }, + "MaxLength": { + "Value": 1.0 + } + } + } + }, + "Count": 10, + "DefaultSize": 121.0 + }, + "Values": { + "1,4": "总分配工时", + "1,6": "已分配工时", + "1,8": "已分配工时", + "2,4": 0, + "2,6": 0, + "2,8": 0, + "4,4": "总核定工时", + "4,6": "可核定工时", + "4,8": "实际上报工时", + "5,4": 0, + "5,6": 0, + "5,8": 0 + }, + "AttachInfos": { + "1,1": { + "CellType": { + "$type": "EchartsCustomCellType.EchartsCustomCellTypeCellType, EchartsCustomCellType", + "EChartTitle": "Echarts图表", + "DataSourceBinding": "JSONDataSources", + "DataSources": [], + "JSONDataSources": [ + { + "Name": "已分配工时", + "JSONDemo": "0" + }, + { + "Name": "总核定工时", + "JSONDemo": "0" + } + ], + "ImageDataSource": [], + "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": { + "CellType": { + "$type": "EchartsCustomCellType.EchartsCustomCellTypeCellType, EchartsCustomCellType", + "EChartTitle": "Echarts图表", + "DataSourceBinding": "JSONDataSources", + "DataSources": [], + "JSONDataSources": [ + { + "Name": "已分配工时", + "JSONDemo": "0" + }, + { + "Name": "总核定工时", + "JSONDemo": "0" + } + ], + "ImageDataSource": [], + "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": { + "BindingInfo": { + "TableName": "任务平行视图", + "ColumnName": "总分配工时", + "GUID": "0f95ca94-c3d9-44e9-9b8f-662eb6133dbb" + } + }, + "2,6": { + "BindingInfo": { + "TableName": "任务平行视图", + "ColumnName": "已分配工时", + "GUID": "ec51b865-2e7b-4950-bab7-fcd797b3f485" + } + }, + "2,8": { + "BindingInfo": { + "TableName": "任务平行视图", + "ColumnName": "可分配工时", + "GUID": "f5e9bf9d-713e-4573-98a6-9c363ff8c04b" + } + }, + "5,4": { + "BindingInfo": { + "TableName": "任务平行视图", + "ColumnName": "总核定工时", + "GUID": "60d4b725-a65e-4d8e-adcd-d9e64ab73811" + } + }, + "5,6": { + "BindingInfo": { + "TableName": "任务平行视图", + "ColumnName": "可核定工时", + "GUID": "13df3be4-231d-401d-b4fc-179a5dd7422e" + } + }, + "5,8": { + "BindingInfo": { + "TableName": "任务平行视图", + "ColumnName": "实际工时", + "GUID": "e3c4608b-0fe1-4be9-88ff-956e08fe3cc4" + } + } + }, + "StyleDatas": { + "Styles": [ + { + "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, + "Formatter": 3, + "HorizontalAlignment": 4 + } + ], + "Types": { + "Strs": [ + "Body", + "Text 1 50", + "[AUTO]General", + "0.0\"h\"", + "Left" + ] + }, + "CellStyles": { + "0,2": 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, + "3,2": 0, + "3,6": 0, + "3,8": 0, + "4,0": 0, + "4,2": 0, + "4,3": 0, + "4,4": 3, + "4,5": 0, + "4,6": 3, + "4,7": 0, + "4,8": 3, + "4,9": 0, + "5,0": 0, + "5,2": 0, + "5,3": 0, + "5,4": 5, + "5,5": 0, + "5,6": 5, + "5,7": 0, + "5,8": 5, + "5,9": 0, + "6,2": 0, + "6,6": 0, + "6,8": 0 + }, + "SheetStyle": { + "FontFamily": 0 + } + }, + "Spans": [ + "1,1,6,1", + "1,2,6,1" + ], + "PageInfo": { + "$type": "Forguncy.Model.Pages.UserControlPage, ServerDesignerCommon", + "PropertyDefinitions": [], + "CommandDefinitions": [], + "MethodDefinitions": [], + "PageLoadedCommandList": [] + }, + "PrintInfo": { + "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 diff --git a/UserControlPages/任务统计信息.rd b/UserControlPages/任务统计信息.rd new file mode 100644 index 00000000..62b4fbc4 --- /dev/null +++ b/UserControlPages/任务统计信息.rd @@ -0,0 +1,5 @@ +{ + "PageType": 3, + "ColumnCount": 10, + "RowCount": 7 +} \ No newline at end of file