From 299fbbe8102beace1cfd496d1951e6096077ac7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B6=85=E5=93=A5?= Date: Wed, 26 Jun 2024 15:12:31 +0800 Subject: [PATCH] =?UTF-8?q?{"Message":"=E4=BF=AE=E6=94=B9=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E5=B7=A5=E6=97=B6=E7=BB=9F=E8=AE=A1=E8=A7=86=E5=9B=BE?= =?UTF-8?q?","MessageType":2,"Modules":[{"State":1,"Type":23,"Name":"Table?= =?UTF-8?q?View/View=5F=E4=BB=BB=E5=8A=A1=E5=B7=A5=E6=97=B6=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1"},{"State":1,"Type":1,"Name":"PCPage/=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E5=B7=A5=E6=97=B6"},{"State":1,"Type":1,"Name":"PCPag?= =?UTF-8?q?e/=E9=A1=B9=E7=9B=AE=E6=A6=82=E5=86=B5-=E5=85=B3=E9=94=AE?= =?UTF-8?q?=E6=95=B0=E6=8D=AE"},{"State":1,"Type":1,"Name":"PCPage/?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=B4=9F=E8=8D=B7=E5=AD=90=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?"},{"State":1,"Type":1,"Name":"PCPage/=E9=A2=84=E7=AE=97?= =?UTF-8?q?=E7=94=B3=E8=AF=B7"},{"State":1,"Type":1,"Name":"PCPage/?= =?UTF-8?q?=E9=A2=84=E7=AE=97=E7=94=B3=E8=AF=B7=E5=AE=A1=E6=89=B9"},{"Stat?= =?UTF-8?q?e":1,"Type":1,"Name":"PCPage/=E5=B7=A5=E6=97=B6=E8=AF=A6?= =?UTF-8?q?=E6=83=85"},{"State":1,"Type":1,"Name":"PCPage/=E5=B7=A5?= =?UTF-8?q?=E6=97=B6=E6=80=BB=E8=A7=88"},{"State":1,"Type":1,"Name":"PCPag?= =?UTF-8?q?e/=E4=BB=BB=E5=8A=A1=E5=B7=A5=E6=97=B6=E7=BB=9F=E8=AE=A1"},{"St?= =?UTF-8?q?ate":1,"Type":1,"Name":"PCPage/=E4=B8=AA=E4=BA=BA=E5=B7=A5?= =?UTF-8?q?=E6=97=B6=E9=A6=96=E9=A1=B5"},{"State":1,"Type":15,"Name":"Serv?= =?UTF-8?q?erCommand/=E4=B8=8A=E6=8A=A5=E5=AE=9E=E9=99=85=E5=B7=A5?= =?UTF-8?q?=E6=97=B6"},{"State":1,"Type":18,"Name":"RdlReport/=E5=B7=A5?= =?UTF-8?q?=E6=97=B6=E6=8A=A5=E8=A1=A8"},{"State":1,"Type":15,"Name":"Serv?= =?UTF-8?q?erCommand/=E8=AE=A1=E7=AE=97=E6=8A=A5=E5=B7=A5=E6=95=B0?= =?UTF-8?q?=E6=8D=AE"},{"State":1,"Type":15,"Name":"ServerCommand/?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=99=BB=E5=BD=95=E6=A3=80=E6=9F=A5"},{"Stat?= =?UTF-8?q?e":1,"Type":31,"Name":"UserControlPage/=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E4=BF=A1=E6=81=AF"},{"State":1,"Type":1,"Nam?= =?UTF-8?q?e":"PCPage/TODO-FULL"},{"State":1,"Type":1,"Name":"PCPage/?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E6=97=B6=E9=97=B4"},{"State":3,"Type":15,"Na?= =?UTF-8?q?me":"ServerCommand/=E4=BF=9D=E5=AD=98=E8=AE=A1=E5=88=92"},{"Sta?= =?UTF-8?q?te":3,"Type":38,"Name":"Image/=E6=88=90=E5=91=98.png"}],"Versio?= =?UTF-8?q?n":"v1"}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .collaboration | 224 +---- Pages/31a709cea02e45ad83bb92336a6d829.json | 16 +- Pages/6746a656596b44bb908448c6ffc1502.json | 107 +-- Pages/TODO/TODO-FULL.json | 120 ++- Pages/TODO/TODO-FULL.rd | 14 +- Pages/TODO/设置时间.json | 15 +- Pages/c273b140d3b24036903f81cf5f56c0f.json | 276 +++--- Pages/工时/个人工时首页.json | 38 +- Pages/工时/任务工时统计.json | 12 +- Pages/工时/工时总览.json | 38 +- .../项目首页-容器页面/任务容器页面/工时详情.json | 12 +- .../项目首页/项目首页-容器页面/项目工时.json | 14 +- .../项目首页-容器页面/项目概况-关键数据.json | 800 +++++++++--------- .../项目首页-容器页面/项目概况-关键数据.rd | 18 +- .../项目首页-容器页面/项目负荷子页面.json | 8 +- Pages/项目/项目首页/预算申请/预算申请.json | 20 +- .../项目/项目首页/预算申请/预算申请审批.json | 22 +- Reports/工时报表.json | 20 +- Reports/工时报表.rdlx | 2 +- ServerCommands/TODO/保存计划.json | 92 ++ ServerCommands/工时/上报实际工时.json | 24 +- ServerCommands/工时/计算报工数据.json | 38 +- ServerCommands/系统/用户登录检查.json | 50 +- Tables/工时/View_任务工时统计.json | 67 +- UserControlPages/任务统计信息.json | 449 +++++----- image/插图/成员.png | Bin 0 -> 2655 bytes 26 files changed, 1172 insertions(+), 1324 deletions(-) create mode 100644 ServerCommands/TODO/保存计划.json create mode 100644 image/插图/成员.png diff --git a/.collaboration b/.collaboration index a95fc40a..ecf03daa 100644 --- a/.collaboration +++ b/.collaboration @@ -144,16 +144,7 @@ }, { "ModuleName": "TableView/View_任务工时统计", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T15:04:30.2067995+08:00", - "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\工时\\View_任务工时统计.json" - ] + "ModuleType": 23 }, { "ModuleName": "TableView/人员工时统计视图", @@ -571,19 +562,7 @@ }, { "ModuleName": "PCPage/项目工时", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T15:04:30.2073182+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目工时.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目工时.rd", - "Pages\\57e644c056074f9d885f24a5bd7b4ae.json", - "Pages\\57e644c056074f9d885f24a5bd7b4ae.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目成员统计", @@ -591,17 +570,7 @@ }, { "ModuleName": "PCPage/项目概况-关键数据", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T14:45:23.7008896+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目概况-关键数据.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目概况-关键数据.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目甘特图", @@ -617,21 +586,7 @@ }, { "ModuleName": "PCPage/项目负荷子页面", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T15:04:30.2071167+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目负荷子页面.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目负荷子页面.rd", - "Pages\\439de40f21bf428ba0a9e5bb71ef657.json", - "Pages\\439de40f21bf428ba0a9e5bb71ef657.rd", - "Pages\\7d42ecb340d74d3299e1e259166b101.json", - "Pages\\7d42ecb340d74d3299e1e259166b101.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目反馈", @@ -679,31 +634,11 @@ }, { "ModuleName": "PCPage/预算申请", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T14:37:18.9112225+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\预算申请\\预算申请.json", - "Pages\\项目\\项目首页\\预算申请\\预算申请.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/预算申请审批", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T14:36:38.6453732+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\预算申请\\预算申请审批.json", - "Pages\\项目\\项目首页\\预算申请\\预算申请审批.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目预算申请历史", @@ -767,19 +702,7 @@ }, { "ModuleName": "PCPage/工时详情", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T15:04:30.2070622+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\工时详情.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\工时详情.rd", - "Pages\\31a709cea02e45ad83bb92336a6d829.json", - "Pages\\31a709cea02e45ad83bb92336a6d829.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/新增任务", @@ -907,31 +830,11 @@ }, { "ModuleName": "PCPage/工时总览", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T15:01:13.1788268+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\工时\\工时总览.json", - "Pages\\工时\\工时总览.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务工时统计", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T15:04:30.2071484+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\工时\\任务工时统计.json", - "Pages\\工时\\任务工时统计.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/人员工时统计", @@ -939,17 +842,7 @@ }, { "ModuleName": "PCPage/个人工时首页", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T15:01:03.1709962+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\工时\\个人工时首页.json", - "Pages\\工时\\个人工时首页.rd" - ] + "ModuleType": 1 }, { "ModuleName": "Pages/个人中心", @@ -1097,16 +990,7 @@ }, { "ModuleName": "ServerCommand/上报实际工时", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T15:04:30.2074911+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\工时\\上报实际工时.json" - ] + "ModuleType": 15 }, { "ModuleName": "ServerCommand/分配任务工时", @@ -1218,17 +1102,7 @@ }, { "ModuleName": "RdlReport/工时报表", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T15:04:13.5175639+08:00", - "ModuleType": 18, - "ToRemoveFiles": [ - "Reports\\工时报表.json", - "Reports\\工时报表.rdlx" - ] + "ModuleType": 18 }, { "ModuleName": "ProcessItem/预算申请", @@ -1612,16 +1486,7 @@ }, { "ModuleName": "ServerCommand/计算报工数据", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T15:04:30.2074164+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\工时\\计算报工数据.json" - ] + "ModuleType": 15 }, { "ModuleName": "PCPage/核定确认", @@ -2005,16 +1870,7 @@ }, { "ModuleName": "ServerCommand/用户登录检查", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T14:12:04.9125798+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\系统\\用户登录检查.json" - ] + "ModuleType": 15 }, { "ModuleName": "Notification/提醒通知", @@ -2218,17 +2074,7 @@ }, { "ModuleName": "UserControlPage/任务统计信息", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T14:39:13.941913+08:00", - "ModuleType": 31, - "ToRemoveFiles": [ - "UserControlPages\\任务统计信息.json", - "UserControlPages\\任务统计信息.rd" - ] + "ModuleType": 31 }, { "ModuleName": "Image/下载.svg", @@ -2368,21 +2214,7 @@ }, { "ModuleName": "PCPage/TODO-FULL", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T13:37:45.5714025+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\TODO\\TODO-FULL.json", - "Pages\\TODO\\TODO-FULL.rd", - "Pages\\6746a656596b44bb908448c6ffc1502.json", - "Pages\\6746a656596b44bb908448c6ffc1502.rd", - "Pages\\c273b140d3b24036903f81cf5f56c0f.json", - "Pages\\c273b140d3b24036903f81cf5f56c0f.rd" - ] + "ModuleType": 1 }, { "ModuleName": "UserControlPage/关键数据(图标)", @@ -2406,17 +2238,7 @@ }, { "ModuleName": "PCPage/设置时间", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T14:02:18.3611924+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\TODO\\设置时间.json", - "Pages\\TODO\\设置时间.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目版本详情", @@ -2440,22 +2262,10 @@ }, { "ModuleName": "ServerCommand/保存计划", - "State": 3, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T13:52:34.3403901+08:00", "ModuleType": 15 }, { "ModuleName": "Image/成员.png", - "State": 3, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T14:48:49.3031596+08:00", "ModuleType": 38 } ] \ No newline at end of file diff --git a/Pages/31a709cea02e45ad83bb92336a6d829.json b/Pages/31a709cea02e45ad83bb92336a6d829.json index ac1a3a28..a14b335c 100644 --- a/Pages/31a709cea02e45ad83bb92336a6d829.json +++ b/Pages/31a709cea02e45ad83bb92336a6d829.json @@ -224,7 +224,7 @@ } } ], - "ID": "a36e1fce-5817-4a00-af5f-523836be9f88" + "ID": "b252fe24-3d40-4876-b873-9a4c1cd191ae" }, { "CommandList": [ @@ -239,12 +239,12 @@ "BtnText": "知道了" } ], - "ID": "2333ca78-df42-42ce-bf40-90f0a7789229" + "ID": "454a74d9-ba2f-4408-9698-f2dd39d37e3a" } ] } ], - "ID": "39e17237-aea8-4c2f-bd3b-eee3aeb8b802" + "ID": "69ac83b2-27f6-4055-b884-3cbe42df6509" } ] } @@ -366,7 +366,7 @@ "value": "编辑" }, "CommandList": [], - "ID": "0f5594a0-f0d2-491a-9a75-4998cd1699ed" + "ID": "f25c1d8e-4c3e-467e-9b4d-8335eda2de64" }, { "Condition": { @@ -420,17 +420,17 @@ } } ], - "ID": "e0ce0792-645e-44d0-b756-10cf457717b9" + "ID": "2d7f3381-2de1-4839-ae84-fd862a9a05c7" } ] } ], - "ID": "52a81c5f-5888-4701-8cf2-9ca31333fc5b" + "ID": "e8a1accf-755d-4754-ae86-68086fa1f6ff" } ] } ], - "ID": "12195392-5e2a-4c5f-9371-1246356c1d60" + "ID": "5e46fac2-6bb7-4bf5-b583-2043eb199198" } ] } @@ -550,4 +550,4 @@ "PaperSize": {}, "Margin": {} } -}//jH0noZDmjaprTj7ftmQB5nNSpbLcq5qbjCJMq6YF60ToL4i4LOE2lhC9+3mQLQJZvgup9VjlcO/fXpljg5bxr54bIGlMbuV7BEWQ5gU1x4hacO81FIaZWgTRTA3lcY2N2YOgxHB25zhb5IhYMpmbONUm3FxjudMdNe5qFUgIMNBFIUv4ggIF+PS//ncW75Fz41pvGD/5DG1QRCDWbd6H2qgIB3jEZgF6U1rd4xnavEEpgbo0K69x7fgm0b17Gz2d73e6oLNvn/ahmFuJkzUAwZCdwIwZssPG0qf1V8bVXn6QkZYJco00c0PpMQ6mL0lLiVLSSnhBaNJJqt6ls4aWCKlsyrS3iF9DSphG0RUKa9zcEbIOIe04WIF3HjHv3FMnF7I69s2znUuO8nDjNchTvHPQQMHeGMN5JjB2f7F/5J4iT8+pYHtOJSE4ni9/cCfDpx+TISKpSckCu/HIPWLV3x/NOsxYsM9hB64KTOOfEbqjnePFlodr76QtkJ6IJjAeRWCSVpODZ51SgVQe9Wb7dMKaBjpE/uRY0ex+XebM2BWdpidAC2x5Mjy3i7WNMUTRuuCdVz16mtMzcbDoeBGSN0n/7QcmetxAk3DHqU1yI202dZVz6+dgX7UnaEfLm5nT3HIsXOHgO4h8tS8eABKiobBqSdH6toZ5tUYGOQSZ/AW1Rqmn+ezvpgGXAydrEa8Cak05NSo1V/OBW8RS2hvuv/0njlDDOl+dxGLGkNeoyWFNQUFpRjV1ZnfFi4wPZewsuckN89nG8PxT/A1n3zE+5qmVHG7Y//LlryxV98Wb7ky9wwozgMmLkAfo8iAr6uqYJblWsu8DPBuoAk1G+vbbcpu6MJjLti3UXe9RSknT8v0Lp2pZDnRNwzPrlOA+KtJsPl2pTnU6sDZAJFvKNd6DZg==|920 \ No newline at end of file +}//+0BgRdj0bIOXKeAs1/0mkV05OzkJlYte1y4b9mBV9iEA0eXY2LKc5tTtEM7QBXbh8CGR8MbTWI6huvzR0188DFcUPNjW3b8aMwOvPGDRW9JmYG4eJscUw+JMnX1+8rrFGfTysFSJpsEmF/idbElcs9yYEBbCSpHbN5k3b1fpgelYnKxx1rY5sK6dqsWQN1S/CnE/70j2HKtwUzjqpstVjLvJUPmM5Gu3HtMbG5MjSk9/yCvdvr5GJVtCusCpWyRSaaPYLpRH7z5lon0gJIRXJEWLQuDIBjjJTI0fLWnKuJ8wSGlZ+lqWAGVkgwecJAv6Nq9Wh8UmpJZ0zjHyNfPRBTARM6crmokV1SO2hKvg3wWwWlPnYkyPsdjtPJHDVqIGGOmY9T9A57knJuRe4PTwRFUFFrwod8oFlq/Uczbe3/uc1yrLcDBwE3bLNA3E93hYFe1FAbyRdYnXFSK7Vv3CVbDUGakcK+Eylecmn0g64+/IoHeh2urXT3A6DvoUTyN5oNXsHXTcWZYNO4c4V0k4p46a0NuFyfGVGX4fa0Y7eYJQhDsBM1TFE1miKBZMktIOu2GFlRBGY1RwtEb4AkNNU8lDUsnWnQ4h2HalrxtCtqjRHpS8urUxWQ7feIWx0X6PuI7dVOWC7sIhEeeSLXtyou11GYNtkl/TA/uiR45e8NtlUH30cFEAyPodYp4RskCyC2fn70VT8mJ7+krIl4850nOLt+zdEaR5mWrG5m4gTHoHaPSUHQ7joBXpbA5kZrOhGv+YDcxucLiVmls0V5Xcwfckgwmk3v3NY1PSq4y+pK7sFcxeQyEr+lHKGqi34YVvLYA1fTtt0lc2ow6/tDOMdezx2hQ0+QjzI5lttFo2EQ9p/0p3On8L84Z97wuc7E8BHjMIMx63r+jS6/zJP4wqyg==|920 \ No newline at end of file diff --git a/Pages/6746a656596b44bb908448c6ffc1502.json b/Pages/6746a656596b44bb908448c6ffc1502.json index 57723bd0..b74f4854 100644 --- a/Pages/6746a656596b44bb908448c6ffc1502.json +++ b/Pages/6746a656596b44bb908448c6ffc1502.json @@ -35,7 +35,8 @@ }, "6": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0 + "DesignLengthInPixel": 20.0, + "IsHidden": true } } }, @@ -72,54 +73,11 @@ }, "Count": 5 }, - "Values": { - "1,2": "内容" - }, "AttachInfos": { "1,0": { "CellType": { "$type": "Forguncy.CheckBoxCellType, ServerDesignerCommon", - "Style": 1, - "CommandList": [ - { - "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", - "ConditionAndCommandPairList": [ - { - "Condition": { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionContextPropertyParam, ServerDesignerCommon", - "contextProperty": { - "Display": "值变更原因" - } - }, - "value": "userInput" - }, - "CommandList": [ - { - "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", - "TableName": "TODO", - "ShowConfirm": false, - "UpdateBindingValues": [ - { - "BindingInfo": { - "TableName": "TODO", - "ColumnName": "完成", - "GUID": "d8308a4a-ad80-4d33-b6a1-aa56988eab24" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='6746a656596b44bb908448c6ffc1502'!A2" - } - } - ] - } - ], - "ID": "720cffa3-f5f1-4706-aeba-6d4fb5c65d91" - } - ] - } - ] + "Style": 1 }, "TemplateCellSource": "完成", "RulesGuidList": [ @@ -129,48 +87,10 @@ "1,2": { "CellType": { "$type": "Forguncy.MultilineTextBox, ServerDesignerCommon", - "CellDefaultValue": "内容", - "TemplateKey": "隐形输入框", - "CommandList": [ - { - "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", - "ConditionAndCommandPairList": [ - { - "Condition": { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionContextPropertyParam, ServerDesignerCommon", - "contextProperty": { - "Display": "值变更原因" - } - }, - "value": "userInput" - }, - "CommandList": [ - { - "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", - "TableName": "TODO", - "ShowConfirm": false, - "UpdateBindingValues": [ - { - "BindingInfo": { - "TableName": "TODO", - "ColumnName": "内容", - "GUID": "15fd131f-ff02-4cb3-84d2-f83bb51717b7" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='6746a656596b44bb908448c6ffc1502'!C2" - } - } - ] - } - ], - "ID": "b353c7f3-4d7f-4cde-87da-cfdd028621ae" - } - ] - } - ] + "TemplateKey": "隐形输入框" + }, + "DataValidationInfo": { + "IgnoreBlank": false }, "TemplateCellSource": "内容", "RulesGuidList": [ @@ -248,7 +168,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "43d449fb-45ae-4b07-97fd-6ef31345d520" + "ID": "4b45c4f8-7683-4514-b436-9af52bf65252" }, { "Condition": { @@ -280,7 +200,7 @@ ] } ], - "ID": "8996423b-c198-4d3d-adbd-566658156ded" + "ID": "0344ebf4-7c94-4eec-a45f-192be6477f13" }, { "Condition": { @@ -312,12 +232,12 @@ "MethodName": "ExecuteCommand" } ], - "ID": "5213302b-5fba-4397-ba30-da7bff81ba13" + "ID": "6424561e-113c-406e-9fd1-b481e89d4ff4" } ] } ], - "ID": "4a51b915-96c5-4059-9681-06f9e7a5dbb3" + "ID": "0f341561-a0af-49d6-90e0-ef0d16dbe0b7" } ] } @@ -338,6 +258,9 @@ }, "4,2": { "TemplateCellSource": "时间描述" + }, + "6,2": { + "TemplateCellSource": "ID" } }, "StyleDatas": { @@ -434,4 +357,4 @@ "PaperSize": {}, "Margin": {} } -}//M9RvBKLrtl7b+v9jZNuEBQ2LqjtOfFE1Z2loZTROroKBhDrBxdgF8TzbGSuqYrORS7+xk2muNYbGTWPNBdEgvTq5Xwq3JFCIwgyOJsR8FdImJrEZ2EH94rjcKLTNZfo/G5JInJi0s0bNbDnG7jhApvGEQAtEn/BE7i6Z0kyEHbiwsa/yRCiif5rCFr/0YzIUSAQUV6WRGAEuXvL5HTB6qHku0f8ySj0qTBH7WnRWTxF2exftGZpc+S5+N/OWVh2mTw4x16yKrIws3H6s773cGhqYKLSp7uDpqZtuis1JAQqs2e1kGpT/g9bh1BJYUIUVNXHSFqiBu4hLv8Cezms6izkvkSPC0ytWDmkUWT7nZC20Gh/G775sPpET8eqp537X/Ekoc+dsC7NfT5S1ccAuWAxacrwtYyfvV7Qgf5wsoDinbPVrh+4G7c3k47HIss5wdpDEPr6M5MhoJvMSGkQuwYMyPW6a0Q8oKM/X6Bw4qoBtrA+G31TcEdbJfhMgMW2RTies/2wAgutQVNRHT8P3Yfh4u2pCQlBf343ypuqJVKDnUf0P26BNNRhtEd0rvWTHH5LWzCqeW41u7Jhlt65qH2ylQDMl+OlrNb4/NlY8BmKf3R7zCwtMPU2Jz3KTj4JheZ028LcKTeuaEOyzs/VtsNTurvKCccknDaywZZ61cTPKBREs1mQmdGPK2euYLaeYhv37c/agakSqJo0OH3ECKU3dSOrL1pGwdRO44irSNvhF0zNFHbFQ0yFf0So5LOD2YTiukuOQs2SasJGeyFew3VWlopvNwT4mU8+msbym5x1oRRviFudDwMnyqfBJ3hMl6om0RUvpUG2ZWeUcCriaW53DIdmYCYiu9Pzedf1SWpcNPpXYwKr2iOAs4cJOGjEOdSWrXYtHny97M9W6wx5Z/A==|920 \ No newline at end of file +}//mR/iIQv6dkoWxHdBCu/3kWXxgjs2AVYqT2IxTQl/jflrmegTSG2EdVG14vwR3WpmHiFuhrDSzAhOSC7shaQHoMF78BZT6voa+0GzjG43LRcF7Ej4zDXlRXCbV5uVpr7fI5GTiCGRfI+21albzMLnzmqqiv6Z020/ITjWYu3S5MFKoLs2mtVVuLYZqYJDjVflM/mUD/5PAiu8tHJdmIWdCYIywRh6nC61Msrjo10aiopmRCroW7Lovu+ju3z4LeaolrWVmqI9rGzfgtjyQspoSDSqAx1C+QkMC96RydsWLAfsN8uvadqWrNPEIdoKJArEIWwQW6sTToHYTfRs7x4utUOng5U+7i0+cC2sNbRjiT6g8dVCso8KA1DaIYmUYHmdpPhHlVIACSvVrxSLlCJyMYaOEILH/sy2nVLCMOevUt9LwutN3x+MHha87d9QZrMwlmEo59VpgCogb7/p4FEu9wWDY1tFoSfsPfzHBkyKEjqSbkHEHJpO/xMdqznkddSHeLX8KRmtLV/NHmXfKfOYUZCKI2l8YN1b+fPMOD7DhAOdsUKx7eh2hhOmW0R4/Wcs3iiFLkH5wjS5+ZuYweyoecDoBvzQG7KxbFLPZQgjx1EW9ZCjEny+l/AZEnh8JYual6Pzk0ySjcpLSl0rsmuokApJb3RtjUxbuBiJXKMVkOLQb8BZ/9h2kqmsOI1dVxpwkGDWmJ168PYQGchd7d+vPsLWBHpZbw9JemF8l3yL4DKB0U9nQUXQrAL9oMSNONxroMcG7U7FonCsJlHw4OxxzHIIQQT5s5e+z7BVI06a2/1OD6cOtwIYqUHZ8gGXiG5z8DyjHxzizxuweZpB+2rjjhK5P6qKFi9gL2s6H3Loci6/u5RoiuwZi4OJ1Q67rWQNgYNSFsV9XM5rZPrMrPM4Ig==|920 \ No newline at end of file diff --git a/Pages/TODO/TODO-FULL.json b/Pages/TODO/TODO-FULL.json index dfdd694f..027a2f98 100644 --- a/Pages/TODO/TODO-FULL.json +++ b/Pages/TODO/TODO-FULL.json @@ -260,6 +260,7 @@ "1,19": 0, "6,1": "我的列表", "13,1": 0, + "13,15": "重载表格", "14,1": "%CurrentUser.UserName%" }, "Formulas": { @@ -444,6 +445,13 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=TODAY()" } + }, + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='TODO-FULL'!大于日期" + }, + "Value": "%Null%" } ] } @@ -501,8 +509,14 @@ "TargetCells": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "='TODO-FULL'!筛选日期" + } + }, + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='TODO-FULL'!大于日期" }, - "Value": "%Null%" + "Value": "0" } ] } @@ -627,6 +641,19 @@ "SerializeProperty": "='TODO-FULL'!筛选日期" } }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "CompareType": 2, + "ColumnBindingInfo": { + "TableName": "TODO", + "ColumnName": "提醒日期", + "GUID": "620bee2f-872b-40fe-bd95-667a963ce7f7" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='TODO-FULL'!大于日期" + } + }, { "$type": "ForguncyDataAccess.TextCESqlCondition, ForguncyDataAccess", "CompareType": 6, @@ -666,7 +693,7 @@ "IsListviewDataSource": true, "CustomColumns": [] }, - "DataSourceListviewName": "图文列表表格2", + "DataSourceListviewName": "计划表格", "TemplateKey": "竖排横线分割" } }, @@ -689,12 +716,20 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "='TODO-FULL'!分类名称" } + }, + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='TODO-FULL'!筛选日期,'TODO-FULL'!大于日期" + }, + "Value": "%Null%" } ] } ], "ParamProperties": { "ID": "ID", + "用户": "用户", "分类名称": "分类名称", "统计数量": "统计数量" } @@ -765,7 +800,7 @@ "IsListviewDataSource": true, "CustomColumns": [] }, - "DataSourceListviewName": "图文列表表格1", + "DataSourceListviewName": "分类表格", "NoItemSetting": { "ImageForNoItem": { "Name": "无数据插画.png" @@ -921,7 +956,7 @@ "CommandList": [ { "$type": "Forguncy.Model.UpdateListviewCommand, ServerDesignerCommon", - "ListviewName": "图文列表表格1", + "ListviewName": "分类表格", "UpdateType": 6, "UpdateListviewCommandRunTimeMethodSetting": { "MethodName": "Reload", @@ -936,13 +971,13 @@ "TemplateKey": "_RS_Main1" } }, - "14,4": { + "13,15": { "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ { "$type": "Forguncy.Model.UpdateListviewCommand, ServerDesignerCommon", - "ListviewName": "图文列表表格2", + "ListviewName": "计划表格", "UpdateType": 6, "UpdateListviewCommandRunTimeMethodSetting": { "MethodName": "Reload", @@ -954,7 +989,8 @@ } } ], - "TemplateKey": "_RS_Main1" + "Text": "重载表格", + "TemplateKey": "_RS_Success2" } } }, @@ -987,7 +1023,18 @@ "Foreground": 4 }, { - "Foreground": 5 + "Background": null, + "FontFamily": 2, + "Foreground": null, + "Formatter": 5 + }, + { + "Background": 6, + "FontFamily": 2, + "Foreground": 7 + }, + { + "Foreground": 7 }, { "Background": 6 @@ -1000,8 +1047,9 @@ "Body", "Center", "Background 1 0", - "black", - "Background 2 0" + "[AUTO]General", + "Background 2 0", + "black" ], "Borders": [ { @@ -1066,25 +1114,28 @@ "12,19": 3, "13,1": 5, "13,10": 0, + "13,15": 8, + "13,16": 9, + "13,17": 9, "14,10": 0 }, "RowStyles": { - "12": 8, - "13": 8, - "14": 8 + "12": 10, + "13": 10, + "14": 10 }, "ColStyles": { - "0": 9, - "1": 9, - "2": 9, - "3": 9, - "4": 9, - "5": 9, - "6": 9, - "7": 9, - "8": 9, - "9": 9, - "10": 9 + "0": 11, + "1": 11, + "2": 11, + "3": 11, + "4": 11, + "5": 11, + "6": 11, + "7": 11, + "8": 11, + "9": 11, + "10": 11 }, "SheetStyle": { "FontFamily": 2 @@ -1106,10 +1157,11 @@ "14,1,1,2", "12,3,1,4", "8,1,3,9", - "14,4,1,3", "14,7,1,3", "13,12,1,3", - "10,29,1,2" + "10,29,1,2", + "13,15,1,3", + "14,4,1,3" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -1199,7 +1251,7 @@ }, { "Name": "重新加载表格", - "Formula": "'TODO-FULL'!$E$15" + "Formula": "'TODO-FULL'!$P$14" }, { "Name": "筛选日期", @@ -1208,6 +1260,18 @@ { "Name": "重载列表", "Formula": "'TODO-FULL'!$M$14" + }, + { + "Name": "列表容器", + "Formula": "'TODO-FULL'!$M$5" + }, + { + "Name": "分类容器", + "Formula": "'TODO-FULL'!$B$9" + }, + { + "Name": "大于日期", + "Formula": "'TODO-FULL'!$E$15" } ] -}//qp9DsFP4laPqinyPwsNIXNVSCIRyudp2HcDH+UzOVuL+VVQVTJHBwpxDvyS56IKiCoUTPkEnmG2lH8veLY9cUuiutdqbnqq9ztH/W00TRYpWAxMpeUp1iFGGyp5eEAPP4kXdd7arbBCVPcL8ziKly3MbNAvruyt7gk5+WZRF9+n43qzqP+I6g2/eyNRJ90BsBeofZ7b3nKnuMPpvFejtn4ixuo7wXj0jkx3pWmCME08eHTZXjBdu+6FemjPPtfCI1E5spJyo1uJu1ZdXHvWRtP2uadCf2AC4VF35C/ATlGopy4jU3ucfMfxeRGAaJvCIyeAxHii7XI4/yTaEEyWDLjR3D4jon4tBQ8cN3NeLlp4WZubXrGbNK8Ju711b1hP+JDvxa9ChtXoxgzBWA3tTu2oCThQkPE5kKHkA43ADWBvBOhvHY+ORyKKsAlhuyrydOa9piXybWuIg4nTXhOL6Ls65zF8S9U84Bz2u54oOEeqW+KXWQvSREg5tkIdDMVOoaD0LJIv2j8r9V3knlJtVHtc8Y/qbTR8/KU+RtLQpUHho5bx/GdGODt9P001YibFXpzX3nf0ykPaH0aN4EesRRxPArdjr/xsu08sTA9ATAUJb0wjya3M3wFDPWKXnRUDziezi8Wfcx6BLqVSqzo0pnvRuhObJcjc2eIrvVuiHJomtQuz3vKTWic8gmEXUQbrH3zaPbhiHXJsrqMLKdX9bWEXX3ilTXvAOI+mqOWeDvo33kRgUylmB/vG6xRdnuIJOLinntL+/T8neMbISae0a6VhBZugNZxUfsqRTwvl7pCU2xwIQ4yEjUPoGKehihlSuF1TLhLicX/rQcmgNDojezzgt5mbthUX4Yup+cxXI60sjryQm05SMGL7q9s5TCy5+JZJRjz3JAy6qqwpmhRxOBQ==|920 \ No newline at end of file +}//iVb0M+7xy7XJiDA4vH57NaCI/VztEwSx5RUdQTYAcI4vwSWqg7HeNJ5I1fadphUrbz3OVaoZe6LSVs+w9YSpIHoz80mTIfqs1fTeT26AQDDVb4dok0g/QQXcHIeskJPS/kk1a75c2QkmbcJnA/dHjCjYm4Z0gxJkCeECf9PxZ3QdcsFAeImqSFoZmxBpt0zh/ggRu46MIqm7KfMQP1+uphyrFbzsDh8+tLGKKeUVJcrv1OSWvCVGVOPS3yePVPAlE0cbF41xkoRtEdsyNzM+Lee/G6Dd3iU5qdvJL1xR6C+Lz+z8ilvTTgmcEV9PsRJ6lHLOqwfPtYc/ZhgpU0B0BB7Wkh69Gg3sf39K+f8GQYH0w8A1y9OUhVkOhtb6rY4GbRt+bV4SbKDGkS6kQaxFbQt3SBrYCZRBOxjPkR6ICUpE/cAppiIgkISbMAOfSSxXHGVN08RyDExeJYktuEDsaXjVN6I4et16XypYsVrxfIj9WGfzZDNKlMSa/ESx7OJWQXO0fVrOZEO7uqmWPRr/hOPgsGrGin6jYfeh9BwPxbx1diuqMF2zfL9lHVJBvOzF25VYz+bkZB+xec3yeEcRzUR9Sv+4v69e/uWhhySXoT4h7qtLhRgiYhOhgnDq/nISW49mUGm1ZCsVshnSDRVGQ8JCz7699K8SPTrS7UPiGGV/ZPL/jc6zlU85B30z0hPfDppz1bFBXU/LKar3qZXKLskqab9SH2RhOolAWtAPXL+9wqTTsamdi7a90jhfgbay/tGgosY5iM691KHBWisg6NDGJGQtQhR2JPGtWjZk/G3wF2qfDBewIJTKP2K9r5HceEm5RWUfPV1awm74AwhkKz0HQzPqZM3BZJGAKqpLGQC0ifKoLMI5ygyGCWgd7fiQ92Fw6JCxcS5+7XTjO3YYMg==|920 \ No newline at end of file diff --git a/Pages/TODO/TODO-FULL.rd b/Pages/TODO/TODO-FULL.rd index 44a30a79..b3694fa3 100644 --- a/Pages/TODO/TODO-FULL.rd +++ b/Pages/TODO/TODO-FULL.rd @@ -38,7 +38,7 @@ }, { "Name": "重新加载表格", - "Formula": "'TODO-FULL'!$E$15" + "Formula": "'TODO-FULL'!$P$14" }, { "Name": "筛选日期", @@ -47,6 +47,18 @@ { "Name": "重载列表", "Formula": "'TODO-FULL'!$M$14" + }, + { + "Name": "列表容器", + "Formula": "'TODO-FULL'!$M$5" + }, + { + "Name": "分类容器", + "Formula": "'TODO-FULL'!$B$9" + }, + { + "Name": "大于日期", + "Formula": "'TODO-FULL'!$E$15" } ] } \ No newline at end of file diff --git a/Pages/TODO/设置时间.json b/Pages/TODO/设置时间.json index 1f36d16a..6ddbaf86 100644 --- a/Pages/TODO/设置时间.json +++ b/Pages/TODO/设置时间.json @@ -165,7 +165,8 @@ } ] }, - "value": "%Null%" + "value": "%Null%", + "compareType": 1 }, "CommandList": [ { @@ -181,12 +182,12 @@ ] } ], - "ID": "a352c644-db7f-4af6-b659-cf650cdc44da" + "ID": "a302857f-eb6c-4c97-8a05-a9b6cffdd733" } ] } ], - "ID": "8e8d03da-50fc-48df-af32-6e1650805c9b" + "ID": "074bc97f-dcfc-450b-94a1-7c293d3ab91e" } ] } @@ -218,7 +219,8 @@ "firstDayOfWeek": 1, "clearable": true, "DefautWeekFormat": "yyyy 第 WW 周" - } + }, + "DataValidationInfo": {} }, "5,1": { "BindingInfo": { @@ -269,7 +271,8 @@ "loadingText": "加载中" }, "noMatchText": "无匹配数据" - } + }, + "DataValidationInfo": {} }, "7,1": { "CellType": { @@ -351,4 +354,4 @@ "Formula": "设置时间!$B$10" } ] -}//R1h6jFmm5hJQVLAJZ1p1FWedwon90aWgUnalanm+UcJGmV+GNWzRSVP8pw75VnvGTggRr0IkEPPGqgPrYFQaUW5oNdEdSQq31/EH70uFfd3z+EYU7sNcDoYinTzIpoM/AynFzJMf4EiQptK8SDX7tcbd4IKlbJByWBuGC3o4rmDTtt9SDYVVq4/1svuz8x9sjg0FC0ZNTJzptHBtOwSTH+3P2tW0IAj81Jz03nWpKj17lxi1tio/5ze3AAKPRtp34GUNpxRcrsF2qngw0zlBpCttfK0QG9y9uKxkJM98OX9ZcV/CYrusTLzf7HrnS2kWx+SGGzzDxft8JjE+zYdM1ahyPrd0nTIJqjkS/ifIaWkRE1Ov7arUMczpot3wv1IdldZQ6ecVVwmwHuXwYx9N3l6h3IkT/ZcV4OKL3gSR674kCLKGq7EygnpotC6LLvAS7O68qj/RZ3YMle3Ys6El7k9NfOI6a0f2OkesXrDYNV8x1zO4bowLWGS+e8GGb4EupGYLn9w7W3wOjnnITA1NKpLgjI2pn5hLUYZ83Q7N7SBwKF4nlIL4Qyk+IP+WbO4vnmujHmpoKCYfjUKtTstGHraJAEzZcdn54a2o7R1HWI/ZWnApdZ/5vRAREbWZECbqeCjYI8dUyBmviS4S47k6V54mlHMqsw1YI0r8iWBFPcAxrxILlRmvMLJjLewkZ4X2wcAHteS8VdhzgDlI/a/nyTIXTU+Gw6kUsT722pRGMYQT2iWhlJ6qXjns47wE2vsIaBFV0rLEokGXcMfT9oqd3ssOPkiDRuOIw93sZg3FjIHGfX+hDw0xo6eAl1XLhM21nJ4Z3Ot5ZM9gJh4bCWMepWRP3deh3sO36RiCK1Wx0nwNiYMsB4T1ghTz+wt1XwQcLJI2jfx1sxbXez/lOjPhIw==|920 \ No newline at end of file +}//i82l2mhqcpboreUzVMcO11sUIRBcNmTeszz5moDKnPVVt+HaIUAwGtexJYI+KbutVOE9TAqUwwjks4iUZxeYLBnIx+FQbpP0JlxRqP2NAklGT714iHBfaUwLRuocIHO5e/wfxfWp5rtgS8/SbS11IrwDUw3BglFXkUyqlNyMzZ+coaDE2TXxUOvsWS32+To4XqADtUMfwwXWn5WHa+c9w7Nr30sj0t6ulQM+e+sZBTAHJjBlSTHG6Z4WbwmORYsBzJ9/mnvAG13tpv/zFbu9+PiMEy+hK2Nx/nOHTr+Y3HQhpUyjrdlJrGaiIIkIy+7M8ue+pkohShJVM4rOMhhHYLfeMFM7KgdVBMaoqURqkCqkqyyCwDRw2aEUzveMtIxoGKPutd4P3BsAtix6RP19jaq430m4al1DmVuvxuI6v0Ps3xZ5Szk/UmrLMJtVh1yjnKXbj74QS0dH3BBUFsPsJz5CkOk1MW4LFxiIN477X3Z/kNUfZ3567MpeKi4Qu5MVSyHWEoZT8Xf1Hmbu9lt+RrMpW/MfI0xZTrHJjwDYjXoqV1bW1KV0ZIoPXi0OswvAW6aco6DKgnpkedMhie/4tAQ6hLNZxVx5XkjEQKwCLQJh0R7iUHCMZZW3FXeuFP+O2mh250w3j1ZPpTpObqZIw12EpVSZteH4mneiA/w1veO4J2PrQvj3EiiEkFZVKhvm0lWmuomFypamknx4jrXUdIw0kjk/TkIp9UFiYb9gEIes5z/wigeFNDlD2QAzYAEyPLxLq5CTfOY8g9giR1NaEvd00ZFe6IiZ5xx5xcfnWRIOJjrtEebgBNGY+JnBcIPOlIVrUJWSa6JcJd5T5arxsqKH9aqr20UJVxl9J4olK3jiYAiG+xzeyu9j9l/EypK18I5Jths39FOkeYO8ZV482A==|920 \ No newline at end of file diff --git a/Pages/c273b140d3b24036903f81cf5f56c0f.json b/Pages/c273b140d3b24036903f81cf5f56c0f.json index 8edda22d..0f93204b 100644 --- a/Pages/c273b140d3b24036903f81cf5f56c0f.json +++ b/Pages/c273b140d3b24036903f81cf5f56c0f.json @@ -18,7 +18,8 @@ }, "3": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0 + "DesignLengthInPixel": 20.0, + "IsHidden": true } } }, @@ -77,7 +78,6 @@ "DefaultSize": 12.0 }, "Values": { - "1,3": "新建列表", "1,5": 0, "3,4": "%CurrentUser.UserName%" }, @@ -91,12 +91,12 @@ "1,3": { "CellType": { "$type": "Forguncy.TextCellType, ServerDesignerCommon", - "CellDefaultValue": "新建列表", "SavedValidators": [ { "$type": "Forguncy.CellTypes.Models.UniqueValidadator, ServerDesignerCommon" } ], + "WaterMark": "新建列表...", "CommandList": [ { "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", @@ -114,6 +114,14 @@ ], "ReadOnly": true }, + "DataValidationInfo": { + "NumberType": 7, + "FirstParamValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=c273b140d3b24036903f81cf5f56c0f!D2<>\"系统通知\"" + }, + "ErrorMessage": "分类名称必填，且不能为系统内置名称" + }, "TemplateCellSource": "分类名称", "RulesGuidList": [ "988ac8ee-1e7a-4933-96c1-ff79830e77d4" @@ -125,30 +133,31 @@ "$type": "Forguncy.ImageCellType, ServerDesignerCommon", "CommandList": [ { - "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", - "PopupDisplayMode": 1, - "Placement": { - "SerializeProperty": "=c273b140d3b24036903f81cf5f56c0f!E2" - }, - "ClosePopupCallbackCommand": { - "Commands": [ - { - "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", - "ConditionAndCommandPairList": [ - { - "Condition": { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", - "cellLocations": [ - { - "SerializeProperty": "=是否为确定" - } - ] - }, - "value": "1" - }, - "CommandList": [ + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=c273b140d3b24036903f81cf5f56c0f!D2" + } + ] + }, + "value": "系统通知", + "compareType": 1 + }, + "CommandList": [ + { + "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", + "PopupDisplayMode": 1, + "Placement": { + "SerializeProperty": "=c273b140d3b24036903f81cf5f56c0f!E2" + }, + "ClosePopupCallbackCommand": { + "Commands": [ { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", "ConditionAndCommandPairList": [ @@ -159,104 +168,136 @@ "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", "cellLocations": [ { - "SerializeProperty": "=选择项" + "SerializeProperty": "=是否为确定" } ] }, - "value": "重命名" + "value": "1" }, "CommandList": [ { - "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", - "PropertyItemsList": [ + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ { - "TargetCells": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=c273b140d3b24036903f81cf5f56c0f!D2" + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=选择项" + } + ] + }, + "value": "重命名" }, - "PropertyType": 5, - "Value": false - } - ] - }, - { - "$type": "SetFocusCommand.SetFocusCommand, SetFocusCommand", - "TargetCell": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=c273b140d3b24036903f81cf5f56c0f!D2" - } - } - ], - "ID": "4beed9af-0aa4-49b3-97e7-8a9af97c7f84" - }, - { - "Condition": { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", - "cellLocations": [ - { - "SerializeProperty": "=选择项" - } - ] - }, - "value": "删除" - }, - "CommandList": [ - { - "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", - "TableName": "TODO", - "UpdateType": "delete", - "ShowConfirm": false, - "RowsToUpdate": 1, - "RowsToUpdateCondition": { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "TODO", - "ColumnName": "分类", - "GUID": "5576f141-930d-4621-8551-5039c2e8ce5b" + "CommandList": [ + { + "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=c273b140d3b24036903f81cf5f56c0f!D2" + }, + "PropertyType": 5, + "Value": false + } + ] + }, + { + "$type": "SetFocusCommand.SetFocusCommand, SetFocusCommand", + "TargetCell": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=c273b140d3b24036903f81cf5f56c0f!D2" + } + } + ], + "ID": "07ccd2ee-b36b-4840-8339-8389a8e2ccb0" }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=c273b140d3b24036903f81cf5f56c0f!D4" - } - }, - "NextUpdateDataTableCommand": { - "TableName": "TODO_分类", - "UpdateType": "delete", - "ShowConfirm": false, - "RowsToUpdate": 1, - "RowsToUpdateCondition": { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "TODO_分类", - "ColumnName": "ID", - "GUID": "b867ecae-dca8-4e30-b367-56811689207e" + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=选择项" + } + ] + }, + "value": "删除" }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=c273b140d3b24036903f81cf5f56c0f!D4" - } + "CommandList": [ + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "TODO", + "UpdateType": "delete", + "ShowConfirm": false, + "RowsToUpdate": 1, + "RowsToUpdateCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "TODO", + "ColumnName": "分类", + "GUID": "5576f141-930d-4621-8551-5039c2e8ce5b" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=c273b140d3b24036903f81cf5f56c0f!D4" + } + }, + "NextUpdateDataTableCommand": { + "TableName": "TODO_分类", + "UpdateType": "delete", + "ShowConfirm": false, + "RowsToUpdate": 1, + "RowsToUpdateCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "TODO_分类", + "ColumnName": "ID", + "GUID": "b867ecae-dca8-4e30-b367-56811689207e" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=c273b140d3b24036903f81cf5f56c0f!D4" + } + } + } + } + ], + "ID": "7811f55a-47dd-46b4-a1e9-b20f015eec6a" } - } + ] } ], - "ID": "9596a74b-9454-430f-97f3-9df4338b5a74" + "ID": "d87ca3d8-7529-4134-95a1-654d947d5e44" } ] } ], - "ID": "a6335d4f-136f-4602-a3e4-4d4ec742bddb" - } - ] - } - ], - "ParamProperties": { - "IsOK": "是否为确定", - "选择项": "选择项" + "ParamProperties": { + "IsOK": "是否为确定", + "选择项": "选择项" + } + }, + "PageName": "列表菜单" + } + ], + "ID": "97096133-2ae9-436c-b5a9-8ddc71e63cc2" + }, + { + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "FourStandardStyle": "warning", + "Message": "内置分类不可删除" + } + ], + "ID": "9e71149d-437f-4084-992a-c17913458652" } - }, - "PageName": "列表菜单" + ] } ], "ToolTip": "编辑", @@ -265,7 +306,8 @@ "UseCellForeColor": true }, "RulesGuidList": [ - "83c23fad-d233-4ba4-a17f-f26c08c386e9" + "83c23fad-d233-4ba4-a17f-f26c08c386e9", + "bfc03a98-5bd1-4935-8763-9585b88c0496" ] }, "1,5": { @@ -342,6 +384,22 @@ "IsDisabled": false, "IsInvisible": false, "IsReadOnly": false + }, + { + "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon", + "Formula": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=c273b140d3b24036903f81cf5f56c0f!$D$2=\"系统通知\"" + }, + "Priority": 2, + "GUID": "bfc03a98-5bd1-4935-8763-9585b88c0496", + "StyleInfo": { + "Underline": null, + "Strikethrough": null + }, + "IsDisabled": false, + "IsInvisible": true, + "IsReadOnly": false } ] } @@ -350,4 +408,4 @@ "PaperSize": {}, "Margin": {} } -}//Hfa5Jp39CWC7Gentku+b+ksJ4FdEJAAKiS53y0mqjoVuqKvW9UnpgIuATF2xmQVlPhtVEjFLAesmCR9k7HtOs4w44YXvalWASNcAlqDAZLP9Bgww2kz/txAQlc213p/9QL0NA8NnKB9ssm57NuTm/ZNYTEqSA3942eWNTjcNuneVYZujNzGoxBhAkp10kB9j0mUeGCN+MaruaM++d3UxvqlcPcd/jAW/LQ1F1WyEnI63pgAlXgvEFwOOpFQu0Hf4idp5HOT4q85/RHcyslmh6aprQrzVGHCNuJOYD4YURye8rqa4qsznSlVK22c3XU2VQLRn2IndrqBfqeF78Eu74p+PKi0JQCc8waSAOlqNc4gjcZ5li0SaxTr89pFCDD9Dl2Z6rBvw8mTbJc9N5+R027YQ8BQXzX6/H3ZA7ysh9Vk8Az/WiGEjhneqJYLT5kBB1aGm2C8devQGwJ9Pzue8iOLBZ1mg4JBn2Nr6k4+fPV6KI5P9EkNgUrSyzyaATTjnWrK1tjTTiIJQGfw2ha4GIs52eN2Z+gVByHvITItnd6wty7LyeWWZzAhjWoDlHaLt14yiHJjqXnBmnIh/36LAYKG6tXHyaY4nCrylZMk1j5bnZaIMzbIubUXGeEGx4Vaktc6Ww5X2mmzSLIalezhaMfjTr8lkbxHVIXsNzjCphgpKOSYt/ZpmmUz1a6ZYPE/dRvmLLTmGEq83xg0P2Z9nb5coyKBwFNsNcdR1O1+iUEIz/X/Dm1LBg0Qz+hGjRCxrJcuymJtjtq6LUggMWXg3lv113TliEtUJgSNwu3gsI3/bJS6+wNqZ2KZmMgT5ScYQbN69EUcJDF70HX/R8nq7XyFiL7EyJqTtO0kkYNOEjemENamQIc2yiWw9NUQGac3eGJBt3rqdbj2nXR1k9TpArw==|920 \ No newline at end of file +}//ItNmx7RFap/gcrOiKwgCFSd2M87R/PQOr7dXZq25atcRNl+uOHgqF4nFqDHevp4OSB+Ah5lV2gOEY7UXH8j/tr1veMY6eR/RVbGE3rSXpM73cgWU/TrNOzr+oGa0xuY8Nxn6f68nbX1VcSwbZyc3bNG6DjTdi4nuVpUUFWRdw9XV4m8tM0Lu1pF5CcwKrKSI/MQ8jifZjo8Sv9SmwkGa1iJS91QawjHIyq1ZN87mTW44riTolsk8hLE8DpS0PxQhUePFtlvodKzfHdVbanLmZJnLU8oZQSljv2cDfwDevd6PvbSOCbDc+fw2EapaBacONq3C06ZC67t9Kc6MwIyL2qcSZXSFkrZUcap5KRRn7IpwAVXUeBrPjPqgB3rtvu4EamD5Yuk8XsarmkHCCRJ37Zz184DFuW3f5+dGfyi5xkCg7Tr6db4hoUvP555vPWj+stEmXgARyvs1ttaUrNvNT1+sRd7d2hu/IKB7snQMpC5DwyycE5nUy4woOo0+xf7/eCWq1zKTB87rqlBMO9Umx8KMyokp8AA/OmNNAYk7ijLGABBbaFHXyNhA9pnYR/T8aPRJY26h5YAiRU6C6ArZh/2n3E8y8B3foCyofeIFemJiumyMfD0V/qZi7GETmTfxeaqsCYnSdQJqZWq43V7k2lwIVAeMSl3Kxq+l0YOhxwnpwrP9zL0sRWw/LRPm13PkIdFrGi7mBOl6wyIm1KzBtkjawCr+KPQ4hBRPWNu/C+jWD7idu6HXWJGkgVCDJ8oIQ/KDhSgu6FAHTo1gmm2Ejbvn/dTa6fgvZfn2B3CwqDQe/nOD0FD8OlrhA/zKfnw7rBbhC/yWnpt3UEYMtyG6j84n5PYlzhoklZ+HKrfp7d/OQc+iFWmAReJ1t4W/LhnzE0OMQiSXPcpGww8UsdMO5g==|920 \ No newline at end of file diff --git a/Pages/工时/个人工时首页.json b/Pages/工时/个人工时首页.json index 032001cd..849ac8c0 100644 --- a/Pages/工时/个人工时首页.json +++ b/Pages/工时/个人工时首页.json @@ -419,15 +419,6 @@ "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", "TableName": "View_任务工时统计", "BindingInfos": [ - { - "GUID": "d0dc8b54-22d8-4e76-9f6c-6b9b8fe442cb", - "BindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "ID", - "GUID": "9762de83-e504-4560-a886-e34b674c76d0" - }, - "ColumnName": "ID" - }, { "GUID": "b116312e-7c44-4481-849a-029ee025a685", "BindingInfo": { @@ -505,36 +496,17 @@ "GUID": "f8cc3269-2ec9-497f-ad59-37421f697b2d", "BindingInfo": { "TableName": "View_任务工时统计", - "ColumnName": "实际工时", - "GUID": "4f714ff4-e7ee-4751-a697-d9f1d490f1f8" + "ColumnName": "核定工时", + "GUID": "a958bb4c-a4cd-4a56-b7a0-89a6e4fc5f51" }, "ColumnName": "核定工时" }, - { - "GUID": "2821bf03-b994-463f-b264-44e5b19b8b17", - "BindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "请款单ID", - "GUID": "9f1e6a2f-a8db-4fba-9aeb-fe80cad985f4", - "RelationBinding": { - "RelatedTable": "收益请款单表", - "RelatedColumn": "ID", - "DisplayColumn": "状态", - "NextRelationBinding": { - "RelatedTable": "请款单状态", - "RelatedColumn": "状态码", - "DisplayColumn": "状态" - } - } - }, - "ColumnName": "状态" - }, { "GUID": "bcb46917-c728-4c59-9aa6-d08fcd24f112", "BindingInfo": { "TableName": "View_任务工时统计", - "ColumnName": "计算提成", - "GUID": "bb07213f-6e8c-4118-88d6-af63de028874" + "ColumnName": "核定收益", + "GUID": "eeb3851c-bdb9-4290-ab51-4712534c1ebd" }, "ColumnName": "核定收益" } @@ -1119,4 +1091,4 @@ "Formula": "个人工时首页!$F$11" } ] -}//Yx3HaerXWisJ+2dlFycI2X11LihtZ3VkjfTX+GCiuRvm1246bJHxJ+dB/chipB+9oOEA3ViOTS/LBNsVz3TXQ/BX9aF0xf5SWcptjbD3EQt1YWoUxBKPxgU2Gj4SUlbLyZ1/SGtKmcg8WCUaQ36lVaohi4xYWAxVTxltf8wzSCucFqTnLXARZiunV35ULd3nvDQDgq+/3RvvAZgzlrtjrsrVR0kNwwy4HIBSUAYtpOnf58LiqOZFmZ6XHeN2m+I14MxLND5gxNkLW7eY/uRvi5XexOw3ttOKm3Z9ffrEWFz+5RvyGuE4xv9GmlibKI9WXou7oxr97qxoeky40Nslvvyf00J9+Gm1YqIekXYJSu/l+ZT62wkmIy8VJrT0AYNTy7uxTI2FPbtgcWRnh1QxPh4zOglAw1hG9pW1hHPrFlW6AYZtr7xwL/uR7FW7OjSbfQ2mVZw5y36jAy0HhV0+FiIWkn9hiSJmakoBCcax5H/p/EkqnjSzudcF6zsakERWs85fTGBzOTixfkIzBYbYHjmTLxg0d74+Z4GYYndGVhkRsxz0i1VeDEYm6XLDRRE3nYfhF2l/QLuUZsie/pq9VIbw89E8Gme+FFiGlRH/FL1QPBLlPF4Wh/yU/BtR1K4Taf3mLjfbAVJcIz6zy19RCfuGzzJ2gsWytUG42z5fgI5C2fL8hhHKNmRvT6v1b+7JnDpa0iipVE6Fo2Tj6Hah3yBQ0x/CUDWJ72PyAjpxgP7P1jtIb2Lt8J94M+BN6T7rn9XzAds6+bsP60PGuOjNYshjC+GF3f3WyVnFb1rnnxDk4U9b9ydA/F0EYDjgly4tmH1YUgOCklwQwNaARwHbJC0FlWgmZnpPjAMaN8bzzPmCJEFUmRamKMU+H7xPvPzBd3BpdCErp9AW/FIo+4tLDg==|920 \ No newline at end of file +}//5NCpcG9Nfj/IU7uilvk+XDf20Py0xSxKLXLChSUhA0qvlB/pn8wXBGY6YE3HztLghqE5QMqBnO+YKaa70eh/zc38Zo8L6wHcgxxx0DgntZHxP8oDOfUwlLIC/jH20xgfRuhBMnrvzdq91QEi5gN0otzJ63dKUFGjw4RZuaWflTmi/4XAImXt++sDVJSZnoW3ZS+1yUO9bf3HoDSg3w49Qbix5To+ULXGRPVyIUCHub7D8pDDA3kcxP/WComJOLKrMW50Dae8XstY0rhzg5ZoyRaiIKUy+yfuQgTRnCUMfGRDr2HEtKsJNAYzs8TDYHdeAfRJ9VE+J79THPqv9hjMLOWKgsoUFDeZNyDiFDAFzB8isGRWg7mEw3YjkIX9MVzgYLPAfPWuQp/xJks53teeJLXwq0KtYGS8Y0PfI9VSiKEVqjVIHjyamUZ9zytN+fiUOlG9M0hFnlBdTUsA+wGAa1X7ssZ+qokTZLqHcT7hebmLz3ZvPFPT9m/AOkqv7xwzn7w4U44CiapuV3kSW+KmVLvYm7AIBDTr0kkF9ywDYzialQ7oDp/aBENMW2TiQRsvXkIeNukGXuUbQMK9SIkPh/6P3Ksv0V/4fibQSZH6aVFdguUOoADumWsz/Ndo96KFn7PQQM7K3bX1uf9+KsDhJf87JLr1KYti8FK4Dht8fOMHovCk//0KkR3u2iQ8U5RZwKZsyG7TLsmV7esRrXjw4BJEgTnE0HNhGwVHMS5vmhUzg0mQOPjYY7LbzbwcF9qZYDvM6DLekApiEIoB6nT1smYpjL6sLaqRjLerlC1Oiiwdo90dKRsi2TYJwKs2RP2YUN8iHZz07ZPvKvtcAZExFOuD2+GhnTUPElpRbpx7kPLnyuh1u3wS2eK2bVU4Mbkne1Khn5zPZ8QfsuvI4o/OeQ==|920 \ No newline at end of file diff --git a/Pages/工时/任务工时统计.json b/Pages/工时/任务工时统计.json index 5b436da5..034c291a 100644 --- a/Pages/工时/任务工时统计.json +++ b/Pages/工时/任务工时统计.json @@ -496,7 +496,7 @@ "BindingInfo": { "TableName": "View_任务工时统计", "ColumnName": "任务ID", - "GUID": "f1528479-cac5-4ccd-9029-eaf6d58f6adc", + "GUID": "ca097741-4170-432c-9fb5-9fa9ef563ca7", "RelationBinding": { "RelatedTable": "任务平行视图", "RelatedColumn": "ID", @@ -560,7 +560,7 @@ }, "BindingInfo": { "TableName": "View_任务工时统计", - "ColumnName": "总实际工时", + "ColumnName": "总核定工时", "GUID": "363a92ae-8ff9-4dad-9bb8-534aed6a9b7c" } }, @@ -657,17 +657,17 @@ "2,26,1,3", "2,14,1,3", "2,4,1,2", + "2,9,1,2", "1,1,1,3", "1,4,1,2", "1,6,1,3", + "1,9,1,2", "1,11,1,3", "1,14,1,3", "1,17,1,3", "1,20,1,3", "1,23,1,3", - "1,26,1,3", - "2,9,1,2", - "1,9,1,2" + "1,26,1,3" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -693,4 +693,4 @@ "PaperSize": {}, "Margin": {} } -}//HDhGlcSRf6AEDpCQM6GqyTpwzLY7BObEpCydlZmaN7qBHSdgmukgtJRZuDem6Ra2O1DdI3cV9A0mOcSe64OO1kWraCelDWg8uG9wD+UyZjvfHKbsiHWDu4Tk6+Pp+sGuqIQofcKxm4Fnb59suAhqvvViJ5z6tNMVPFHH6SIqMxqrHaMfVkaq3Pj5mwRn0TPHgfI9dVAawQW2sTzjpFd5TT7madVNYXWfkk54M5kEKKcoeqSgrIaueuoUquqgA0dfGrdcsQlDc5IZxvp2qXm7kc9fBBncB72rvWugLZIlhjsAwEVW2+w9CkbCtQwHjoJO7TqcpyefI/TAAYRfUIOXfvfvsIiFFg16BbLC1ATQ6yj86ruXjpWZTZqWHDBOtnZlSoF8Cl//sxQJAFDNHx3Iz3XTRrLeP4sYS2rvjyOrWEI+nUkEUDpqaFdgkWqB0eRX0fpd5eB6ms16QFzGX0n0tTpLd9MwpmQzrU5zahYOPeIFwUfNxUcjuaSuTWzocUMAjjn/WOsjAU9ibiyz1r83Y4RyWpnJjT58xSaDt2M4Xy3pCXcVb1X1a5QNaoAcsFJvdJASaRg8+X6eENHjXVbYZA2FIU0sUt/4KGSbTyWJab4l8vdRCedf4kXdqsT3R/vt+g/gJDzPlZmBwMs1kp0YL4QDwVQZpT2mT2IPBZSDY+BY+iayxcNO2u+dAypckzQdXAPbPi/Kp12Co3AxiMmcFQj2R9v30FniXDly+9nklphcFG1/LnaYrkIonniNMbludnSRcTlip4m3Y2Y6tAJeNFUyWRM8KM36TcgHfHxw9WP7EDBwnTE2MTm4yy7wF3LzJD15YOCLKGtX8Mt79znHnFPZa3lr0h9Ro+II7L8H56xJmUf01uWGDEWfV4n4FUW9hWn9uyomRQn/aL5cBTO1zw==|920 \ No newline at end of file +}//AnJd2wnQMtuIEZLGJKf6ESYmxgQlMbzAYEku3R1p+BNNIQuYBIpBCaHT7VX66czhx87C+0BcfYlFBeUG49NEIIq5ZDz2juh/1nueZ6HJCpqkO3pZeQ7Yo/TbZ+SH9lN9wGFgWm+WrlzQMbLDOQWpWIH1IQNWjt1iq8FoSbTJqveW3QwnId2AiJc4StcPLm0AXT9gLiVhgs945SEf7s1K8/ull4+tq3ImIx5nqCKsaeTagVyHLIMFjQ24/l11mTooIuCbzXNarrfJxVp2wvzTq2N00x9YwZBsDHAuSWjz1L6puuFKJpcXqtcllOtz45wFdS2E+0+LE4Vzh9N9mWrbdcQko2Q0hAfCvpUM/ehgoIPZLJRUrHvzd23sgdp2Zjztp30T9YynyUK/aZBs4HvuUBq6HI6eiPctUDYTK8HaZb1ca62S2oD6iKkw2+inZeZqXVW060DwcHGHfqzJb0YtQ+3B99G///kXP5iJZxdPWbs0o0j4PbWYiYExpbnjTX19FR+dkGcSyKgRLnMHxR4qT9RB8N4vBVZcuT9mcviZXa8ZVMbDaGZfuNn3Bwp0PtLigt+QeuZE2+LZmnxZuYRnwP34pBZw5OfJxGX+gPsQt56RawqoFC8Q/QA4hGKYAY2T9OCdPVzH49blWP1XiVa3LgvZ3G1WANvqz0LtHuN+ti7f/ZkBIgWITrYeYaNqmr2n2UzGSOV5b19dtfXJvVmNFPXjcvXr/WOXQ8VwJp54/L/oAG/g6HfrbnukMieBU9Tm+vO1TjkOX+n20bsZpyI3hm1rC4Z0+Iae46uYYm554Bn+HbOOSILAhAGH8tS7qmFTkfYKDAu0uo4hzw/RlFx+yEiBspvWqpL8gbphzSX96SQ7XWgv+YB9r2UEe9kL8vuJ2+/HSvoBBIBpPqkTu3SoPA==|920 \ No newline at end of file diff --git a/Pages/工时/工时总览.json b/Pages/工时/工时总览.json index a172ff3a..68c451fa 100644 --- a/Pages/工时/工时总览.json +++ b/Pages/工时/工时总览.json @@ -338,15 +338,6 @@ "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", "TableName": "View_任务工时统计", "BindingInfos": [ - { - "GUID": "0020629c-91a8-4450-b32a-7e3ab1b88683", - "BindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "ID", - "GUID": "fe80e481-3c55-4e73-b9ec-cf66a5094440" - }, - "ColumnName": "ID" - }, { "GUID": "3ffc6557-519c-467a-8ea6-e7dc44a6fbcd", "BindingInfo": { @@ -437,8 +428,8 @@ "GUID": "976acc90-73d8-4e7f-bbe8-19f6d5170d80", "BindingInfo": { "TableName": "View_任务工时统计", - "ColumnName": "实际工时", - "GUID": "eb4a7c0f-e788-45fa-9157-1d33f0f823e6" + "ColumnName": "核定工时", + "GUID": "c0c5f87e-a192-49a7-8e38-61519cfadfe5" }, "ColumnName": "核定工时" }, @@ -446,29 +437,10 @@ "GUID": "2a97dd54-f2d2-44e7-9758-cb2e1c24e73c", "BindingInfo": { "TableName": "View_任务工时统计", - "ColumnName": "计算提成", - "GUID": "2eb14824-8795-4912-a445-4735de12d692" + "ColumnName": "核定收益", + "GUID": "38e42d44-fe33-43b9-86f6-5f181c7f0f12" }, "ColumnName": "核定收益" - }, - { - "GUID": "b7dfba01-e0b2-443f-bd5b-bdc169497382", - "BindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "请款单ID", - "GUID": "a6efef98-705e-4ed1-9032-74360893f2af", - "RelationBinding": { - "RelatedTable": "收益请款单表", - "RelatedColumn": "ID", - "DisplayColumn": "状态", - "NextRelationBinding": { - "RelatedTable": "请款单状态", - "RelatedColumn": "状态码", - "DisplayColumn": "状态" - } - } - }, - "ColumnName": "状态" } ], "SqlCondition": { @@ -905,4 +877,4 @@ "PaperSize": {}, "Margin": {} } -}//q2ktkKvFm2ZUMuMIpTDDMCAJGkpbT2mCbBh5nQ5hJ6trQ+OqdAYHfFhtxQnReWYnL6JaJb1uQ1OcywBg4S0iH+5GmG/Jz8yrVhYTVQNgSe92RqOnyAamYJYfJBUrx/ot2Tv3ga1fGUIxpiSnhWypzBOeGfphqdnkiwGHA2myMA7a/C4NLcW0VWXm9AHyG2yO6cbzAih8vA1aytskLKUaZNo/W515WPkMkLvoOKOL2NOGC47ei6mC2sLi+cUvbVUfJdm1uIbiGnTxBKLzgcWQwXogrHZATUbJ9Cj4ASNTHmidY7j90taIrVqy3p8O/VnB0bX0jHn2r+/oOXEw+TyjHVBbCPVtHJv6Z1GildSETfOHIZSlwabQ6ZKDhAAGZBMQsYvUcWBYkDcoN7jUlvUMyyXgafWwWATVl5Kn5n2IlQdVkp9/Zyk9gdoBNMog5UWR/Qk4m6TSDngP/uEXKXaltzCAG2jspTi/BS4nRLrTNtkttnoywQreIbf0AZ5Eg5WaDFRtg+9CM+CgKdkAUmd/VyAtF0zxESVDXVsSofWF0jTCJECCag90iWb53Zbpre5hWcYky8BVa4OTncp3UDX29JLQY24+ufqE4L9xml/Lc22m0eVX0XFy4NowAooYnuNzHCOqaQVHyLmjOMRLqtmfOSfKOBPvHf0Km9JOku4AFHztOHjT1o35B8gB7XZiXeFq5/YzZvDuKOg6wWlbFv1n9gchcxfedjyAZyv6op0NUi2iOxWQFL36mqtJVMUxXsEOhZ59iDS65tWsq4+YDXzyGfnCBX0k42x6rvrgwJ4OabHh5Jh8tjLTg6TJQ7/kvAbf9yZk85QjzGm0Y3p4dBujO26zy0jm974lso/Ij7KGpy0R6dRKuSBAjzA5eaEAaCVKhRBAwX1kyviK/DJry1J+2A==|920 \ No newline at end of file +}//8/lFA8gtG4Wjj6t/G4Gers7WqosN+myk8XHbtKjbS3v/F7wqWuK1L0L98Zebb7I/H7vgto/K6peRNGfa4RYsvBYp1W8eJRar41rq+UNdH1S2a7mUDG0Y2Y2XGiHzAeaG9ZYiOq1iFKjNAnTnou5ZPwbCxxPP6vU8VHOHyOYuZ8hPfa2mEcQzfQEuOWtsjwCjEAWYGnyb2BnaUGTHgtnGVnIj2ECEkQyfjkxsfmf0EimXz3l7OAxZh1iMalyh7nxW0PJEMNf1qoR8nOnZXFWE+GUTsohCMpkBaURa5MuitTzRNokdXGlMWWPzqpzcuAQefn44uGslqZRwM8usYUL6LZcVQGc10KvVKTyO9pSekEFfTWLYxVbxkjgHLo9WBH3Hb5A637rdtYhORrt4rcGvFzRlVTbcs++9hOLJPTj9q0rvPrp+wC2cQ3c35ss5khFiFtHEz3SKek7KIbY5ixraoLNeO/9jbPwNNvIySnyATZettd+DSOw9l6bAaegYkN68PJlYE0wQAz1pC4A/DBPYYZZlEELC3gCBCLBRZ0nunxE0n2lTa0SYMZojMFPM7WhO87eWLjfbSVXHAZL7wSaGdoeD/FsfDltr84XLKXlhzaCuZmd6wx3Ax8oYpWbv4Qw4dXF2E+Z1SyvUMEvObD1i+Q+KCl+B281xAnBuyeJKacEYvXF9Qn0MVM9WOTWWT08vzhVlgx8lckVzZ4Wm9xZHpsT77oLIsSY067g3dU+Vu5bQExACjjjcWsy25JxElvZcbI1ne57yATaGAoJtJvzg2Iky+smbl23ArFOASrUYzPBDq3HJb8RARnqsZ3yrwAYq0HrYrk9fxYXolyRTWglpA8Iw+TkHWGF3DJVny2vsuK+OhE+ONFdV1sm8SpElnrB0+Ad52Xh2oa3n8pTyUhlceg==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/工时详情.json b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/工时详情.json index c09ee1f2..47851031 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/工时详情.json +++ b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/工时详情.json @@ -301,7 +301,7 @@ "GUID": "c2efb933-40aa-4dad-8fc3-1c7dfdf07441", "BindingInfo": { "TableName": "View_任务工时统计", - "ColumnName": "总实际工时", + "ColumnName": "总核定工时", "GUID": "f3031096-d234-4bca-9130-c455e8ca7f03" }, "ColumnName": "总实际工时" @@ -370,7 +370,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "02db7acb-81e8-4de0-afc9-0794c39ac64b" + "ID": "cbe09e93-b1d0-4cce-b7be-bd0b557f1f44" }, { "CommandList": [ @@ -380,7 +380,7 @@ "Message": "你尚未成为该任务参与人，不能报工" } ], - "ID": "dd422ce4-45ad-462e-8ff2-fa2b72a380b4" + "ID": "3f46914e-29fe-4093-8824-025db5eea0bc" } ] } @@ -436,7 +436,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "2f9cd6ba-4e5e-4907-96fc-76df69a87028" + "ID": "42615e40-02b3-4489-bda6-f5a90b75318b" }, { "CommandList": [ @@ -446,7 +446,7 @@ "Message": "你尚未成为该任务参与人，不能报工" } ], - "ID": "c2f5dcdf-9fca-4065-ae4c-7c6eab31c7ec" + "ID": "9dc52194-b130-4a31-a891-dfd2a1a36c73" } ] } @@ -786,4 +786,4 @@ "Formula": "工时详情!$E$13" } ] -}//pCtTG77pGQC1cIgwIR19G8W9DWu9wy6bjhQKf0tuwrBYf5UrC9VSR1YylCaey9wVK+d5dox/CGeZC0hrcP6KO86pw9z4RP+32epv5bnz9uTvDjgeVS/8SzL+gFaduajy5H8dkKZuRw+Bj2NMyXw5z8x2+J4f1gRvztSbNgXI1Xm44Jlwke1yyYt1IsI1Zwxb6NU6jttb/E0ASeGv0rJu7x/KTl0PiF9kOfI1bBkhDEa3k6lMEw1mY5pCfYrf7BWYGiN02uwTcx1311L3LLVkLzeUvZ1+bUfgXUpzGJk5G0f1FJTQm4YzDfYBA9Pg0cXtWzFnfjfV3bJMQAYFDf99fmDhGo/E+c6cw8ERzQSu6PTo40JgrXMZZEPHcZL5ZjNVj2i/INH5Nno+Otb/mXcUZQXFYFiWq5S7ev4JAHepstbcQpEbYuoyJYRaGIKma/H8CumupdCApo6gKvOVlF5LbvE7HGRAjRdn/4tj4w9Vo7an74fZBqzglSh8QAHn5KCT/ywp8JnA+HdoAyqeR7B0srqD2sgtc5kHQJPi6bm5dC0ctwMmyEDD4k5j69LDLsURoZcClIARE86xMQj2nyWthzJ4vpp/6551+wcECyFsA3NDl/xOXeeBSwuShaf7ppwfD4AgevfZKkt80/2vZnw7zxm2zubYKLG5AerjkKdHEMl1pAjPCoGhHuI7KMZG39GIAl/h8dBfAf9Qwa7DHBoOD1AMJYPHrX5JLkZai7mqKw8hlDUpQBIRX3ToDAmDayFlPNexKg75rB6wktfdwoEAo1boFTO0u3gxWt/vznxpQ9IOkrobQihXIiS9qn6W4Yhddz6WBRLhVd53hdKa8+VA1jN8FWSlGVSoFgtRCLqWR0uexrTb58alp6KZxM5CdDs+101UOrhLIOtBrJqQF5BmQQ==|920 \ No newline at end of file +}//9CrSz2ffdRp38ujSZJg28pO0RFgN3ImA/71Fa4Omlj85gW1vI6kn+h5YqRWhFSTWGYjm6vqcrR4fV+0jbCrqgS4gmnS/ljBq0x33yRMQFrmvL4SHuu1MSgQM030wftuP3aE7jRL5nZfScfP8yARhH/WDvUB1RGtJ/d54uxeYa1Cat+XgSc4GUvUIh7xfxPv25YYCHGsNY9Tk3NXG+X3bCHkZ3YBPETaIKOAOMP6XAIgm7zmsDrYEIl7f2ll8OXnclqEr3TCJQow+31Q3qCaS9folIy1JAhPEUAbVjULCsqTUlcJroL1jktD50gpwp5sI+rh0e135M26OgEpDO5TwnTmnmlrqAX4SWxhZykgqgqUMk+yhnLGaI8ksSXC1GGfipezw0rS8KYIdTYd6LRlUQ0F98eYT9SobrP5S6SiqktMc8LYkRQtAJLow1f/EcOxOoqdGFCzgmEln2npFeHSpiHuMqEOLmjvAiDwaYC3gMdHMq+I4iW6S1T+uaG3QTPIeJ+6JRNzflcgNAFvGqGWgwj0yCqWGpnerE77JpofxzUN0CO7l2YXsqN0kZYbk87GNYrZha4QKWWiexpCaolyimknrR1TP/whGtEcKiGhiFhScEtgyVDNm1poqbr8CH8N+Vr5H26HyNTK3dXfvemHgkCIBPZVBvpZkNUV4/roJMYbRr2zOUv1aGPuZ4GI+qu8Lzu4OJxiM4815jlHuQlfidssdPrEc9HJnd45oCdxuIH80y6iy/aLiLnILiMDX853QEKyHaFrx+ZV8upSdF5UpJ79b5zcU4O0dxxXZMtXaL8Hy8QZCmX5En6eldLlS7gEFQ3oqR74Uj3f3uRJit2H8ujvIfaTzp8Cm2hAp34kZjGYBkFM/78liKUqFWtyeXWw8VvW2hANiv3+MsP7VLKy7Fg==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/项目工时.json b/Pages/项目/项目首页/项目首页-容器页面/项目工时.json index a9557ea0..0ead8a89 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/项目工时.json +++ b/Pages/项目/项目首页/项目首页-容器页面/项目工时.json @@ -406,7 +406,7 @@ "GUID": "d5b407f4-0a67-4450-b2e4-8e5a8d33904a", "BindingInfo": { "TableName": "View_任务工时统计", - "ColumnName": "总实际工时", + "ColumnName": "总核定工时", "GUID": "02533bb1-24de-4df8-b6a8-6ceec8a1fcc1" }, "ColumnName": "总实际工时" @@ -429,7 +429,7 @@ "ID": "6912426144fa4151a7665384b46d6a22" } ], - "ID": "69d82f8b-0a1b-4de3-a523-6b3d4b2c56af" + "ID": "472ebd43-71e7-47ba-a5fb-07080c354808" }, { "Condition": { @@ -478,7 +478,7 @@ "GUID": "99624952-d6e5-48d5-93e8-dfe0bd167496", "BindingInfo": { "TableName": "View_任务工时统计", - "ColumnName": "总实际工时", + "ColumnName": "总核定工时", "GUID": "d7ec7d6d-9b75-417a-8757-a5de515ea460" }, "ColumnName": "总实际工时" @@ -501,7 +501,7 @@ "ID": "4a25d702e22141f495cad5baf9ff1a9a" } ], - "ID": "a7368e41-4af0-4ffd-8d42-210c295acb26" + "ID": "b0208333-eb9a-4f2e-9758-d775336bbecb" }, { "Condition": { @@ -549,7 +549,7 @@ "GUID": "2feb799a-ebe9-4aa1-822c-cd5399af1bf1", "BindingInfo": { "TableName": "View_任务工时统计", - "ColumnName": "总实际工时", + "ColumnName": "总核定工时", "GUID": "0e51eedc-dab5-4e3f-8ad7-b9d0dd7df5df" }, "ColumnName": "总实际工时" @@ -571,7 +571,7 @@ "ID": "e22633b6551e4332ae99e03268670571" } ], - "ID": "e16a8371-af72-46d1-9595-a627fae8df9d" + "ID": "3d1168ac-052f-49fd-98c8-d57d7d8882b8" } ] }, @@ -1090,4 +1090,4 @@ "Formula": "项目工时!$B$6" } ] -}//dv2S1sexC9q9M+MHwX88jIdhF35LOj+iv5li+Gmj28bSLXNQVjTpp/PS77CG6zel21ioUi5dygT5phSI9bZ1+OfD0ZM++N8MFRoOQBneZmEf03ObdHte6IhGlkW9zI6kloHxBhGncNrZcySUDve103kBKSCn2SYgLy+iNUWRTcelnBpvDZql1rVgDckIM/+bPOIgFPvXTGLS6eY2DAUy/LOMz7w755o6HHVZkrFDpYmLXFIrxgAVtwBzYhxUSiKEF/47nZv7Pg0rIrvLQoEmmTuR7iXrPr1D84uaKu7KuvPe0LlAelMV6SOA12y8J4/pcDpDZnRKLNplb42sW7kvcmZCCmvjv8lmgOnNhJYrIsNOEQPdaoQ9c5I+3dpEok07pIWFgvmbaIX/i9zkBXU6SeVxkrvVZcK45c8PBe9QOaPlpyNRx+i67DgjDCm2752xYdExRvjZDnilXBg2ZVzc2ULk71/bNI0WAQbTCC+DpnGF4jvB9TC/08SBZDGSif/5YrZosJNMr7AMVL6PMGKx/fIuALRmAMjGcQ0udAz1+Psuwk04s0DYmk55eeHb4pl3GCmruvjEdua2xmuSMoSOykqZOdGAoecE7YDbmLr0mtcimY9duQvSqlIQb/4Iu3oe26wuDfDsiWppnfElOw3mo6QLiBSF++EmcV53TwgAjxfR4fPNobft7T2gKSD+PuNuWOqhOXdM4Rqa6hOW0UMd9CUQBUqag/aPgiv8Sn6n8GS+7iK+TYP5CZhiaTH7bLl/r5dp83KXa1D+oulRtrwftZ/S83DZ8xvEsXngqxQy+UUAzJ6fRDbbtJUdtR0yEJv5kaJJoo4K6cdPMsBn1lSpL4K2dTsMAUnAJMGGruWwYseNbgI/2AmlxhQudf/T9Hu1Q0KCH69211/ONWbdvY8fNQ==|920 \ No newline at end of file +}//mFVTrOlVyTqU+WOFXkeyiXwQglhxW8NQt8R9GfxfRFhga0iV75a9t29oac5X4862C365l1siPZn3YcT1OXKV+s5qx21m50WTHvrrdgG+siPaOQ6CnfRF8Kt31KPZOh/s/3965Z8DOvu0/j7o8m3e/ESUj0RgFkCq2rBI7peEMMCTFLIrnIGiQII8obpADDuN5TmOjOgBTsoMn0F9BAEV1vgGx5igVwSCXkedRBw2HAPFjFyOUnNYT6c8SThXwVrQsdgKl/NubGOfR+/WoDDfSWEuL/v/Ivri6wPDQn4ewP74udAR+YDU3QqJ817NsedilnCKIodQ8ScM4wUgKiq0mM7AArRfM7uEpLgI1kYXKAA1XKbSNQwU9FaNY/dt7srgBb/egoK43nvfxJxHRBR2OnYLhEF0SyUL0TIUfhEPNmzDScPftnRd93Qx+F/IOqBsTS8Hgxwm/uu7tzuO90qKGNnj85sCJsYNlRXNVYGi8ujeNQl0xaj2D/i04wevMhhl+H/11gQuSOvVu84L7+nlnPN24hhAdLBJxl4zsSpBmig52pi083hpdxO+1oMJqzZRHlwL7FmKCqx5/Axmlco/YyS3y4ayFQ7+7zUPj9W0FuvyWSlu61ctZwk46ITOS+oIZBYMYU/SG/J1L9Tg2Mpix7m5GeaT6hg/9fS76p8wDy9+7mI6bDEObGcnjFGALi6DgxV8zOBqN/acEJdPm7jC8R8a2svB0IXZ8utpGZVFncTuVz0S5ndvpKpCMeRE+BoT668HQya9KHZYwstyv8fBA6637yXjYBEUB6b4TZeSCSa4uBpzTqOVdWPYxtT2unrc9N8VE+mxWWcRCaw0VoIJTiSR/xj7fwU/JYRosIMKXY9kipF96okztgR7cBq8Lkb12R5lBvBbqz+WxbBrek/WCg==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/项目概况-关键数据.json b/Pages/项目/项目首页/项目首页-容器页面/项目概况-关键数据.json index b4c290a1..536e47e2 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/项目概况-关键数据.json +++ b/Pages/项目/项目首页/项目首页-容器页面/项目概况-关键数据.json @@ -6,23 +6,41 @@ "DesignLengthInPixel": 15.0 } }, - "1": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 22.0 - } - }, "2": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 27.0 + "DesignLengthInPixel": 10.0 } }, "3": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 24.0 + } + }, + "4": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 37.0 + } + }, + "5": { "GridRowColumnDefinition": { "DesignLengthInPixel": 15.0 } + }, + "1": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 80.0 + } + }, + "6": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 33.0 + } } }, - "Count": 4, + "InLogicalVisibleIndexes": [ + 6 + ], + "Count": 7, "DefaultSize": 15.0 }, "Cols": { @@ -34,12 +52,12 @@ }, "1": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 100.0 } }, "2": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 60.0 + "DesignLengthInPixel": 15.0 } }, "3": { @@ -54,28 +72,27 @@ }, "5": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0 + "DesignLengthInPixel": 100.0 } }, "6": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 50.0 + "DesignLengthInPixel": 15.0 } }, "7": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 10.0 + "DesignLengthInPixel": 15.0 } }, "8": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 50.0, - "Mode": 1 + "DesignLengthInPixel": 15.0 } }, "9": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0 + "DesignLengthInPixel": 100.0 } }, "10": { @@ -90,18 +107,17 @@ }, "12": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 50.0 + "DesignLengthInPixel": 15.0 } }, "13": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 10.0 + "DesignLengthInPixel": 100.0 } }, "14": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 50.0, - "Mode": 1 + "DesignLengthInPixel": 15.0 } }, "15": { @@ -116,28 +132,27 @@ }, "17": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0 + "DesignLengthInPixel": 100.0 } }, "18": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 50.0 + "DesignLengthInPixel": 15.0 } }, "19": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 10.0 + "DesignLengthInPixel": 15.0 } }, "20": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 50.0, - "Mode": 1 + "DesignLengthInPixel": 15.0 } }, "21": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0 + "DesignLengthInPixel": 100.0 } }, "22": { @@ -152,18 +167,17 @@ }, "24": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 50.0 + "DesignLengthInPixel": 15.0 } }, "25": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 10.0 + "DesignLengthInPixel": 100.0 } }, "26": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 50.0, - "Mode": 1 + "DesignLengthInPixel": 15.0 } }, "27": { @@ -178,197 +192,70 @@ }, "29": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0 + "DesignLengthInPixel": 100.0 } }, "30": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 50.0 + "DesignLengthInPixel": 15.0 } }, "31": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 10.0 + "DesignLengthInPixel": 15.0 } }, "32": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 50.0, - "Mode": 1 + "DesignLengthInPixel": 15.0 } }, "33": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0 + "DesignLengthInPixel": 100.0 } }, "34": { "GridRowColumnDefinition": { "DesignLengthInPixel": 15.0 } - }, - "35": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0 - } - }, - "36": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 50.0 - } - }, - "37": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 10.0 - } - }, - "38": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 50.0, - "Mode": 1 - } - }, - "39": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0 - } - }, - "40": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0 - } - }, - "41": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0 - } - }, - "42": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 50.0 - } - }, - "43": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 10.0 - } - }, - "44": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 50.0, - "Mode": 1 - } - }, - "45": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0 - } - }, - "46": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0 - } - }, - "47": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0 - } - }, - "48": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 50.0 - } - }, - "49": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 10.0 - } - }, - "50": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 50.0, - "Mode": 1 - } - }, - "51": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0 - } } }, - "Count": 55, + "Count": 38, "DefaultSize": 15.0 }, "Values": { - "1,1": "成员", - "1,6": 100, - "1,8": "预算工时", - "1,14": "已分配", - "1,20": "可分配", - "1,26": "已核定", - "1,32": "可核定", - "1,36": 100, - "1,38": "预算成本", - "1,42": 0, - "1,44": "已消耗", - "1,50": "未消耗", - "2,50": "-" + "1,5": 100, + "1,25": 100, + "1,29": 0, + "3,1": "成员", + "3,5": "预算工时", + "3,9": "已分配", + "3,13": "可分配", + "3,17": "已核定", + "3,21": "可核定", + "3,25": "预算成本", + "3,29": "已消耗", + "3,33": "未消耗", + "4,33": "-" }, "Formulas": { - "2,50": "AM3-AS3", - "1,18": "IFERROR(ROUNDUP(U3/I3*100,0),0)", - "1,30": "IFERROR(ROUNDUP(AG3/O3*100,0),0)", - "1,42": "IFERROR(ROUNDUP(AS3/AM3*100,0),0)", - "1,24": "IFERROR(ROUNDUP(AA3/O3*100,0),0)", - "1,48": "IFERROR(ROUNDUP(AY3/AM3*100,0),0)", - "1,12": "IFERROR(ROUNDUP(O3/I3*100,0),0)" + "1,21": "IFERROR(ROUNDUP(V5/J5*100,0),0)", + "1,9": "IFERROR(ROUNDUP(J5/F5*100,0),0)", + "1,17": "IFERROR(ROUNDUP(R5/J5*100,0),0)", + "1,29": "IFERROR(ROUNDUP(AD5/Z5*100,0),0)", + "4,33": "Z5-AD5", + "1,13": "IFERROR(ROUNDUP(N5/F5*100,0),0)", + "1,33": "IFERROR(ROUNDUP(AH5/Z5*100,0),0)" }, "AttachInfos": { - "1,6": { + "1,1": { "CellType": { - "$type": "ElementUI.ProgressCellType, ElementUI", - "CommandList": [ - { - "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", - "ConditionAndCommandPairList": [ - { - "Condition": { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", - "cellLocations": [ - { - "SerializeProperty": "='项目概况-关键数据'!G2" - } - ] - }, - "value": "100", - "compareType": 2 - }, - "CommandList": [ - { - "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", - "TargetPageElement": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='项目概况-关键数据'!G2" - }, - "TargetType": "ElementUI.ProgressCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", - "MethodName": "SetBackgroundColor", - "ParameterValues": { - "color": "Accent 4 0" - } - } - ], - "ID": "73c40685-5a6e-4885-bca0-056dcaf5a52a" - } - ] - } - ], - "type": 2, - "color": "Accent 3 0" + "$type": "Forguncy.ImageCellType, ServerDesignerCommon", + "ImagePath": "成员.png" } }, - "1,12": { + "1,5": { "CellType": { "$type": "ElementUI.ProgressCellType, ElementUI", "CommandList": [ @@ -382,7 +269,7 @@ "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", "cellLocations": [ { - "SerializeProperty": "='项目概况-关键数据'!M2" + "SerializeProperty": "='项目概况-关键数据'!F2" } ] }, @@ -394,25 +281,26 @@ "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", "TargetPageElement": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='项目概况-关键数据'!M2" + "SerializeProperty": "='项目概况-关键数据'!F2" }, "TargetType": "ElementUI.ProgressCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", "MethodName": "SetBackgroundColor", "ParameterValues": { - "color": "Accent 4 0" + "color": "Accent 2 0" } } ], - "ID": "1d984694-c036-479d-a0e6-2b9b61bbc5bd" + "ID": "e6b12ff7-a74a-4c3d-a3a7-4c30ea6e0e63" } ] } ], "type": 2, - "color": "Accent 3 0" + "strokeWidth": 8.0, + "color": "Accent 2 0" } }, - "1,18": { + "1,9": { "CellType": { "$type": "ElementUI.ProgressCellType, ElementUI", "CommandList": [ @@ -426,7 +314,7 @@ "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", "cellLocations": [ { - "SerializeProperty": "='项目概况-关键数据'!S2" + "SerializeProperty": "='项目概况-关键数据'!J2" } ] }, @@ -438,25 +326,26 @@ "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", "TargetPageElement": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='项目概况-关键数据'!S2" + "SerializeProperty": "='项目概况-关键数据'!J2" }, "TargetType": "ElementUI.ProgressCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", "MethodName": "SetBackgroundColor", "ParameterValues": { - "color": "Accent 4 0" + "color": "Accent 2 0" } } ], - "ID": "8aebfad8-babc-4ed3-b38f-d5eb8fa9a445" + "ID": "de0dd384-e994-409b-b269-28a3a2705658" } ] } ], "type": 2, - "color": "Accent 3 0" + "strokeWidth": 8.0, + "color": "Accent 2 0" } }, - "1,24": { + "1,13": { "CellType": { "$type": "ElementUI.ProgressCellType, ElementUI", "CommandList": [ @@ -470,7 +359,7 @@ "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", "cellLocations": [ { - "SerializeProperty": "='项目概况-关键数据'!Y2" + "SerializeProperty": "='项目概况-关键数据'!N2" } ] }, @@ -482,25 +371,26 @@ "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", "TargetPageElement": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='项目概况-关键数据'!Y2" + "SerializeProperty": "='项目概况-关键数据'!N2" }, "TargetType": "ElementUI.ProgressCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", "MethodName": "SetBackgroundColor", "ParameterValues": { - "color": "Accent 4 0" + "color": "Accent 2 0" } } ], - "ID": "a7b3e376-f3e8-4f2a-9116-907f63886a13" + "ID": "04719f44-4a7a-4166-9fa0-2c081c3f511e" } ] } ], "type": 2, - "color": "Accent 3 0" + "strokeWidth": 8.0, + "color": "Accent 2 0" } }, - "1,30": { + "1,17": { "CellType": { "$type": "ElementUI.ProgressCellType, ElementUI", "CommandList": [ @@ -514,7 +404,7 @@ "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", "cellLocations": [ { - "SerializeProperty": "='项目概况-关键数据'!AE2" + "SerializeProperty": "='项目概况-关键数据'!R2" } ] }, @@ -526,25 +416,26 @@ "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", "TargetPageElement": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='项目概况-关键数据'!AE2" + "SerializeProperty": "='项目概况-关键数据'!R2" }, "TargetType": "ElementUI.ProgressCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", "MethodName": "SetBackgroundColor", "ParameterValues": { - "color": "Accent 4 0" + "color": "Accent 2 0" } } ], - "ID": "2369b962-eddd-40f9-b4e8-cda2ce6fbd9a" + "ID": "5894b3e5-20f9-4152-a238-34cded0f5161" } ] } ], "type": 2, - "color": "Accent 3 0" + "strokeWidth": 8.0, + "color": "Accent 2 0" } }, - "1,36": { + "1,21": { "CellType": { "$type": "ElementUI.ProgressCellType, ElementUI", "CommandList": [ @@ -558,7 +449,7 @@ "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", "cellLocations": [ { - "SerializeProperty": "='项目概况-关键数据'!AK2" + "SerializeProperty": "='项目概况-关键数据'!V2" } ] }, @@ -570,25 +461,71 @@ "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", "TargetPageElement": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='项目概况-关键数据'!AK2" + "SerializeProperty": "='项目概况-关键数据'!V2" }, "TargetType": "ElementUI.ProgressCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", "MethodName": "SetBackgroundColor", "ParameterValues": { - "color": "Accent 4 0" + "color": "Accent 2 0" } } ], - "ID": "cd2c4a6c-14e3-4a74-98f6-1043d6c9058b" + "ID": "94bda11d-6843-4038-b958-7ff03ea94674" } ] } ], "type": 2, + "strokeWidth": 8.0, + "color": "Accent 2 0" + } + }, + "1,25": { + "CellType": { + "$type": "ElementUI.ProgressCellType, ElementUI", + "CommandList": [ + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "='项目概况-关键数据'!Z2" + } + ] + }, + "value": "100", + "compareType": 2 + }, + "CommandList": [ + { + "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", + "TargetPageElement": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='项目概况-关键数据'!Z2" + }, + "TargetType": "ElementUI.ProgressCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", + "MethodName": "SetBackgroundColor", + "ParameterValues": { + "color": "Accent 2 0" + } + } + ], + "ID": "0e4ea7dc-7ee6-4ea9-961b-d1c30c092181" + } + ] + } + ], + "type": 2, + "strokeWidth": 8.0, "color": "Accent 1 0" } }, - "1,42": { + "1,29": { "CellType": { "$type": "ElementUI.ProgressCellType, ElementUI", "CommandList": [ @@ -602,7 +539,7 @@ "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", "cellLocations": [ { - "SerializeProperty": "='项目概况-关键数据'!AQ2" + "SerializeProperty": "='项目概况-关键数据'!AD2" } ] }, @@ -614,25 +551,26 @@ "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", "TargetPageElement": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='项目概况-关键数据'!AQ2" + "SerializeProperty": "='项目概况-关键数据'!AD2" }, "TargetType": "ElementUI.ProgressCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", "MethodName": "SetBackgroundColor", "ParameterValues": { - "color": "Accent 4 0" + "color": "Accent 2 0" } } ], - "ID": "10df201f-1744-418a-b8a8-bee27f5b774f" + "ID": "50ea92e9-be82-4629-b949-b83d788f6f57" } ] } ], "type": 2, + "strokeWidth": 8.0, "color": "Accent 1" } }, - "1,48": { + "1,33": { "CellType": { "$type": "ElementUI.ProgressCellType, ElementUI", "CommandList": [ @@ -646,7 +584,7 @@ "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", "cellLocations": [ { - "SerializeProperty": "='项目概况-关键数据'!AW2" + "SerializeProperty": "='项目概况-关键数据'!AH2" } ] }, @@ -658,74 +596,75 @@ "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", "TargetPageElement": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='项目概况-关键数据'!AW2" + "SerializeProperty": "='项目概况-关键数据'!AH2" }, "TargetType": "ElementUI.ProgressCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", "MethodName": "SetBackgroundColor", "ParameterValues": { - "color": "Accent 4 0" + "color": "Accent 2 0" } } ], - "ID": "d1c82ad1-5c04-4308-8d7a-c40e9384ad0c" + "ID": "581d427b-3981-4d6a-9ee7-0aa735daaf4b" } ] } ], "type": 2, + "strokeWidth": 8.0, "color": "Accent 1" } }, - "2,1": { + "4,1": { "BindingInfo": { "TableName": "View_项目统计信息", "ColumnName": "项目成员数", "GUID": "fe9b0d76-1afd-4719-8184-fbe9f6dd3939" } }, - "2,8": { + "4,5": { "BindingInfo": { "TableName": "项目平行视图", "ColumnName": "项目预算工时", "GUID": "af4d7ca4-a6a8-4e94-b02f-1d8a0fdb070b" } }, - "2,14": { + "4,9": { "BindingInfo": { "TableName": "项目平行视图", "ColumnName": "项目已分配工时", "GUID": "dfd4d65b-b273-4e08-979d-08f88f756788" } }, - "2,20": { + "4,13": { "BindingInfo": { "TableName": "项目平行视图", "ColumnName": "项目可分配工时", "GUID": "c1b01a67-6f3f-4f1a-8535-06942fe7f124" } }, - "2,26": { + "4,17": { "BindingInfo": { "TableName": "项目平行视图", "ColumnName": "项目总核定工时", "GUID": "ca06b778-4855-46ef-a81d-30289727bf94" } }, - "2,32": { + "4,21": { "BindingInfo": { "TableName": "项目平行视图", "ColumnName": "项目可核定工时", "GUID": "cf06885e-1f35-4806-a6e6-2f12ce865989" } }, - "2,38": { + "4,25": { "BindingInfo": { "TableName": "项目平行视图", "ColumnName": "项目预算费用", "GUID": "bda2172c-8f02-4a0f-958e-216b79c4d6c0" } }, - "2,44": { + "4,29": { "BindingInfo": { "TableName": "项目平行视图", "ColumnName": "已消耗成本", @@ -740,6 +679,8 @@ "FontSize": 13.333333333333332 }, { + "FontFamily": 0, + "FontSize": 18.666666666666664, "Foreground": 1 }, { @@ -747,50 +688,75 @@ "FontSize": 12.0 }, { - "FontFamily": 0, - "FontSize": 13.333333333333332, - "Foreground": 1 + "Foreground": 2 }, { "FontFamily": 0, - "FontSize": 13.333333333333332, - "Foreground": 1, - "Formatter": 2 + "FontSize": 12.0, + "Foreground": 2, + "HorizontalAlignment": 3 }, { - "FontSize": 18.666666666666664, "HorizontalAlignment": 3 }, { "FontFamily": 0, - "FontSize": 18.666666666666664, - "HorizontalAlignment": 3 - }, - { - "FontFamily": 0, - "FontSize": 18.666666666666664 - }, - { - "FontFamily": 0, - "FontSize": 18.666666666666664, + "FontSize": 13.333333333333332, + "Foreground": 2, "Formatter": 4, "HorizontalAlignment": 3 + }, + { + "FontFamily": 0, + "FontSize": 13.333333333333332, + "HorizontalAlignment": 3 + }, + { + "FontSize": 18.666666666666664, + "HorizontalAlignment": 5 + }, + { + "FontFamily": 0, + "FontSize": 18.666666666666664, + "Formatter": 6, + "HorizontalAlignment": 3 + }, + { + "FontFamily": 0, + "FontSize": 18.666666666666664, + "HorizontalAlignment": 3 + }, + { + "FontFamily": 0, + "FontSize": 18.666666666666664, + "Formatter": 7, + "HorizontalAlignment": 3 } ], "Types": { "Strs": [ "Body", + "black", "Text 1 50", + "Center", "[AUTO]General", "Left", + "0.0\"h\"", " ¥#,##0; ¥-#,##0" ] }, "CellStyles": { - "0,18": 0, + "0,13": 0, + "0,17": 0, "0,19": 0, + "0,20": 0, + "0,21": 0, + "0,22": 0, + "0,23": 0, "0,24": 0, "0,25": 0, + "0,26": 0, + "0,27": 0, "0,28": 0, "0,29": 0, "0,30": 0, @@ -798,123 +764,143 @@ "0,32": 0, "0,33": 0, "0,34": 0, - "0,35": 0, - "0,36": 0, - "0,37": 0, - "0,38": 0, - "0,39": 0, - "0,40": 0, - "0,41": 0, - "0,42": 0, - "0,43": 0, - "0,44": 0, - "0,45": 0, - "0,46": 0, - "0,47": 0, - "0,48": 0, - "0,49": 0, - "0,50": 0, - "0,51": 0, - "1,1": 1, - "1,6": 2, - "1,7": 2, - "1,8": 3, - "1,12": 2, - "1,13": 2, - "1,14": 4, - "1,18": 2, - "1,19": 2, - "1,20": 4, - "1,21": 0, + "1,5": 1, + "1,9": 1, + "1,13": 1, + "1,17": 1, + "1,19": 0, + "1,20": 0, + "1,21": 1, "1,22": 0, "1,23": 0, - "1,24": 2, - "1,25": 2, - "1,26": 4, + "1,24": 0, + "1,25": 1, + "1,26": 0, + "1,27": 0, "1,28": 0, - "1,29": 0, - "1,30": 2, - "1,31": 2, - "1,32": 4, - "1,33": 0, + "1,29": 1, + "1,30": 0, + "1,31": 0, + "1,32": 0, + "1,33": 1, "1,34": 0, - "1,35": 0, - "1,36": 2, - "1,37": 2, - "1,38": 4, - "1,39": 0, - "1,40": 0, - "1,41": 0, - "1,42": 2, - "1,43": 2, - "1,44": 4, - "1,45": 0, - "1,46": 0, - "1,47": 0, - "1,48": 2, - "1,49": 2, - "1,50": 4, - "1,51": 0, - "2,1": 5, - "2,7": 2, - "2,8": 6, - "2,13": 2, - "2,14": 6, - "2,19": 2, - "2,20": 6, - "2,21": 7, - "2,22": 7, - "2,23": 7, - "2,25": 2, - "2,26": 6, - "2,28": 7, - "2,29": 7, - "2,31": 2, - "2,32": 6, + "2,5": 2, + "2,13": 0, + "2,17": 0, + "2,19": 0, + "2,20": 0, + "2,21": 0, + "2,22": 0, + "2,23": 0, + "2,24": 0, + "2,25": 0, + "2,26": 0, + "2,27": 0, + "2,28": 0, + "2,29": 0, + "2,30": 0, + "2,31": 0, + "2,32": 0, "2,33": 0, - "2,34": 7, - "2,35": 7, - "2,37": 2, - "2,38": 8, - "2,39": 0, - "2,40": 7, - "2,41": 7, - "2,43": 2, - "2,44": 8, - "2,45": 0, - "2,46": 7, - "2,47": 7, - "2,49": 2, - "2,50": 8, - "2,51": 0, - "3,18": 0, - "3,19": 0, - "3,24": 0, - "3,25": 0, - "3,28": 0, - "3,29": 0, - "3,30": 0, - "3,31": 0, - "3,32": 0, - "3,33": 0, + "2,34": 0, + "3,1": 3, + "3,5": 4, + "3,6": 5, + "3,7": 5, + "3,8": 5, + "3,9": 6, + "3,10": 5, + "3,11": 5, + "3,12": 5, + "3,13": 6, + "3,14": 7, + "3,15": 7, + "3,16": 7, + "3,17": 6, + "3,18": 5, + "3,19": 7, + "3,20": 7, + "3,21": 6, + "3,22": 7, + "3,23": 7, + "3,24": 7, + "3,25": 6, + "3,26": 7, + "3,27": 7, + "3,28": 7, + "3,29": 6, + "3,30": 7, + "3,31": 7, + "3,32": 7, + "3,33": 6, "3,34": 0, - "3,35": 0, - "3,36": 0, - "3,37": 0, - "3,38": 0, - "3,39": 0, - "3,40": 0, - "3,41": 0, - "3,42": 0, - "3,43": 0, - "3,44": 0, - "3,45": 0, - "3,46": 0, - "3,47": 0, - "3,48": 0, - "3,49": 0, - "3,50": 0, - "3,51": 0 + "4,1": 8, + "4,5": 9, + "4,6": 5, + "4,7": 5, + "4,8": 5, + "4,9": 9, + "4,10": 5, + "4,11": 5, + "4,12": 5, + "4,13": 9, + "4,14": 10, + "4,15": 10, + "4,16": 10, + "4,17": 9, + "4,18": 5, + "4,19": 10, + "4,20": 10, + "4,21": 9, + "4,22": 7, + "4,23": 10, + "4,24": 10, + "4,25": 11, + "4,26": 7, + "4,27": 10, + "4,28": 10, + "4,29": 11, + "4,30": 7, + "4,31": 10, + "4,32": 10, + "4,33": 11, + "4,34": 0, + "5,13": 0, + "5,17": 0, + "5,19": 0, + "5,20": 0, + "5,21": 0, + "5,22": 0, + "5,23": 0, + "5,24": 0, + "5,25": 0, + "5,26": 0, + "5,27": 0, + "5,28": 0, + "5,29": 0, + "5,30": 0, + "5,31": 0, + "5,32": 0, + "5,33": 0, + "5,34": 0, + "6,13": 0, + "6,17": 0, + "6,19": 0, + "6,20": 0, + "6,21": 0, + "6,22": 0, + "6,23": 0, + "6,24": 0, + "6,25": 0, + "6,26": 0, + "6,27": 0, + "6,28": 0, + "6,29": 0, + "6,30": 0, + "6,31": 0, + "6,32": 0, + "6,33": 0, + "6,34": 0 }, "SheetStyle": { "FontFamily": 0, @@ -922,23 +908,31 @@ } }, "Spans": [ - "2,1,1,2", - "2,8,1,1", - "2,14,1,1", - "2,20,1,1", - "2,26,1,1", - "2,50,1,1", - "1,6,2,1", - "1,12,2,1", - "1,18,2,1", - "1,24,2,1", - "2,32,1,1", - "1,30,2,1", - "1,42,2,1", - "1,48,2,1", - "1,36,2,1", - "2,44,1,1", - "2,38,1,1" + "4,1,1,1", + "1,5,1,1", + "3,5,1,1", + "4,5,1,1", + "1,9,1,1", + "1,13,1,1", + "1,17,1,1", + "1,21,1,1", + "1,25,1,1", + "1,29,1,1", + "1,33,1,1", + "3,33,1,1", + "4,33,1,1", + "3,29,1,1", + "4,29,1,1", + "3,25,1,1", + "4,25,1,1", + "3,21,1,1", + "4,21,1,1", + "3,17,1,1", + "4,17,1,1", + "3,13,1,1", + "4,13,1,1", + "3,9,1,1", + "4,9,1,1" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -977,7 +971,7 @@ }, "IsAutomaticStroke": false, "IsAutomaticFill": false, - "Size": "122,79" + "Size": "130,181" }, { "Name": "BackgroundPicture5", @@ -986,13 +980,13 @@ "CornerRadius": 6.0, "Fill": "Background 1 0", "StrokeDashType": 8, - "Stroke": "Accent 3 60", + "Stroke": "Accent 2 60", "StrokeThickness": 1.0 }, "IsAutomaticStroke": false, "IsAutomaticFill": false, - "Location": "757,0", - "Size": "140,79" + "Location": "725,0", + "Size": "130,181" }, { "Name": "BackgroundPicture6", @@ -1006,8 +1000,8 @@ }, "IsAutomaticStroke": false, "IsAutomaticFill": false, - "Location": "912,0", - "Size": "140,79" + "Location": "870,0", + "Size": "130,181" }, { "Name": "4cc3f375-967f-4c20-a1f5-a9b66f2839a3.png", @@ -1020,8 +1014,8 @@ }, "IsAutomaticStroke": false, "IsAutomaticFill": false, - "Location": "1067,0", - "Size": "140,79" + "Location": "1015,0", + "Size": "130,181" }, { "Name": "0614937a-7d96-4e0b-8b1c-c4701fcede46.png", @@ -1034,8 +1028,8 @@ }, "IsAutomaticStroke": false, "IsAutomaticFill": false, - "Location": "1222,0", - "Size": "140,79" + "Location": "1160,0", + "Size": "130,181" }, { "Name": "5e5fa821-6101-44d1-959a-dadbff8ab75c.png", @@ -1043,13 +1037,14 @@ "StyleInfo": { "CornerRadius": 6.0, "Fill": "Background 1 0", - "Stroke": "Accent 3 60", + "StrokeDashType": 8, + "Stroke": "Accent 2 60", "StrokeThickness": 1.0 }, "IsAutomaticStroke": false, "IsAutomaticFill": false, - "Location": "602,0", - "Size": "140,79" + "Location": "580,0", + "Size": "130,181" }, { "Name": "f7949427-df0d-4238-b237-9779c890c230.png", @@ -1057,13 +1052,14 @@ "StyleInfo": { "CornerRadius": 6.0, "Fill": "Background 1 0", - "Stroke": "Accent 3 60", + "StrokeDashType": 8, + "Stroke": "Accent 2 60", "StrokeThickness": 1.0 }, "IsAutomaticStroke": false, "IsAutomaticFill": false, - "Location": "447,0", - "Size": "140,79" + "Location": "435,0", + "Size": "130,181" }, { "Name": "619723af-23eb-4785-b07a-2fda558230c9.png", @@ -1071,13 +1067,14 @@ "StyleInfo": { "CornerRadius": 6.0, "Fill": "Background 1 0", - "Stroke": "Accent 3 60", + "StrokeDashType": 8, + "Stroke": "Accent 2 60", "StrokeThickness": 1.0 }, "IsAutomaticStroke": false, "IsAutomaticFill": false, - "Location": "292,0", - "Size": "140,79" + "Location": "290,0", + "Size": "130,181" }, { "Name": "93fa6676-89a7-49d3-b9f3-09e3adffd54c.png", @@ -1085,13 +1082,14 @@ "StyleInfo": { "CornerRadius": 6.0, "Fill": "Background 1 0", - "Stroke": "Accent 3 60", + "StrokeDashType": 8, + "Stroke": "Accent 2 60", "StrokeThickness": 1.0 }, "IsAutomaticStroke": false, "IsAutomaticFill": false, - "Location": "137,0", - "Size": "140,79" + "Location": "145,0", + "Size": "130,181" } ] -}//A4J+CMkLjL+ySOnUvVErvjgMIFlk8LqaBDfrfo/DAfVu6YasPZXdmpnPIoixoVYrZwblpwY7tRKHDlejZMOfgtUAXBAnXPLxhCVI53VXjBdNLb9ooLQAYRPn9VHEMoZwJbDdAWrDP2TlO4RYYmTyKXrM76xn1Cr+a8vx2iLO8rs9ln23bherxpYIGF83SFR7JMlHfWa1CMw3/seBR/RjsJGRNjK9ECSETqyzS8xFfbEh/iOr9kKixKARum61cG6ZozFkTJmY5qdF5Ptp4iFApHyqVs/vXkeLZJmdE6K+ISncI6lCLsvNpE2JyEH4OaZAWBhbeelMcAHGQ98Yu+DFX4ZMZVYi/zaAkUccznnmgyui8M1bPY8spXBZg/gzxJI5khsMJnftYKDnNMkjyF8V3/bkbrGnMn0fwQjSzkcV/g68sNlXZXA91lwhwfS55nPkQhrcNoWmDMlTMqeoIxdGX5nriJR4mJPxCjdV9qfaj0W0VgQTBXfy/DW3c/sIBmWWynwUiaFTDX0blhZiU6al4hdd+hc6uj4bUC1p5GuvmVIbjXsF0OYRbshXC6hnqSCyW8MgTX1xYoTbDLb4xTGfFzepLTV/xoRNW4VT0cPgMNjFWTeRNGU5ZMkQIgwcHxLeHEtssDfHdMGBp8ATBgg6k2NLKyInw1P0EyzfvuyH2DXmbFo/mzNxHHkewt6HCBYkKaoT93pLtt5WqGC6S/tYQ7svGHJQbYc5kIq+2s0gElAD1cR8fAszE7jseEdjXm0P+3pu1NdYqUHprM3u6oDi+LmfG5TV30M0iF3RSjU9myS7m50hXF1lVqVlCJWYjq5CqY/wek1LKnc1JOTjpjA93Tj3/vTWwfbNZue3XC0Ufhc+hdojSTmViyqU6CMgMZPx0cgT94x1h62+hzA9r6QGcA==|920 \ No newline at end of file +}//SUZt06y3U5XpMHKWkfElWBtYjDX/g0FmyjCjgbkZwcQwaA/kWHlb1VIU/3oCt49tJahWc1HoZX1WvUqwvLRZva1z/0wuhWBtK7XaMZnELeADEuv0ettGNueyjYRdIfk6nUqrpgPxS3D6dnlYG1UiZ2cFizwVYB4JkzxBNrf299w2BkVqFyckngBHtYeniah/h/HHO+4SLJmdq3sgOLfiCZfaSkrWRPf1nwB66olYpYgyVeq+CCAnbsVNVuJiCDRIR80nG6pI3obY+2x4x77bsRS0J4xtS714OxdNZ3Tvhig24sDTx8M2kX4z39XvFxrOujbNlgyIPqwjQbIUj/5gReft+KwdQY1/dmMw3UvZnIF9cvL4QHvznfi8Xju0gT4kcghTSTtQwTCyqykIT1NI6VaReYkJR1SxavzxoegfHFPvSdSa6kpUPYEIcgqYTqF5721q0h/EGPdQTD5cSQzFEOIMpseSHbzakV45pHXYxRceqo40M7sNq+5b254G1TtZ4gl6vE5gWSU4evwgno9l1MHuvaKFvRRZOBfLa1Qbe2UuB852KYYmvba0ecwjzMiwAvZIoM0CiPVBlMGgxZk5TA5nSLzKWlDXgWbmlZclTrmvKwGtmN+zTovwLaqDhpRpmkUUzfKcWHG6NmVGgcRffAl9Y3iwku78c3ccN/ElaMxKdWIAo77cFqM1qPeiH0/tTRjy2CJdo7GR8ZoFpc+Oa1LHAh0zAORb6Tauh55w0aapdtbI/ew7wmJkNTZRrlHt9KY23A1iDHnP3T6BlyywrDP433M5Pu36y18PU/bgCtRAyzdti0Avo5xlsR95CRhwiqEaZXKsS7YnmBqXp+9i8tltKjdZVqNa/bBkgYvvBoid1Xv3G3H5swXsJn/KmVDPG3ny5LTOIglhnoliE75Cgw==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/项目概况-关键数据.rd b/Pages/项目/项目首页/项目首页-容器页面/项目概况-关键数据.rd index 8fb4c07c..f420c63b 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/项目概况-关键数据.rd +++ b/Pages/项目/项目首页/项目首页-容器页面/项目概况-关键数据.rd @@ -1,14 +1,14 @@ { "PageType": 0, - "ColumnCount": 55, - "RowCount": 4, + "ColumnCount": 38, + "RowCount": 7, "Formulas": { - "2,50": "AM3-AS3", - "1,18": "IFERROR(ROUNDUP(U3/I3*100,0),0)", - "1,30": "IFERROR(ROUNDUP(AG3/O3*100,0),0)", - "1,42": "IFERROR(ROUNDUP(AS3/AM3*100,0),0)", - "1,24": "IFERROR(ROUNDUP(AA3/O3*100,0),0)", - "1,48": "IFERROR(ROUNDUP(AY3/AM3*100,0),0)", - "1,12": "IFERROR(ROUNDUP(O3/I3*100,0),0)" + "1,21": "IFERROR(ROUNDUP(V5/J5*100,0),0)", + "1,9": "IFERROR(ROUNDUP(J5/F5*100,0),0)", + "1,17": "IFERROR(ROUNDUP(R5/J5*100,0),0)", + "1,29": "IFERROR(ROUNDUP(AD5/Z5*100,0),0)", + "4,33": "Z5-AD5", + "1,13": "IFERROR(ROUNDUP(N5/F5*100,0),0)", + "1,33": "IFERROR(ROUNDUP(AH5/Z5*100,0),0)" } } \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/项目负荷子页面.json b/Pages/项目/项目首页/项目首页-容器页面/项目负荷子页面.json index 44495ad3..24d19fb4 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/项目负荷子页面.json +++ b/Pages/项目/项目首页/项目首页-容器页面/项目负荷子页面.json @@ -275,7 +275,7 @@ "GUID": "2da5e4a5-ecc3-4e89-ac0e-b6d0b4a7eb55", "BindingInfo": { "TableName": "View_任务工时统计", - "ColumnName": "总实际工时", + "ColumnName": "总核定工时", "GUID": "8cb3e3d0-345c-4b24-a10c-74b4666fabc3" }, "ColumnName": "总实际工时" @@ -350,7 +350,7 @@ "SampleJson": "[{\r\n \"日期\":\"2024-01-01\"\r\n}]" } ], - "ID": "bfbe81f8-6d48-40bf-a1d7-c16d8d948b8a" + "ID": "6c052661-3b95-43d5-812e-93f538027c29" }, { "CommandList": [ @@ -361,7 +361,7 @@ "UpdateRowType": 2 } ], - "ID": "de0bc021-9f29-4bf7-8094-15e7c9dad8dc" + "ID": "590abf8a-dfe4-4977-885f-3d5938faa91a" } ] } @@ -473,4 +473,4 @@ "Formula": "项目负荷子页面!$A$3" } ] -}//JRlVqpUP2DvgbRkYxU9eJNST5nGAMUMf7zcRp9oudqeOGVCrbDcBqVZ0eupWVBCHuTGBmKsICWoLR6nqvniiRlfF3M7bzoHwJWE7YGTBPxr/BFeHvIuwfELU4XIqB0HaMURUrRzgawrDPC1AQjOfZLRKCrD2GOUAWgGfTvQ0hUD4cKIOXUgPZ3ZOh725nOb+cZXTTIncr7eAEDygR+iXeIYASlw/TQYCZXdD88+3yzwfpzxAj/aEDUwcGZwnZC3ex9UE0f/2JrE1HX4kl/9FzuLjFFw9tpBQk0PFTUdLm/5g51XX8+DWzLoecb0y67XxMFDcmcElUUoUFXILMJNvMhSI4NRUezpVvFaT+TvO2mTh4a7aHamyZGzcK3QDxo4Ly0dw642RhtXpCIbQUBRSH3XoFsluv0Y4vfiMGZphDa1NgekG5W1jdGRi/BOVIyP/tLtSYpDfGmwFT9gQolhAYDeiij/FZw5XeCC1BIFyM56mgmC/7ylfgFU7YUFIDxWyeNY8QDOJ/cUtqnHhLNnV+OGID/X6bsrWBEALfFOSj2OwKuZS+/3sdbBid8SoYSLqHiHKvqc0GnM6iCdGaUT4/jzEqnTyLj7oUie3rR7r8RpP5HGxbt17zo3uvLaoWpdKAO5AO69GwSJarNKoWnXsbd06B7OpncdQ4Go8AhklHfmJf2Y/IgbJfqN3zWWwPyr1bWMWG81R4ca1H/sGu8i9t2pjAesS/YjSa6WQH+W7eAwII+yfeq3ACtfhGn4ebBxJQY+KcMcvN041/HvzTMBX5dHIMUH3RnU1M/i6IVEcR31pqOjWLjlL94uOLgvwKCNWSfraCM6N7toUxybc3WOJvz2KQ5sf93WejQmsK+umggo36rrekAMuu7gqNRA1hhlUOmbDxEyRTJHZ1/tl9rTp7w==|920 \ No newline at end of file +}//MdlFTFtILkxfFzEcFaWTPhsydNtVffhgzz5suh+TYerX3MiEeFOkYm89iyPLNBXgS8vD9mlDczvXfWIi20XWiwDLJ93JWzcPV6RT0kBsQ0N0lRRiZ2Nh39n+thNjxuDHxD8GOvyXOXxdCgG2IP/NZl3CfDNobdFzfeujH+IBayzdMrW4nJh9j8ymkAc7zSrNeLLKllOpdJ3QM7sXtcyikA13b7nBip61WLB+PZlDz0IriQCBVZQSIvj5Xix/urYBHfiEpTDz++hPK2M77n2RLuhM5d8CKr5/1hSfORYP16uM4WgkXdFZ/dGnlo3IOpM+S9a3gNuk+6XJyI/gDhusL4O/+JDQ8/iT33I5JH2A9I+jhtphtxHzMBQET68XRodbzjdgTWfO+lV4tNitadx98LMZtedKhRXaLcaMmwYFG45fCAvUYYXCBkSF3awOHjY8ot6YXhVDDCZx4jqIhSFdZTyolNEJ8cvkqE0CvQmIRbZ20efIy4jepdcGEgh0cfMlpp4Isl81j5hdalZhO2qO/a3SxqMkcHYVlXpnNmS3WXe/AVOTYTrNf54jSITFCYScP0VbY3QYEZ939rlMb6KYvFBsHopqwEdNz/Szh9gXlG+5PPZ/QH+IVtF1K4QWZflrOq8aeJgKzYGd04JU5uOIlfNwNJliyV4x+mSTihvgHiKqEXBBDwgZAQwrq4jt5FUjx/oV4deaK/0znI/Yv5Grv1tfw/8DbeoMTis+8nP0Imj8/5c4E2DjdO+lP/d24vBKQcWicsqFF/NJ1cv03VX2SgIJvvvLygE2AaPqPFwhPrRMsnrbFvxr1kr1zmSMDpH1FGiCOtBKyxnyQP6bCwVDwfn7KZzwG3CRA9CUbrjaHnrSBqR61JTFrQx9/aqd2vZ15/eukizdCtgynb9qos+vrQ==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/预算申请/预算申请.json b/Pages/项目/项目首页/预算申请/预算申请.json index ee54908b..40da97d9 100644 --- a/Pages/项目/项目首页/预算申请/预算申请.json +++ b/Pages/项目/项目首页/预算申请/预算申请.json @@ -94,12 +94,14 @@ }, "22": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 35.0 + "DesignLengthInPixel": 35.0, + "IsHidden": true } }, "23": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 32.0, + "IsHidden": true } } }, @@ -233,12 +235,12 @@ "TemplateKey": "回退" }, { - "ActionTitle": "终止", + "ActionTitle": "结束", "TemplateKey": "拒绝" }, { - "ActionTitle": "拒绝", - "TemplateKey": "拒绝" + "ActionTitle": "暂存", + "TemplateKey": "暂存" } ] } @@ -691,12 +693,12 @@ ] } ], - "ID": "714b8c6e-37b1-41b8-8ff1-4cfc5f048d8c" + "ID": "ff81eaa5-3dde-4d09-a65a-74811b5d1e9a" } ] } ], - "ID": "c7aa2f46-ea6c-49ce-93b6-ac480b7467de" + "ID": "3944c2ad-008f-4ccc-a17a-753a52f50b6c" } ] } @@ -901,7 +903,7 @@ "MethodName": "Refresh" } ], - "ID": "d35e6acd-3ed7-445c-b528-272eb9dbc9ea" + "ID": "82d4c54b-d212-4963-9078-8128ae03eb2d" } ] } @@ -1281,4 +1283,4 @@ "Formula": "预算申请!$B$23" } ] -}//JRPCjafuln4LtMAVCocop8fM+4hRG9X6GPU2CTR3i3qU5D2mJgKqItg0YubAW/YNNUtVt4q3HygYw5XJWE9QvRA+lVH7fMwvEMmn8gid0OyS0UXUEYl/+eEsCcNVTuyqWKVSKNyYCHEQHf+n5Ckz03xofGrn69IQxzN3uU+X5J97Ab7CfnLy4AD+DFnKkVFXguKAPJu6qARSN9tlW1T1L7HiRHlG7FGN7hVrJLXkJivXtiiVWWOV5EJ0ijZhR1VnW33SyHoezfmg0k0u/hBNTAWDAR3jjvQEI5nncGZwkd/weKpwaIBFLl4gLt1xctZC32WlTjT8P6Tzll2R7Q4ouuVv75FmCfkX9hI4oVnsri0cAPsYi1qyBO1LiKgzDRdI3/2fced6scwzRXf1XiOnEra+zRz7Oii/KYeCd27O4lJA7MZKOaOiMpb5MGmNS37k35NGR6uZYaGLNLQvag5qOH+9wpMzxmJJ4xu8zQTEA8u1Z8k6LlTzVBvkgje8gmPKxectYULIc3/sVNLSobipt1rpVnGtOnQCcRTywlA8/v2+xr8MlFqqq9BXeMT5pTvLnA9fHywEmfyl9qE495p1j+i4W7P4qdrAboWgcrSd5LoDF3Sq0U29fydQz6dA3u9Asw4pP48Ep9QldixM3fITmycBXKVqLbbuuLNwam++fdSgiIJy/QKnBifn7KQXMl6uZPNRQd8XQEwOgtmjG0tetARSeaMVMqDmBBUG+nLU9pJlkpn7kbLpCE9t4mvfGzesXeCP0/d1gEj6BxHSdHxFRTN3SdLIdgmyrWGlmKD5iRjxuBxX7bvFnE41FA8op/t4bb7ogG7hQqujRgvNCTo8wt5gg+M9V5jIINQRpeacgHGTIJT2nRbTOoR2IpzyQJGlGjE3NJvYDfKCb83lYxLhhw==|920 \ No newline at end of file +}//oU7vpEz8/7FPHcz8VZRMend+/SJnkPHkn9e9+34KjfWAQN24pgJi91XdZe8DbTT0SgELEDqob9gVdONmUu4/c1cRNxR69eUckusupEghiKN3UprlnOKzKN6euS5yhXiBWP0Sdh+3vaIsaE8igESa5g6z2JsZBHaCrFo9MYd+4DvXIkVRJXXR5MkdPhp8gJ/CYpDSjoN30TAAKDf5jsrwKqXJpUZKXMWyPIzHG3eBYDLtpghMfLkaX7ioxkjJp0tfWYxBh1+y5a1EzHy2FwoTZZ32CSEvy3n3VX+JZWFbbx2mwhRAA9UAiUSWwIXeyXhEJwcLbsa5tcDcn3DWNXPLIr3HqURh6P/fjeA71XJ/PTV9BSKPxRYlxOmQF2h4iwuLQuNMbXBmzywDm58pJBIRAty1vX+NghxGxZxNbkF3FkEQGNFOLJHZBX/SYVsLNk/auJ+Dq0G4q43FCIWeJtG35vKlEI4Ge6xBl1EB+YIdwXNwsCgCWZJU00K1MMC/C8RLbvfLa1yw+e6KEy1k7geqA7XXh0eN5bGPH1jHCsEMcBBR6tpmgr/A8vAmd0b7x5esHANB6rFnyCfqdRXBPpcAp6QYbe5cn7iWanelc+IT4yFg5OG/0LLg9hRAOlCDyBF+ZIV9fooaO6/uylndDGkA9aINk4Pg1fWNDoz/Cy2F0RdmZznXmRlSF7nwy2alxlNUltRxNOo18fDQG64/I+5YDdz2pLuQmDQoFv2Kih8dKu1kcEPxsmyXRcvEeBxq3PM0bqPA3bT/FZ/YnJcvZkkeSJJHGo1+XPJR7aS/+BOG/WkfEeyBrqEfuZ+bzAh0mKYKBJ2hWArlbvcVIFmaaS6+2Yz6MpBavpHE0njzYWuqZfm6SO7cNCZY0UTtjUA8bIFiRRNzrNYWfA63YHCIQzcuiw==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/预算申请/预算申请审批.json b/Pages/项目/项目首页/预算申请/预算申请审批.json index d6090c33..ed118e89 100644 --- a/Pages/项目/项目首页/预算申请/预算申请审批.json +++ b/Pages/项目/项目首页/预算申请/预算申请审批.json @@ -186,11 +186,6 @@ "DesignLengthInPixel": 15.0 } }, - "19": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, "17": { "GridRowColumnDefinition": { "DesignLengthInPixel": 36.0 @@ -200,6 +195,11 @@ "GridRowColumnDefinition": { "DesignLengthInPixel": 380.0 } + }, + "19": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } } }, "Count": 20, @@ -259,16 +259,16 @@ "ActionTitle": "同意", "TemplateKey": "同意" }, + { + "ActionTitle": "暂存", + "TemplateKey": "暂存" + }, { "ActionTitle": "回退", "TemplateKey": "回退" }, { - "ActionTitle": "终止", - "TemplateKey": "拒绝" - }, - { - "ActionTitle": "拒绝", + "ActionTitle": "结束", "TemplateKey": "拒绝" } ] @@ -884,4 +884,4 @@ "Formula": "预算申请审批!$B$20" } ] -}//cwwZWmZ55p/NnYnqMKlwPrFmWNECBzO/UTHV46pQEAwNihsE9EOtlqdLeYt7HbUH+3JgTnvAFGEYldiAFlInhUOUvghffwXZ58QzY8XP6fdWQIc3tifaqPbxYRGAP4VtLz34wQs2CW3qQLJcaNWf3/CSAK4RAaP7dQwQy28jx9mHPGlCd0dkiV9BUfOK7kFcp3Vszb9/3gHmk1s4R9Oczn63cOtfLXEe2cQPe1Jr2GOFfxhtMVAb5umMg4pr4Cq2rwsMb27UA44QvMc0K6S6fXM41G2mxAQypEMUFveGW81WE/CVQtbY+MJBAoUHqYySVhnq7uhRE2VofsuiXmEMCL8jjL8RLgK1PG9UsPvUF9dzaI9wM0uOsnL4opNgfa4yDW7bCoSlbBMn1QvrJZ5pG2OOesc83zRHbVrVMqJ5ZTKHeOqC5ShaT+2A+S+Rx98igH/AiAs12v33LLxmB378QmwX1miM7bA4uampRIoRG+5huRDQlRZyB/RIxOWEb8lnXfKkq9ClOfeiXaCW/lkJyL/4f9MEtti7IagRPQD1/wTdupDe3pTSdutRtitjbZ6zlT33lm3o8KRdw0K+iZcD4zDbyNLS6NAWwkZBnY1dnCbJFqTUZ4qgUOB2LJbFpCKregdB0ScJmCRYvD7uWMO+KdigEvaTTVqmyes+jaNhk4aiL4UuPwyuHDrBBQ0iHov2pLscDMPnpvVuikLRpTz4YL74LHg/qMryWPAjbFyEaudJhvXQNA5/E1Aysef1FMAaQpZvJaQkYpATUsdILWY3pgkh6AKzfhZKYLpyo6b3vY6tmxzkPEdtBb+0dpAATD36tIdtmlpJOkKoxv7icXMafrWgykAxrm8etQME9kgf8oHKEIlbov6Qnw4KksuzM9iglj1f7w+ZSQxwOUaGH+gX3Q==|920 \ No newline at end of file +}//yhLSEz4tlQhf8hWm7mLttKZh4LBbHGTMhMkSywd7FNnCijkm03De3Y8Ybv3siQZ3npoexfW3o2mNwUtDn16mJKWeyTym9FHbROEWQkyJcs+9C6ROsI0tcr2pd+W3BKmmJEGBEZC5F0pzOyVPUn84lnjJPATeJGBNxHKB2l4Hh1aYh/RaXLnrucOzgcBzaxlT/LXxXOKML39Gbn9e8AZajPiX/GwR6Ghe5WlJAZA/4HVoY+62Nah2dJUrrOccsZOeNVSoD++l2LQekzMzKFWNpZp0UgbVHtz20El7HEcDeC0LxftJywePxGe0qYTjAJvm5cOIhxCY56JyV3CXsVG7UpHTWOvyQD6SBsLxGVwbzPuPdHumCv/fi8u/FTSUjjoUC0MGrRy8rUwZQFzhE8YCtyy4zl7N0SvFTTJwIVN/QKMt1er4cbYJE4hSF+NBdSiDpJVQrVLG6ld7QaKCovwLGl+IWHNoyM47An0WgA812o6mF5/KhVE1fcz0aAQJidS3rnhkRESutJJyGiFeq/WuzNzVCOC1TaluPr3l8Qj9ykbJvMPrz+uDrDblpUmTAFZeAtbrVfDIIsS1erFb4i1LRqo8IS3r0dqaPlOceNcmdtdH4FA0KxLV0nPlx6nPPF6PCU0J4ycB4f6Nbv0pX/iitUekKMOjZnyK6NAQGEmfmRdj7DbSX2nJ1gJRDJFsIKTgNtRfdovJZyotmR88skk+T6QsSKD5JCdpRBIMOPy5JnhX/dzaPyTIjjJLXcvqLXDqGOd3AVb7r6Lr9jhgaQdTzvhv4NzXcO7XjL50d+TUJW4Oe5AOHTChKBLjGM1QndoqPdD9v4tEamkQgM4pkD2/4uaA7H64pmPBExd0ySQXkhVSr5R3woYHeCN7vhC7AS2igDbY+ZgcKSarVHOjNM4M1g==|920 \ No newline at end of file diff --git a/Reports/工时报表.json b/Reports/工时报表.json index 734f11fe..966e3071 100644 --- a/Reports/工时报表.json +++ b/Reports/工时报表.json @@ -8,7 +8,7 @@ "TableName": "View_任务工时统计", "BindingInfos": [ { - "GUID": "2f5538c6-8d36-4efd-a631-e73ea1717884", + "GUID": "72592a16-f236-4ae1-9640-3828706da6eb", "BindingInfo": { "TableName": "View_任务工时统计", "ColumnName": "日期", @@ -17,7 +17,7 @@ "ColumnName": "日期" }, { - "GUID": "8b44ed2e-b5d5-40a8-b81f-8906e00012df", + "GUID": "e20ffb35-4008-47ba-aa32-947b82a29718", "BindingInfo": { "TableName": "View_任务工时统计", "ColumnName": "执行人", @@ -26,7 +26,7 @@ "ColumnName": "成员" }, { - "GUID": "e674a859-42b6-405e-a517-88f04ac845d6", + "GUID": "d9a93a5f-71c8-46bb-842b-4f9aeb431ac6", "BindingInfo": { "TableName": "View_任务工时统计", "ColumnName": "项目ID", @@ -40,7 +40,7 @@ "ColumnName": "项目" }, { - "GUID": "fc442dcc-31ef-47cb-b155-f7c29817420d", + "GUID": "8aeb1b52-e7a0-468c-8b7a-033408e6b087", "BindingInfo": { "TableName": "View_任务工时统计", "ColumnName": "任务ID", @@ -54,7 +54,7 @@ "ColumnName": "任务" }, { - "GUID": "d529d428-de6e-4123-846d-541265052219", + "GUID": "3be4f05e-5cbb-4a43-81a4-3eafb7558081", "BindingInfo": { "TableName": "View_任务工时统计", "ColumnName": "计划工时", @@ -63,7 +63,7 @@ "ColumnName": "计划工时" }, { - "GUID": "86db9bcc-9c90-4421-be40-5065e7ca62cc", + "GUID": "3a1744fd-d084-45a2-a1c2-e36d4b624be7", "BindingInfo": { "TableName": "View_任务工时统计", "ColumnName": "上报工时", @@ -72,13 +72,13 @@ "ColumnName": "上报工时" }, { - "GUID": "d5b2f008-9620-490c-b73e-8c53ff4d306c", + "GUID": "68caa1af-8708-4ac2-8e25-a693a4df7bc0", "BindingInfo": { "TableName": "View_任务工时统计", - "ColumnName": "实际工时", - "GUID": "6ef0aa5a-2d1e-4bc8-9c6d-17444f970d6d" + "ColumnName": "核定工时", + "GUID": "63fb43f0-95af-4e84-9d66-2243e248a524" }, - "ColumnName": "实际工时" + "ColumnName": "核定工时" } ] }, diff --git a/Reports/工时报表.rdlx b/Reports/工时报表.rdlx index e7442fc4..e0c01b77 100644 --- a/Reports/工时报表.rdlx +++ b/Reports/工时报表.rdlx @@ -1 +1 @@ -工时报表.rdlx3.5cm0cm0cm4.001cm1.5cmDimGraytrue用户名20cm0cm5.001cm1.5cmDimGraytrue项目20cm0cm2.5cm1.5cmDimGraytrue任务22.5cm2.5cm2.5cm2.5cm2.5cm2.5cm0.75cm0cm0cm2.5cm0.75cmDimGraytrue计划工时=Sum(Fields!计划工时.Value)0cm0cm2.5cm0.75cmDimGraytrue上报工时=Sum(Fields!上报工时.Value)0cm0cm2.5cm0.75cmDimGraytrue实际工时=Sum(Fields!实际工时.Value)0cm0cm2.5cm0.75cmDimGraytrue=Sum(Fields!计划工时.Value)0cm0cm2.5cm0.75cmDimGraytrue=Sum(Fields!上报工时.Value)0cm0cm2.5cm0.75cmDimGraytrue=Sum(Fields!实际工时.Value)0.75cm0cm0cm2.5cm0.75cmDimGraytrue=Sum(Fields!计划工时.Value)0cm0cm2.5cm0.75cmDimGraytrue=Sum(Fields!上报工时.Value)0cm0cm2.5cm0.75cmDimGraytrue=Sum(Fields!实际工时.Value)0cm0cm2.5cm0.75cmDimGraytrue=Sum(Fields!计划工时.Value)0cm0cm2.5cm0.75cmDimGraytrue=Sum(Fields!上报工时.Value)0cm0cm2.5cm0.75cmDimGraytrue=Sum(Fields!实际工时.Value)=Fields!日期.ValueAscending=Fields!日期.Value0.75cm0cm0cm7.5cm0.75cmDimGraytrue日期=Fields.Item("日期").Value0.75cm0cm0cm2.5cm0.75cmDimGraytrue计划工时0.75cm0cm0cm2.5cm0.75cmDimGraytrue上报工时0.75cm0cm0cm2.5cm0.75cmDimGraytrue实际工时0.75cm0cm0cm7.5cm0.75cmDimGraytrue汇总0.75cm0cm0cm2.5cm0.75cmDimGraytrue计划工时0.75cm0cm0cm2.5cm0.75cmDimGraytrue上报工时0.75cm0cm0cm2.5cm0.75cmDimGraytrue实际工时=Fields!用户名.ValueAscending=Fields!用户名.Value3.502cm0cm0cm4.001cm0.75cmDimGraytrue用户名=Fields.Item("成员").ValueTrue=Fields!项目.Value4.502cm0cm0cm5.001cm0.75cmDimGraytrue项目=Fields.Item("项目").ValueTrue=Fields!任务.Value4.498cm0cm0cm2.5cm0.75cmDimGraytrue任务=Fields!任务.Value文本框6文本框23.502cm0cm0cm4.001cm0.75cmDimGraytrue汇总4.502cm0cm0cm5.001cm0.75cmDimGraytrue4.498cm0cm0cm2.5cm0.75cmDimGraytrue2true0.5cm0.499cm27.502cm3cm2WizardModel{"layoutOptions":{"totals":{"totalsForRowGroups":true,"subtotalsForRowGroups":false,"totalsForColumnGroups":true,"subtotalsForColumnGroups":false,"showTotalsBeforeGroup":false},"features":{"expandCollapseGroups":true,"collapsedGroups":false,"enableUserSort":false,"steppedRowGroups":false,"showValuesAsRows":false}},"columnHierarchy":[{"group":{"name":"矩表1_日期_分组","field":{"name":"日期","expr":"=Fields!日期.Value"},"sorting":{"value":"=Fields!日期.Value","direction":"Ascending"},"itemName":"文本框1","itemValue":"=Fields.Item(\"日期\").Value","format":"d"},"children":[],"startBodyIndex":0,"endBodyIndex":2}],"rowHierarchy":[{"group":{"name":"矩表1_用户名_分组","field":{"name":"用户名","expr":"=Fields!用户名.Value"},"sorting":{"value":"=Fields!用户名.Value","direction":"Ascending"},"itemName":"文本框2","itemValue":"=Fields.Item(\"成员\").Value","format":""},"children":[{"group":{"name":"矩表1_项目_分组","field":{"name":"项目","expr":"=Fields!项目.Value"},"sorting":null,"itemName":"文本框6","itemValue":"=Fields.Item(\"项目\").Value","format":""},"children":[{"group":{"name":"矩表1_任务_分组","field":{"name":"任务","expr":"=Fields!任务.Value"},"sorting":null,"itemName":"文本框7","itemValue":"=Fields!任务.Value","format":""},"children":[],"startBodyIndex":0,"endBodyIndex":0}],"startBodyIndex":null,"endBodyIndex":null}],"startBodyIndex":null,"endBodyIndex":null}],"body":[[{"itemName":"文本框3","field":{"name":"计划工时","expr":"=Sum(Fields!计划工时.Value)"},"aggregate":"Sum","format":"n1"},{"itemName":"文本框4","field":{"name":"上报工时","expr":"=Sum(Fields!上报工时.Value)"},"aggregate":"Sum","format":"n1"},{"itemName":"文本框5","field":{"name":"实际工时","expr":"=Sum(Fields!实际工时.Value)"},"aggregate":"Sum","format":"n1"}]]}工时表_DataSet1cm1cm29.7cm42cm1cm1cm28.001cmjsondoc=http://localhost:40013/Forguncy/ARDataSource/GetDataSource/eaf0055e-b7c7-4fd9-9f79-abb67577832d;schemadata={"type":"array","items":{"type":"object","properties":{"日期":{"type":"date-time"},"成员":{"type":"string"},"项目":{"type":"string"},"任务":{"type":"string"},"计划工时":{"type":"number"},"上报工时":{"type":"number"},"实际工时":{"type":"number"}}}}JSON日期成员项目任务计划工时上报工时实际工时$.[*]工时表DisplayTypeGalleySizeTypeFitToPagePaperOrientationLandscapeParametersView{"controls":[{"left":15,"top":15,"width":275,"height":60,"control":{"type":"date-range","binding":["",""],"maxRange":["none"],"viewMode":"default","daysViewHeaderFormat":"","label":{"display":"top","text":"日期范围"}}}]}DefaultTheme.rdlx-theme \ No newline at end of file +工时报表.rdlx3.5cm0cm0cm4.001cm1.5cmDimGraytrue用户名20cm0cm5.001cm1.5cmDimGraytrue项目20cm0cm2.5cm1.5cmDimGraytrue任务22.5cm2.5cm2.5cm2.5cm2.5cm2.5cm0.75cm0cm0cm2.5cm0.75cmDimGraytrue计划工时=Sum(Fields.Item("计划工时").Value)0cm0cm2.5cm0.75cmDimGraytrue上报工时=Sum(Fields.Item("上报工时").Value)0cm0cm2.5cm0.75cmDimGraytrue实际工时=Sum(Fields.Item("核定工时").Value)0cm0cm2.5cm0.75cmDimGraytrue=Sum(Fields.Item("计划工时").Value)0cm0cm2.5cm0.75cmDimGraytrue=Sum(Fields.Item("上报工时").Value)0cm0cm2.5cm0.75cmDimGraytrue=Sum(Fields.Item("核定工时").Value)0.75cm0cm0cm2.5cm0.75cmDimGraytrue=Sum(Fields.Item("计划工时").Value)0cm0cm2.5cm0.75cmDimGraytrue=Sum(Fields.Item("上报工时").Value)0cm0cm2.5cm0.75cmDimGraytrue=Sum(Fields.Item("核定工时").Value)0cm0cm2.5cm0.75cmDimGraytrue=Sum(Fields.Item("计划工时").Value)0cm0cm2.5cm0.75cmDimGraytrue=Sum(Fields.Item("上报工时").Value)0cm0cm2.5cm0.75cmDimGraytrue=Sum(Fields.Item("核定工时").Value)=Fields!日期.ValueAscending=Fields!日期.Value0.75cm0cm0cm7.5cm0.75cmDimGraytrue日期=Fields.Item("日期").Value0.75cm0cm0cm2.5cm0.75cmDimGraytrue计划工时0.75cm0cm0cm2.5cm0.75cmDimGraytrue上报工时0.75cm0cm0cm2.5cm0.75cmDimGraytrue实际工时0.75cm0cm0cm7.5cm0.75cmDimGraytrue汇总0.75cm0cm0cm2.5cm0.75cmDimGraytrue计划工时0.75cm0cm0cm2.5cm0.75cmDimGraytrue上报工时0.75cm0cm0cm2.5cm0.75cmDimGraytrue实际工时=Fields!用户名.ValueAscending=Fields!用户名.Value3.502cm0cm0cm4.001cm0.75cmDimGraytrue用户名=Fields.Item("成员").ValueTrue=Fields!项目.Value4.502cm0cm0cm5.001cm0.75cmDimGraytrue项目=Fields.Item("项目").ValueTrue=Fields!任务.Value4.498cm0cm0cm2.5cm0.75cmDimGraytrue任务=Fields.Item("任务").Value文本框6文本框23.502cm0cm0cm4.001cm0.75cmDimGraytrue汇总4.502cm0cm0cm5.001cm0.75cmDimGraytrue4.498cm0cm0cm2.5cm0.75cmDimGraytrue2true0.5cm0.499cm27.502cm3cm2WizardModel{"layoutOptions":{"totals":{"totalsForRowGroups":true,"subtotalsForRowGroups":false,"totalsForColumnGroups":true,"subtotalsForColumnGroups":false,"showTotalsBeforeGroup":false},"features":{"expandCollapseGroups":true,"collapsedGroups":false,"enableUserSort":false,"steppedRowGroups":false,"showValuesAsRows":false}},"columnHierarchy":[{"group":{"name":"矩表1_日期_分组","field":{"name":"日期","expr":"=Fields!日期.Value"},"sorting":{"value":"=Fields!日期.Value","direction":"Ascending"},"itemName":"文本框1","itemValue":"=Fields.Item(\"日期\").Value","format":"d"},"children":[],"startBodyIndex":0,"endBodyIndex":2}],"rowHierarchy":[{"group":{"name":"矩表1_用户名_分组","field":{"name":"用户名","expr":"=Fields!用户名.Value"},"sorting":{"value":"=Fields!用户名.Value","direction":"Ascending"},"itemName":"文本框2","itemValue":"=Fields.Item(\"成员\").Value","format":""},"children":[{"group":{"name":"矩表1_项目_分组","field":{"name":"项目","expr":"=Fields!项目.Value"},"sorting":null,"itemName":"文本框6","itemValue":"=Fields.Item(\"项目\").Value","format":""},"children":[{"group":{"name":"矩表1_任务_分组","field":{"name":"任务","expr":"=Fields!任务.Value"},"sorting":null,"itemName":"文本框7","itemValue":"=Fields!任务.Value","format":""},"children":[],"startBodyIndex":0,"endBodyIndex":0}],"startBodyIndex":null,"endBodyIndex":null}],"startBodyIndex":null,"endBodyIndex":null}],"body":[[{"itemName":"文本框3","field":{"name":"计划工时","expr":"=Sum(Fields!计划工时.Value)"},"aggregate":"Sum","format":"n1"},{"itemName":"文本框4","field":{"name":"上报工时","expr":"=Sum(Fields!上报工时.Value)"},"aggregate":"Sum","format":"n1"},{"itemName":"文本框5","field":{"name":"实际工时","expr":"=Sum(Fields!实际工时.Value)"},"aggregate":"Sum","format":"n1"}]]}工时表_DataSet1cm1cm29.7cm42cm1cm1cm28.001cmjsondoc=http://localhost:26489/Forguncy/ARDataSource/GetDataSource/eaf0055e-b7c7-4fd9-9f79-abb67577832d;schemadata={"type":"array","items":{"type":"object","properties":{"日期":{"type":"date-time"},"成员":{"type":"string"},"项目":{"type":"string"},"任务":{"type":"string"},"计划工时":{"type":"number"},"上报工时":{"type":"number"},"核定工时":{"type":"number"}}}}JSON日期成员项目任务计划工时上报工时核定工时$.[*]工时表DisplayTypeGalleySizeTypeFitToPagePaperOrientationLandscapeParametersView{"controls":[{"left":15,"top":15,"width":275,"height":60,"control":{"type":"date-range","binding":["",""],"maxRange":["none"],"viewMode":"default","daysViewHeaderFormat":"","label":{"display":"top","text":"日期范围"}}}]}DefaultTheme.rdlx-theme \ No newline at end of file diff --git a/ServerCommands/TODO/保存计划.json b/ServerCommands/TODO/保存计划.json new file mode 100644 index 00000000..c366fd62 --- /dev/null +++ b/ServerCommands/TODO/保存计划.json @@ -0,0 +1,92 @@ +{ + "Name": "保存计划", + "Enabled": true, + "Triggers": [ + { + "$type": "Forguncy.SaveLoad.PostRequestTriggerSaveData, ServerDesignerCommon", + "Permission": { + "PermissionData": { + "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionData, Forguncy.RbacPermission.Core", + "permissionResource": { + "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionResource, Forguncy.RbacPermission.Core" + }, + "permissionBindings": [ + { + "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionBinding, Forguncy.RbacPermission.Core", + "roleNames": [ + "FGC_LoginUser" + ] + } + ] + } + }, + "Parameters": [ + { + "Name": "ID", + "DataValidationInfo": { + "IgnoreBlank": false + } + }, + { + "Name": "内容", + "DataValidationInfo": { + "IgnoreBlank": false + } + }, + { + "Name": "完成", + "DataValidationInfo": {} + } + ] + } + ], + "Commands": [ + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "TODO", + "ShowConfirm": false, + "RowsToUpdate": 1, + "RowsToUpdateCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "TODO", + "ColumnName": "ID", + "GUID": "0ba2d496-00ad-488e-b60d-a36cd5371365" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=ID" + } + }, + "UpdateBindingValues": [ + { + "BindingInfo": { + "TableName": "TODO", + "ColumnName": "完成", + "GUID": "bb6d8ba1-4ff5-4421-ab37-ed366319a29a" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=完成" + } + }, + { + "BindingInfo": { + "TableName": "TODO", + "ColumnName": "内容", + "GUID": "6b43b162-5111-45ff-91db-ce93958c3d75" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=内容" + } + } + ] + }, + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "0", + "Message": "更新成功" + } + ] +} \ No newline at end of file diff --git a/ServerCommands/工时/上报实际工时.json b/ServerCommands/工时/上报实际工时.json index f0701e5f..b462e5fd 100644 --- a/ServerCommands/工时/上报实际工时.json +++ b/ServerCommands/工时/上报实际工时.json @@ -363,7 +363,7 @@ "GUID": "f84fce9c-f3ff-449d-825e-eb0da9a68372", "BindingInfo": { "TableName": "View_任务工时统计", - "ColumnName": "总实际工时", + "ColumnName": "总核定工时", "GUID": "21ea4bc4-f68e-446b-9760-413f048a32ea" }, "ColumnName": "总实际工时" @@ -452,7 +452,7 @@ "ID": "34efaeaa449044baadb2591bdb778751" } ], - "ID": "a8aa1415-d49c-4539-83f7-c58187550c22" + "ID": "1b2a41cd-59f2-4eb6-8722-502e9091fb35" }, { "CommandList": [ @@ -475,7 +475,7 @@ "ID": "737f988cc853421ba2604b8663caa91e" } ], - "ID": "56cdb439-0a71-429f-984c-cd071878c6cc" + "ID": "bac1be11-862b-4214-b031-57e73855f119" } ] }, @@ -557,7 +557,7 @@ } ], "Comments": "如果是按天分配，则需要检测这一天的实际工时是否超出，", - "ID": "62e86d54-b241-4ab6-a941-9fd46c076b1e" + "ID": "c4f9fdb4-9a8e-45e1-82f6-3706c3b17408" }, { "CommandList": [ @@ -571,7 +571,7 @@ "ID": "0ded4e0b74d841e3b3fd855e20f27dac" } ], - "ID": "6c639e39-5c5c-4876-8d3d-32f09bfdccde" + "ID": "5f7c012a-9219-4318-8b03-42cf4f42552b" } ] }, @@ -835,7 +835,7 @@ } ], "Comments": "如果是分配到任务，就补一条计划，保证任务可分配工时准确", - "ID": "8fe38375-41cb-4b5f-8ef7-ccda5129a297" + "ID": "ff697dae-5961-406d-993f-7a733c0baa4d" } ] } @@ -860,7 +860,7 @@ "ID": "dfe08a493a80498e8915bc2fe710ad21" } ], - "ID": "0460ed6a-861d-4fe6-a598-b8c5c34a4fe2" + "ID": "743cffb8-d438-4c95-8527-1183b66e1b45" }, { "CommandList": [ @@ -873,7 +873,7 @@ } } ], - "ID": "0d45bbbc-829c-4691-a7d2-28a6fa2a83e9" + "ID": "fb7468a4-d48f-4f1e-a5e3-81e823c02157" } ] } @@ -925,7 +925,7 @@ "Message": "报工成功" } ], - "ID": "14a48dac-a86c-4438-86b6-60a4d81a093b" + "ID": "2fa1520f-ce4f-4fbd-8dcf-7735a69a81e9" }, { "CommandList": [ @@ -941,12 +941,12 @@ } } ], - "ID": "441069e4-55a0-476d-ad6a-6619da529099" + "ID": "af3cc7de-aa1a-4d82-986e-c50d58d08d34" } ] } ], - "ID": "62472742-dfb4-47de-9e2c-6f8536ee9535" + "ID": "c89141bd-dba3-43ac-8c63-a744de63f27f" }, { "CommandList": [ @@ -959,7 +959,7 @@ } } ], - "ID": "2959e3a3-8e8e-4251-9606-40fccc8fbd11" + "ID": "6e537909-5b24-4981-ae33-218036cfc9dd" } ] } diff --git a/ServerCommands/工时/计算报工数据.json b/ServerCommands/工时/计算报工数据.json index a855ad9c..a06ef7ff 100644 --- a/ServerCommands/工时/计算报工数据.json +++ b/ServerCommands/工时/计算报工数据.json @@ -413,7 +413,7 @@ } ], "Comments": "项目成员设置的时薪", - "ID": "f3cecd58-92dc-4c45-a33a-a9be4741249d" + "ID": "84eb4913-28ae-4ea8-b302-f9452ecf8e8d" }, { "Condition": { @@ -446,7 +446,7 @@ } ], "Comments": "项目岗位设置的时薪", - "ID": "944f8103-63ef-4716-8c1b-d30b3949d535" + "ID": "468771ce-d2a8-4b33-8555-559a881eb843" }, { "Condition": { @@ -479,7 +479,7 @@ } ], "Comments": "成员用户的默认时薪", - "ID": "dadfcb03-24f1-466a-99da-0bfdec822e05" + "ID": "96658d89-b617-4dc5-a5a7-33bd6553b420" }, { "CommandList": [ @@ -496,13 +496,13 @@ "ID": "1034a8bcf12a49328a31314e519829f0" } ], - "ID": "3df86216-2d54-4b98-a932-299d5e9e4983" + "ID": "3571b336-7011-433f-a851-ac9f09aeaae4" } ] } ], "Comments": "优先使用手动指定的提成金额", - "ID": "96797711-3589-4e4f-bfc5-aa778e4c3332" + "ID": "418a0bd3-4fc0-445a-9c0b-5d2fc5e45f93" }, { "CommandList": [ @@ -522,7 +522,7 @@ "ID": "c9b6eb8cb30e4eaa839a7e1e28ee50a1" } ], - "ID": "0df29ad0-e291-4646-9ae8-86bda46ac916" + "ID": "77da7dca-237a-4d22-a5b1-0d2bb6ca5f55" } ], "Comments": "计算成员的时薪" @@ -595,7 +595,7 @@ "GUID": "3d8ba6c8-14ff-4946-8236-e584acd8c684", "BindingInfo": { "TableName": "View_任务工时统计", - "ColumnName": "总实际工时", + "ColumnName": "总核定工时", "GUID": "58613864-7f3d-4ab2-9b2e-f1e1b7a86879" }, "ColumnName": "总实际工时" @@ -681,13 +681,13 @@ } ], "Comments": "先检查个人工时余额够不够，如果不够，直接提成为0", - "ID": "f7e4ea09-ecd6-4c98-9c59-31e62151354d" + "ID": "54dd6f5e-3b7e-4ba1-83da-93e90f04e981" } ] } ], "Comments": "如果分配到人头，则判断该人总计划工时还够不够", - "ID": "e52068bc-737f-4176-aa20-d3046d94e71e" + "ID": "7d11cf3f-fb7c-4336-b12d-76a718cdb842" }, { "Condition": { @@ -739,13 +739,13 @@ } ], "Comments": "先检查个人工时余额够不够，如果不够，直接提成为0", - "ID": "3e3b73a2-f093-436c-838f-750dd8525859" + "ID": "2609606a-f5a9-4617-b822-1f559a93e78b" } ] } ], "Comments": "如果是共用任务工时，则查看任务计划工时够不够", - "ID": "3f7f1f9e-bbb4-4387-a9e0-46affd2a65c7" + "ID": "5cd15c42-d06a-420a-b13a-6263fbb67379" } ] }, @@ -878,7 +878,7 @@ ] } ], - "ID": "875c33fc-351e-49d6-a37c-f147a04befdd" + "ID": "86f0c8b9-8ac6-419e-8290-067631c63fe7" }, { "CommandList": [ @@ -939,12 +939,12 @@ ] } ], - "ID": "b5cd6ccb-30ac-44fa-a9cc-e1ef62b87bd8" + "ID": "0a01bf3e-0108-445b-892b-822c27abc942" } ] } ], - "ID": "c46789d7-2412-40ee-b963-bda96df4db6e" + "ID": "6564b59c-450a-4099-9836-d28c9981849d" }, { "CommandList": [ @@ -977,13 +977,13 @@ ] } ], - "ID": "3bf512b4-7357-4959-9cab-f2822b771dd2" + "ID": "2c171798-c5d7-4f6e-a2cd-199c6771c1a2" } ] } ], "Comments": "如果提交的工时类型等于项目工时的核定方式且开启严格模式就校验本次有没有超标", - "ID": "13102dd0-43c7-4320-9bdc-7de0318c2b10" + "ID": "1ffdcfc2-b9c3-4de8-bbad-b53366ae2a55" }, { "CommandList": [ @@ -1040,12 +1040,12 @@ ] } ], - "ID": "670c9908-cf7f-4f63-a6a2-ee06ef589f29" + "ID": "f9c323aa-aa6a-445f-bb0e-b67eb59ac59b" } ] } ], - "ID": "e0654318-c53f-4e99-821e-6b0fd1177431" + "ID": "30d58d38-eb4a-49fb-b9e8-371934cd5d37" }, { "CommandList": [ @@ -1078,7 +1078,7 @@ ] } ], - "ID": "281bd9ca-b9be-4f9e-b4ab-469348391773" + "ID": "50115f34-3cd6-48f3-b4ad-6b579236578f" } ] } diff --git a/ServerCommands/系统/用户登录检查.json b/ServerCommands/系统/用户登录检查.json index c830fef5..332adc22 100644 --- a/ServerCommands/系统/用户登录检查.json +++ b/ServerCommands/系统/用户登录检查.json @@ -39,7 +39,7 @@ "TableValueType": 1, "BindingInfos": [ { - "GUID": "cf49211c-5c43-4a9e-a82c-33ce82a64ee8", + "GUID": "06725869-5ede-44f9-b4a7-9eeddb1d4e49", "BindingInfo": { "TableName": "TODO_分类", "ColumnName": "ID", @@ -49,18 +49,32 @@ } ], "SqlCondition": { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "TODO_分类", - "ColumnName": "分类名称", - "GUID": "cf6aa651-86d2-463c-ac10-46d532007be0" - }, - "Value": "系统通知" + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "TODO_分类", + "ColumnName": "用户", + "GUID": "fd2d5415-29b7-4753-929a-cc84ced3a726" + }, + "Value": "%CurrentUser.UserName%" + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "TODO_分类", + "ColumnName": "分类名称", + "GUID": "cf6aa651-86d2-463c-ac10-46d532007be0" + }, + "Value": "系统通知" + } + ] }, "NullFormulaValueQueryPolicy": 0, "TopCount": "1" }, - "ID": "f76b52f99d9e4fcd9c749234558cd8ac" + "ID": "b9ac9f6de8494b6b94d6c98e94d065d3" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -113,7 +127,7 @@ "ID": "f36548a257f143b5922c83035fca15ef" } ], - "ID": "8748a38d-9f5e-4f94-b388-145087b3f785" + "ID": "5defe9f3-a36a-4ff0-8b4b-21088419c0e1" }, { "CommandList": [ @@ -127,7 +141,7 @@ "ID": "7a12acd09ba94631a6dc9be484bec0a5" } ], - "ID": "d2a0b8f1-7a86-47e7-bb6e-da6763e5d232" + "ID": "03c3175c-dcc1-494a-b613-515a04889e25" } ] }, @@ -302,7 +316,7 @@ ] } }, - "ID": "156478a4d2fe4a5c9fcdd78649579aa4" + "ID": "07ab44a521784c2eb68289eaabe37343" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -383,12 +397,12 @@ ] } ], - "ID": "403573a0-99fd-4579-96e9-d5596de72c5c" + "ID": "594b78cb-92b6-454c-96c2-09455aa6396d" } ] } ], - "ID": "9b0a8774-3714-417e-b227-72809875ba0d" + "ID": "71b1fcb2-09db-43f1-9b97-4120e5b976a7" } ] }, @@ -752,12 +766,12 @@ ] } ], - "ID": "d6cad7b6-c74a-4f9c-8d26-e785923547ed" + "ID": "d3e2eb26-7b15-4723-9a01-bfd0f0341892" } ] } ], - "ID": "0e8cd23a-1fcd-471b-b34d-9a27522e70d9" + "ID": "268cefe1-af34-463b-adf3-4f91beb90c9f" } ] }, @@ -998,12 +1012,12 @@ ] } ], - "ID": "2317a5ed-30f7-4f8d-a4f6-bdf70504b652" + "ID": "35852be2-8d47-4b4b-b541-d1492e3cbf3c" } ] } ], - "ID": "dfe4af86-60ef-49a4-9f3b-783f27f377c5" + "ID": "2f3f1a5d-11e6-43ff-af19-f0b25e98d6b9" } ] }, diff --git a/Tables/工时/View_任务工时统计.json b/Tables/工时/View_任务工时统计.json index b0ebffc1..3a92b771 100644 --- a/Tables/工时/View_任务工时统计.json +++ b/Tables/工时/View_任务工时统计.json @@ -3,15 +3,7 @@ "Columns": [ { "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", - "Required": true, - "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": "datetime", + "DatabaseColumnType": "date", "MaxLength": -1, "Name": "日期", "ColumnType": "System.DateTime, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" @@ -63,14 +55,6 @@ "$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" }, @@ -78,22 +62,15 @@ "$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": "bigint", + "DatabaseColumnType": "float", "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" + "Name": "核定收益", + "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, { "$type": "Forguncy.SaveLoad.StatisticColumnSaveData, ServerDesignerCommon", @@ -104,14 +81,19 @@ }, { "$type": "Forguncy.SaveLoad.StatisticColumnSaveData, ServerDesignerCommon", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "核定工时", + "GUID": "aeb6cc88-7106-49b6-bb18-a05ebe351361" + }, "AggregateFunction": 4, - "DataColumnName": "实际工时", - "Name": "总实际工时", + "DataColumnName": "核定工时", + "Name": "总核定工时", "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, { "$type": "Forguncy.SaveLoad.FormulaColumnSaveData, ServerDesignerCommon", - "Formula": "IF([实际工时]=0,0,IF([计划工时]=0,100,ROUND([实际工时]/[计划工时]*100,0)))", + "Formula": "IF([核定工时]=0,0,IF([计划工时]=0,100,ROUND([核定工时]/[计划工时]*100,0)))", "Name": "工时完成比例", "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, @@ -131,29 +113,29 @@ "$type": "Forguncy.SaveLoad.StatisticColumnSaveData, ServerDesignerCommon", "BindingInfo": { "TableName": "View_任务工时统计", - "ColumnName": "计算提成", - "GUID": "635d4f7b-c81f-4609-91fb-6ba1156ab317" + "ColumnName": "核定收益", + "GUID": "9441cd08-c73d-4d56-9915-c4600411097d" }, "AggregateFunction": 4, - "DataColumnName": "计算提成", - "Name": "总计算提成", + "DataColumnName": "核定收益", + "Name": "总核定收益", "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, { "$type": "Forguncy.SaveLoad.FormulaColumnSaveData, ServerDesignerCommon", - "Formula": "[计划工时]-[实际工时]", - "Name": "剩余工时", + "Formula": "[计划工时]-[核定工时]", + "Name": "可核定工时", "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, { "$type": "Forguncy.SaveLoad.StatisticColumnSaveData, ServerDesignerCommon", "BindingInfo": { "TableName": "View_任务工时统计", - "ColumnName": "剩余工时", + "ColumnName": "可核定工时", "GUID": "bbc23449-d6da-4c22-899f-224b6f5b372f" }, "AggregateFunction": 4, - "DataColumnName": "剩余工时", + "DataColumnName": "可核定工时", "Name": "总剩余工时", "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" } @@ -164,12 +146,15 @@ "ConnectionId": "业务表", "SourceTableName": "View_任务工时统计", "SourceTableSchema": "dbo", - "CreateViewSql": "WITH c1 as (\r\n\tSELECT\r\n\t t.[ID],\r\n\t\t[项目ID],\r\n\t\t[任务ID],\r\n\t\t[执行人],\r\n\t\t[工时日期],\r\n\t\t[时薪单价],\r\n\t\t[提成系数],\r\n\t\t[请款单ID],\r\n\t\tISNULL([上报工时],0) AS 上报工时,\r\n\t\tROUND(SUM(CASE WHEN [工时类型] = '计划' THEN ISNULL([工时],0) ELSE 0 END),1) AS [计划工时],\r\n\t\tROUND(SUM(CASE WHEN [工时类型] = '实际' THEN ISNULL([工时],0) ELSE 0 END),1) AS [实际工时]\r\n\r\n\tFROM \r\n\t\t[dbo].[任务工时表] t\r\n\tLEFT JOIN [项目表] p ON t.项目ID = p.ID\r\n\tGROUP BY \r\n\t t.[ID],\r\n\t\t[项目ID],\r\n\t\t[任务ID],\r\n\t\t[执行人],\r\n\t\t[工时日期],\r\n\t\t[时薪单价],\r\n\t\t[提成系数],\r\n\t\t[请款单ID],\r\n\t\t[上报工时]\r\n)\r\n\r\nSELECT\r\n c1.[ID],\r\n [工时日期] as 日期,\r\n\t\t[执行人],\r\n [项目ID],\r\n [任务ID],\r\n [时薪单价],\r\n [提成系数],\r\n [计划工时],\r\n [实际工时],\r\n\t\t[上报工时],\r\n ([实际工时]*[时薪单价] * [提成系数]) as 计算提成,\r\n\t\tc1.[请款单ID],\r\n\t\tqk.[状态] as 请款状态\r\nFROM c1\r\n LEFT JOIN [收益请款单表] qk ON c1.请款单ID = qk.ID;", + "CreateViewSql": "WITH c1 as (\r\n\tSELECT\r\n\t t.[ID],\r\n\t\t[项目ID],\r\n\t\t[任务ID],\r\n\t\t[执行人],\r\n\t\t[工时日期],\r\n\t\t[时薪单价],\r\n\t\t[提成系数],\r\n\t\t[请款单ID],\r\n\t\tISNULL([上报工时],0) AS 上报工时,\r\n\t\tROUND(SUM(CASE WHEN [工时类型] = '计划' THEN ISNULL([工时],0) ELSE 0 END),1) AS [计划工时],\r\n\t\tROUND(SUM(CASE WHEN [工时类型] = '实际' THEN ISNULL([工时],0) ELSE 0 END),1) AS [实际工时]\r\n\tFROM \r\n\t\t[dbo].[任务工时表] t\r\n\tLEFT JOIN [项目表] p ON t.项目ID = p.ID\r\n\tGROUP BY \r\n\t t.[ID],\r\n\t\t[项目ID],\r\n\t\t[任务ID],\r\n\t\t[执行人],\r\n\t\t[工时日期],\r\n\t\t[时薪单价],\r\n\t\t[提成系数],\r\n\t\t[请款单ID],\r\n\t\t[上报工时]\r\n)\r\n\r\nSELECT\r\n cast(c1.[工时日期] as date) as 日期,\r\n\t\tc1.[执行人],\r\n c1.[项目ID],\r\n c1.[任务ID],\r\n AVG(c1.[时薪单价]) AS 时薪单价,\r\n AVG(c1.[提成系数]) AS 提成系数,\r\n SUM(c1.[计划工时]) AS 计划工时,\r\n\t\tSUM(c1.[上报工时]) AS 上报工时,\r\n SUM(c1.[实际工时]) AS 核定工时,\r\n SUM(c1.[实际工时]*c1.[时薪单价] *c1.[提成系数]) as 核定收益\r\nFROM c1\r\nGROUP BY\r\ncast([工时日期] as date),\r\nc1.[执行人],\r\n[项目ID],\r\n[任务ID]", "ViewInfo": { "ViewName": "View_任务工时统计", "IsUpdatable": true, "QueryColumns": [ - "项目ID" + "日期", + "执行人", + "项目ID", + "任务ID" ] } }, diff --git a/UserControlPages/任务统计信息.json b/UserControlPages/任务统计信息.json index 090c80d5..c71ebb88 100644 --- a/UserControlPages/任务统计信息.json +++ b/UserControlPages/任务统计信息.json @@ -126,152 +126,127 @@ }, "6": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 23.0, - "IsHidden": true + "DesignLengthInPixel": 23.0 } }, "7": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "IsHidden": true + "DesignLengthInPixel": 20.0 } }, "8": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 110.0, - "IsHidden": true + "DesignLengthInPixel": 110.0 } }, "9": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 18.0, - "IsHidden": true + "DesignLengthInPixel": 18.0 } }, "10": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "IsHidden": true + "DesignLengthInPixel": 20.0 } }, "11": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "IsHidden": true + "DesignLengthInPixel": 20.0 } }, "12": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 18.0, - "IsHidden": true + "DesignLengthInPixel": 18.0 } }, "13": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "IsHidden": true + "DesignLengthInPixel": 20.0 } }, "14": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 110.0, - "IsHidden": true + "DesignLengthInPixel": 110.0 } }, "15": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 18.0, - "IsHidden": true + "DesignLengthInPixel": 18.0 } }, "16": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "IsHidden": true + "DesignLengthInPixel": 20.0 } }, "17": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "IsHidden": true + "DesignLengthInPixel": 20.0 } }, "18": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 18.0, - "IsHidden": true + "DesignLengthInPixel": 18.0 } }, "19": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "IsHidden": true + "DesignLengthInPixel": 20.0 } }, "20": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 110.0, - "IsHidden": true + "DesignLengthInPixel": 110.0 } }, "21": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 18.0, - "IsHidden": true + "DesignLengthInPixel": 18.0 } }, "22": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "IsHidden": true + "DesignLengthInPixel": 20.0 } }, "23": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "IsHidden": true + "DesignLengthInPixel": 20.0 } }, "24": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0, - "IsHidden": true + "DesignLengthInPixel": 15.0 } }, "25": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "IsHidden": true + "DesignLengthInPixel": 20.0 } }, "26": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 110.0, - "IsHidden": true + "DesignLengthInPixel": 110.0 } }, "27": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 18.0, - "IsHidden": true + "DesignLengthInPixel": 18.0 } }, "28": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "IsHidden": true + "DesignLengthInPixel": 20.0 } }, "29": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "IsHidden": true + "DesignLengthInPixel": 20.0 } }, "30": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "IsHidden": true + "DesignLengthInPixel": 20.0 } }, "31": { @@ -287,33 +262,6 @@ } } }, - "InLogicalVisibleIndexes": [ - 6, - 7, - 8, - 9, - 10, - 11, - 12, - 13, - 14, - 15, - 16, - 17, - 18, - 19, - 20, - 21, - 22, - 23, - 24, - 25, - 26, - 27, - 28, - 29, - 30 - ], "Count": 32 }, "Values": { @@ -334,7 +282,8 @@ "10,8": 0, "10,14": 0, "10,20": 0, - "10,26": 0 + "10,26": 0, + "13,2": true }, "Formulas": { "2,4": "IF(C14,E14,D14)" @@ -465,6 +414,7 @@ "13,2": { "CellType": { "$type": "Forguncy.CheckBoxCellType, ServerDesignerCommon", + "CellDefaultValue": true, "Caption": "展开全部", "Style": 1, "CommandList": [ @@ -522,36 +472,29 @@ "Foreground": 3, "Formatter": 2 }, - { - "FontFamily": 0, - "FontSize": 12.0, - "Foreground": 4, - "Formatter": 2 - }, { "FontFamily": 0, "FontSize": 26.666666666666664, - "FontWeight": 5, - "Foreground": 6, - "Formatter": 7, - "HorizontalAlignment": 8 + "FontWeight": 4, + "Foreground": 5, + "Formatter": 6, + "HorizontalAlignment": 7 }, { "FontFamily": 0, "FontSize": 24.0, - "Formatter": 7, - "HorizontalAlignment": 8 + "Formatter": 6, + "HorizontalAlignment": 7 } ], "Types": { "Strs": [ "Body", - "#FF92A1AE", - "[AUTO]General", "Text 1 50", + "[AUTO]General", "Accent 3 0", "Bold", - "black", + "Accent 4 0", "0.0\"h\"", "Left" ] @@ -617,112 +560,112 @@ "1,30": 0, "2,1": 0, "2,2": 1, - "2,3": 2, - "2,4": 2, - "2,5": 2, - "2,6": 2, + "2,3": 1, + "2,4": 1, + "2,5": 1, + "2,6": 1, "2,7": 0, - "2,8": 2, - "2,9": 2, - "2,10": 3, - "2,11": 2, - "2,12": 2, + "2,8": 1, + "2,9": 1, + "2,10": 2, + "2,11": 1, + "2,12": 1, "2,13": 0, - "2,14": 2, - "2,15": 2, - "2,16": 3, - "2,17": 2, - "2,18": 2, + "2,14": 1, + "2,15": 1, + "2,16": 2, + "2,17": 1, + "2,18": 1, "2,19": 0, - "2,20": 2, - "2,21": 2, - "2,22": 3, - "2,23": 2, + "2,20": 1, + "2,21": 1, + "2,22": 2, + "2,23": 1, "2,25": 0, - "2,26": 2, - "2,27": 2, - "2,28": 3, - "2,29": 2, - "2,30": 2, + "2,26": 1, + "2,27": 1, + "2,28": 2, + "2,29": 1, + "2,30": 1, "3,1": 0, - "3,2": 2, - "3,3": 2, - "3,4": 2, - "3,5": 2, - "3,6": 2, + "3,2": 1, + "3,3": 1, + "3,4": 1, + "3,5": 1, + "3,6": 1, "3,7": 0, - "3,8": 2, - "3,9": 2, - "3,10": 2, - "3,11": 2, - "3,12": 2, + "3,8": 1, + "3,9": 1, + "3,10": 1, + "3,11": 1, + "3,12": 1, "3,13": 0, - "3,14": 2, - "3,15": 2, - "3,16": 2, - "3,17": 2, - "3,18": 2, + "3,14": 1, + "3,15": 1, + "3,16": 1, + "3,17": 1, + "3,18": 1, "3,19": 0, - "3,20": 2, - "3,21": 2, - "3,22": 2, - "3,23": 2, + "3,20": 1, + "3,21": 1, + "3,22": 1, + "3,23": 1, "3,25": 0, - "3,26": 2, - "3,27": 2, - "3,28": 2, - "3,29": 2, - "3,30": 2, + "3,26": 1, + "3,27": 1, + "3,28": 1, + "3,29": 1, + "3,30": 1, "4,1": 0, - "4,2": 4, - "4,4": 5, - "4,5": 5, - "4,6": 5, + "4,2": 3, + "4,4": 4, + "4,5": 4, + "4,6": 4, "4,7": 0, - "4,8": 5, + "4,8": 4, "4,9": 0, - "4,10": 5, - "4,11": 5, - "4,12": 5, + "4,10": 4, + "4,11": 4, + "4,12": 4, "4,13": 0, - "4,14": 5, - "4,16": 5, - "4,17": 5, - "4,18": 5, + "4,14": 4, + "4,16": 4, + "4,17": 4, + "4,18": 4, "4,19": 0, - "4,20": 5, - "4,22": 5, - "4,23": 5, + "4,20": 4, + "4,22": 4, + "4,23": 4, "4,25": 0, - "4,26": 5, - "4,28": 5, - "4,29": 5, - "4,30": 5, + "4,26": 4, + "4,28": 4, + "4,29": 4, + "4,30": 4, "5,1": 0, - "5,6": 5, + "5,6": 4, "5,7": 0, - "5,8": 5, - "5,9": 5, - "5,10": 5, - "5,11": 5, - "5,12": 5, + "5,8": 4, + "5,9": 4, + "5,10": 4, + "5,11": 4, + "5,12": 4, "5,13": 0, - "5,14": 5, - "5,15": 5, - "5,16": 5, - "5,17": 5, - "5,18": 5, + "5,14": 4, + "5,15": 4, + "5,16": 4, + "5,17": 4, + "5,18": 4, "5,19": 0, - "5,20": 5, - "5,21": 5, - "5,22": 5, - "5,23": 5, + "5,20": 4, + "5,21": 4, + "5,22": 4, + "5,23": 4, "5,25": 0, - "5,26": 5, - "5,27": 5, - "5,28": 5, - "5,29": 5, - "5,30": 5, + "5,26": 4, + "5,27": 4, + "5,28": 4, + "5,29": 4, + "5,30": 4, "6,6": 0, "6,7": 0, "6,8": 0, @@ -775,97 +718,97 @@ "7,30": 0, "7,31": 0, "8,0": 0, - "8,6": 2, + "8,6": 1, "8,7": 0, - "8,8": 2, - "8,9": 2, - "8,10": 3, - "8,11": 2, - "8,12": 2, + "8,8": 1, + "8,9": 1, + "8,10": 2, + "8,11": 1, + "8,12": 1, "8,13": 0, - "8,14": 2, - "8,15": 2, - "8,16": 3, - "8,17": 2, + "8,14": 1, + "8,15": 1, + "8,16": 2, + "8,17": 1, "8,18": 0, "8,19": 0, - "8,20": 2, - "8,21": 2, - "8,26": 2, - "8,27": 2, - "8,28": 3, - "8,29": 2, - "8,30": 2, + "8,20": 1, + "8,21": 1, + "8,26": 1, + "8,27": 1, + "8,28": 2, + "8,29": 1, + "8,30": 1, "8,31": 0, "9,0": 0, - "9,6": 2, + "9,6": 1, "9,7": 0, - "9,8": 2, - "9,9": 2, - "9,10": 2, - "9,11": 2, - "9,12": 2, + "9,8": 1, + "9,9": 1, + "9,10": 1, + "9,11": 1, + "9,12": 1, "9,13": 0, - "9,14": 2, - "9,15": 2, - "9,16": 2, - "9,17": 2, + "9,14": 1, + "9,15": 1, + "9,16": 1, + "9,17": 1, "9,18": 0, "9,19": 0, - "9,20": 2, - "9,21": 2, - "9,26": 2, - "9,27": 2, - "9,28": 2, - "9,29": 2, - "9,30": 2, + "9,20": 1, + "9,21": 1, + "9,26": 1, + "9,27": 1, + "9,28": 1, + "9,29": 1, + "9,30": 1, "9,31": 0, "10,0": 0, - "10,6": 5, + "10,6": 4, "10,7": 0, - "10,8": 5, + "10,8": 4, "10,9": 0, - "10,10": 5, - "10,11": 5, - "10,12": 5, + "10,10": 4, + "10,11": 4, + "10,12": 4, "10,13": 0, - "10,14": 5, - "10,16": 5, - "10,17": 5, + "10,14": 4, + "10,16": 4, + "10,17": 4, "10,18": 0, "10,19": 0, - "10,20": 5, - "10,26": 5, - "10,28": 5, - "10,29": 5, - "10,30": 5, + "10,20": 4, + "10,26": 4, + "10,28": 4, + "10,29": 4, + "10,30": 4, "10,31": 0, "11,0": 0, - "11,6": 5, + "11,6": 4, "11,7": 0, - "11,8": 5, - "11,9": 5, - "11,10": 5, - "11,11": 5, - "11,12": 5, + "11,8": 4, + "11,9": 4, + "11,10": 4, + "11,11": 4, + "11,12": 4, "11,13": 0, - "11,14": 5, - "11,15": 5, - "11,16": 5, - "11,17": 5, - "11,18": 5, + "11,14": 4, + "11,15": 4, + "11,16": 4, + "11,17": 4, + "11,18": 4, "11,19": 0, - "11,20": 5, - "11,21": 5, - "11,22": 5, - "11,23": 5, + "11,20": 4, + "11,21": 4, + "11,22": 4, + "11,23": 4, "11,24": 0, "11,25": 0, - "11,26": 5, - "11,27": 5, - "11,28": 5, - "11,29": 5, - "11,30": 5, + "11,26": 4, + "11,27": 4, + "11,28": 4, + "11,29": 4, + "11,30": 4, "11,31": 0, "12,1": 0, "12,2": 0, @@ -897,8 +840,8 @@ "12,29": 0, "12,30": 0, "13,1": 0, - "13,3": 2, - "13,4": 2, + "13,3": 1, + "13,4": 1, "13,5": 0, "13,6": 0, "13,7": 0, @@ -998,7 +941,7 @@ ] } ], - "ID": "8f8a6db6-9df3-4274-9385-6a8b18393d48" + "ID": "c007fc7d-8e7d-4fe3-8eb4-14e55618aadb" }, { "CommandList": [ @@ -1022,7 +965,7 @@ ] } ], - "ID": "9011c319-31e1-45f6-9a40-d580ce7ee909" + "ID": "80b774f6-2705-4fed-9b84-ddd89d7b8999" } ], "Disabled": true @@ -1067,7 +1010,7 @@ ] } ], - "ID": "be882799-6647-4a64-9290-86af92056e9e" + "ID": "cbef6c4c-c764-4b11-bcf6-3f1f7147b52f" }, { "CommandList": [ @@ -1091,7 +1034,7 @@ ] } ], - "ID": "699d90a7-b0d9-49d7-9535-2cd1e6ec3420" + "ID": "a3530d6a-5b7a-4ad4-bd58-df9b271bab38" } ], "Disabled": true @@ -1293,4 +1236,4 @@ "BoxShadowString": "1 6 0 14 #06000000" } ] -}//WZTvCW7xW3H4VFuHLyZNLWJR49FkCpSjr9oGrk3riKD4gRMTqPSa4RJz6ciHnBIQZC3Cr44ko0XI6b3j8++u0UoKMaWktwpTFsNGs2WXEBNUzGeXaK8K94/Ult7uF86Tuf/oNNNfdU/R9IVgUl/7WcxDX3PwZ9FHfxlWdoc7jyLVN3o3kugLnhFshlbzsT/TaNFlg0xSsy/ZzF7BiXiiOvJQyB4b7YVGov70dtHCnnpesrirNMkmu6stTKKTdNveD8keIxwQnU+SAfwbn6u+0oZQ6g3ROIZOEi4YpaxfKYHE0agNu2/qmPktoelkuwnbj9D44AroPEqUoYhN9eG+dpy9gU/fJG9HE9TRhCHOcLrg0609w+mcbfH9Hov4hazo+3R1nmuZSimnDx0sxCOAIQC2tCk/rc/bQ7atjMfx9w+VZpoaMzzP2mLYeL3hYgxLYAv8ELBWUtMxk+3y8uSbtfUC7Kl9T2zGyYCKRSNzq5IndSGgrTg2GnVdmKMsPVDZri4yBEF2qwKcK2tbcwBYz1LkSyaynYVNp5SSQAoc89wZJWIvem/d0TNj8Z+JYT9lXCKDILtVhw9KFoi9HVRwX/P7wDRbuZeZeAKvuGQaZbAPVIwaHuzgJuTV3acVyOC5puGeJR+HkN6g5cpb695IBDJ2gy3Nj45v7X6DfdGbym+mNv41Um032xTygwXcwPDJjh9RI2byLs6vjTAdQKMd7HqEs4XPFYG2eeyc/84gYPsoWNjJBlbWlnqkL5aYxSo3X8ZThaqAjANNrJ1ZvbI8KK/agjPWPxntgR4cEVKeCXNttY/k7N2WgZCsGAWDl96Aoi5ZUqqyYCqNhXnu6seD2R9YyPOaCwZkRNE9NZRGY2/PvN5K6h+hAe+6tEvYNo3lxqUBotSWpzLal/TCtM2C8w==|920 \ No newline at end of file +}//bKRKr8aeIRJS5y206BkuHbb9apE4M6FiBUIBSbT08hv1gLNjmEsakTvHvCI3YVBty7PqVZJrsFOUZNlfxF2GdI0cqVtmDRpXpEVUdGo/wqc4hZYzpkUflBgpw0Y4NqKrleYvBQDXZ4ZuZZypJg+kiIZW8NCFuQEwGT7BfGXNVWfdpPJxbpDpWml2KhuTtvXk156sSL632OavaHXdBhMzhs8sl9p3+91IbxiMv4NcglZtd38U1khvhceOCrmnSdMp+gUfU6WYTAFdNK96WfayOQBsbUPJai8X1AoSWtnIcBEApSoHydm/BRYqfQ6b2YoAnSFSPVnwFA62j9NJUuXWgeL14cjnLmkbsWe7cdJCk0Ob1WvD8DBjl0/owJyWur6NxG3NpsfmrbH9JS1Y2idYWCaI6M5zG1lv5IM7qvSRUGrdMJoygOEaMBNbCM32CUrXKcRxAndcFbFWCohqOZ7cYOgKQ0jkwazZelMGzXghQeI+NdW0OM4Ej9OVJJ+dsym6L1Nl9yZnjdf0lykWQD6dzoWlSqfpVxM0qn+8JpsndUsi4VU4UAhBzcxjj41vGO2Kg7FcpUKWCpWzRHh72rIG104WhIbJwu/pcTXBnE0Ftggrz7t2t+YB1V0fcElww6UtMnyOtNpywiWWGHOYvHjGJFbD4bbNp8pz17+R3eylE0Bg0AXUqa2NPZ74sulitXHr+XBJgsBgdX25S4TnCMD0ZmwhhPcmQF0eP/4bCEoeXY3p6/tmON1eb21JZwYNbreOEwSVKIF+aTbQ/VMIaXdQSxSfoCzzBF/9BDdvTDnUCjosIXplAjBD2DnBszr4ziCTsAH/VSNK0E0MHzox0J4kW9maeCNcBwbE61f3+hpQh7s8UOccedwCNHotKBh/IdP2B3ImeXkUwpVqDw4XpVBgjw==|920 \ No newline at end of file diff --git a/image/插图/成员.png b/image/插图/成员.png new file mode 100644 index 0000000000000000000000000000000000000000..dfe56e49b804009a7054b42bdf317a4684ba1c14 GIT binary patch literal 2655 zcmb7G`8(8m8~)5n*Nw$n>q^3<;h|GKqvg9Z`g+U}sNXpLFQjsOeT47ERaY7L> z#W*r4LZz%R$8gA!r9xww*ZUv5@AF*GegASl*Ym@3-Pd&|owhJ0;1%!y0D`HBq17hC z{~a7=6I*C*?VE(SY-P*<6`e}o0Km(e8tU7Gy39Jix+;B4CYzgHb>skO{rixg0z;)B zwwuyDn^cF8NRsYkRCo4EWLzJUXQ>Zz4iRtuTDlkh`^SZcNpCJGon2-tc%P`v#HSU@ ze~q9=El-&>>@X4}pFwH*e7iGGMv#Jt6hHxn6|rrtr^M3%u^vN~qaTEj(3nD^)7onw z3U2$7f)=Dv|D)*j<5;F{rGI9Ius^IP*;|p&#~ZZ?}==){bG-^)wivQqpg%5 zA79-Q@avX4;5xCv#g*)gvy8X4$@0UWT+^+TH$H>~dwhu5+0dZ|qNiV;u?t%|fje0A z`{tL)U)5{hk83ijKJu&NHQhyA4I!CuRA+UM)#HfP zmMm?%yfsRKw#!;Ws5>e!IQ;^fiwM-$=RdR?eZj6CE>4g?y%ABC-!kGx^z&IU(Sk$1NFw;td2`f0gH&eibbi{x&d+b#f;_#{(&QSM zx}}Qf=ST?47^#SMEKaG+)am~kwvu4wx7xq4su0;2w#`a8xK4$};`#)Mv@{Z6)=?nC zWv(p7S=nsavz~r~-BcN+@%(FOZ4_UH*j^o;fb>04*r365n zm6QSRH{R=gelgyKh3k<9kTzA!>zB1H_BmiVj5=EyQL_aG2>}7GqR-`hedrP()aBt% zZ{6jP{uEuS5=@9dC{6Xo1=scV?vAyvC+bWEQ0MO*Jzlbx#e6nDJ0Lw$!O=wpo<0D# z(J3SJG&E%^l-<;FO`ourrwnGFywdYIaTzUJw;=(eZ^hmzgJ0YoyUVOGxQ%3 z9-}47cJm=`zpU?V@*X(MkTQ@%GF*)kEUHXraOo z>z|b&d9|=o*?hX~eHyv>U_|;3<(Ejfn&6a@)F#rw*qLr7QmuY%f}mOncpsHzunB?U z9U9{ey3^KId>%?t^;|rcB0>--EvR5aSvD>RrC$;+DpXNe??r-CL8ZOW_mr+8J z+^NkU9>4`D%h>0yKL=1#LUQDkwoQ7wzWeWqGuZtpOhtev!dP;$L%O!SB3Uf=JiT{$ z)kTmR_r{l~Eg;wKAw3vj1tDM0OemrD>;!=t=l|Wta*ZunJ^3K3lCuCK(5S5!7VWyb zF^~GYobkQhYiFFH$NOHHQWhg+MPk2s_z{y-TV^Kw6F*;EI{`Fs__tzr)LctLS(f%1 zd~Sd^Fp7rRJI-q>^%HU7n(Zp)4N~0v-zLb8tS*%pi;McaQnB><24iPpKBdY#%;6C3 zkz!%kOvJ7dDV42_%!r9qvdOv4kHMdalCRPGeNlfXaC;iS(D<;SJl585s!WcTg~0SS z+m|wkyI!eI^Pf@f=jiCStf6u3Cw@eQ3>=Rzxp6FLTa7Z{xN*2U6mPCvr;5>8+_8B?e5_-O>_b+ZBF(;|V4M?n>hop+sqUr(j+jLPW{!PxW1PTHsOZ+M9yF)Abh9%sWy$g`~ApqQzH_Dwez8L*9 zzkK@NGyuhnZF%`=`($18Ov+eYj-nR$3r)np0J5#dKP|h#RJ4m|kk;ZMLEAIbf^heb zHz;(yDSGTYk=-p0JMl4*e=G`*1Dx?C(Aq%(Bn*V)WC}dVP%aN49#lt9YBx=`P)9IMTg)5R}^M`FcMe=ef;3s6>s!Y6VieRaM#B*bx zh7N@bdkSPs)W2d zT&DR*7B0rbp6Yg_h4nqz4$v;6ugawKmel7YZK6VukS#$lOIHUb$H3Xmn|(h1E`q#9 zXq3SXcY@r3?^!kAQ0`CD>BNGMRE|U{Fll3m?6%NO}n;HV3@Sk1qF3-y(-i;YC~kNb}Xk9LAT_K=pA)q!CejNa_F zBgFcZB!mKGG{=!CkRT)2(2nZ5{y`=j0eFOd)xQZqEz#2~JL%`!EzFsxv> G#{CCpZ?P8u literal 0 HcmV?d00001