From be3044a3ae9e33a70c51cd86cd1c96141ac603c7 Mon Sep 17 00:00:00 2001 From: "SHAMUSPC\\NINGMEI" Date: Fri, 5 Apr 2024 01:28:32 +0800 Subject: [PATCH] =?UTF-8?q?{"Message":"1.=20=E6=B5=8B=E8=AF=95=E6=96=B0?= =?UTF-8?q?=E5=BB=BA=E4=BB=BB=E5=8A=A1=EF=BC=9B\r\n2.=20=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E5=88=86=E9=85=8D=E4=BB=BB=E5=8A=A1=E5=B7=A5=E6=97=B6=EF=BC=9B?= =?UTF-8?q?\r\n3.=20=E6=B5=8B=E8=AF=95=E9=A1=B9=E7=9B=AE=E6=88=90=E5=91=98?= =?UTF-8?q?=E3=80=81=E4=BB=BB=E5=8A=A1=E6=88=90=E5=91=98=E7=AE=A1=E7=90=86?= =?UTF-8?q?=EF=BC=9B\r\n4.=20=E6=B5=8B=E8=AF=95=E4=B8=8A=E6=8A=A5=E5=B7=A5?= =?UTF-8?q?=E6=97=B6=EF=BC=9B","MessageType":2,"Modules":[{"State":1,"Type?= =?UTF-8?q?":7,"Name":"Table/=E4=BB=BB=E5=8A=A1=E8=A1=A8"},{"State":2,"Typ?= =?UTF-8?q?e":7,"Name":"Table/=E5=B7=A5=E6=97=B6=E6=A0=B8=E5=AE=9A?= =?UTF-8?q?=E6=96=B9=E5=BC=8F"},{"State":1,"Type":1,"Name":"PCPage/?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=A0=87=E9=A2=98"},{"State":1,"Type":1,"Nam?= =?UTF-8?q?e":"PCPage/=E9=A1=B9=E7=9B=AE=E4=BF=A1=E6=81=AF"},{"State":1,"T?= =?UTF-8?q?ype":1,"Name":"PCPage/=E4=BB=BB=E5=8A=A1=E9=A6=96=E9=A1=B5"},{"?= =?UTF-8?q?State":1,"Type":1,"Name":"PCPage/=E4=BB=BB=E5=8A=A1-=E5=9F=BA?= =?UTF-8?q?=E6=9C=AC=E4=BF=A1=E6=81=AF"},{"State":1,"Type":1,"Name":"PCPag?= =?UTF-8?q?e/=E4=BB=BB=E5=8A=A1-=E4=BB=BB=E5=8A=A1=E4=BF=A1=E6=81=AF"},{"S?= =?UTF-8?q?tate":1,"Type":1,"Name":"PCPage/=E4=BB=BB=E5=8A=A1-=E5=85=B3?= =?UTF-8?q?=E8=81=94=E8=B5=84=E6=BA=90"},{"State":1,"Type":1,"Name":"PCPag?= =?UTF-8?q?e/=E4=BB=BB=E5=8A=A1-=E5=AD=90=E4=BB=BB=E5=8A=A1=E5=88=97?= =?UTF-8?q?=E8=A1=A8"},{"State":1,"Type":1,"Name":"PCPage/=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1-=E5=B7=A5=E6=97=B6"},{"State":1,"Type":1,"Name":"PCPa?= =?UTF-8?q?ge/=E4=BB=BB=E5=8A=A1-=E8=BF=9B=E5=B1=95"},{"State":1,"Type":1,?= =?UTF-8?q?"Name":"PCPage/=E5=B7=A5=E6=97=B6=E8=AF=A6=E6=83=85"},{"State":?= =?UTF-8?q?1,"Type":1,"Name":"PCPage/=E6=96=B0=E5=A2=9E=E4=BB=BB=E5=8A=A1"?= =?UTF-8?q?},{"State":1,"Type":1,"Name":"PCPage/=E5=8F=82=E4=B8=8E?= =?UTF-8?q?=E6=88=90=E5=91=98=E7=AE=A1=E7=90=86"},{"State":1,"Type":1,"Nam?= =?UTF-8?q?e":"PCPage/=E6=96=B0=E5=A2=9E=E6=8A=A5=E5=B7=A5"},{"State":1,"T?= =?UTF-8?q?ype":1,"Name":"PCPage/=E5=88=86=E9=85=8D=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E5=B7=A5=E6=97=B6"},{"State":1,"Type":1,"Name":"PCPage/?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=8F=9C=E5=8D=95"},{"State":1,"Type":15,"Na?= =?UTF-8?q?me":"ServerCommand/=E6=96=B0=E5=A2=9E=E4=BB=BB=E5=8A=A1"},{"Sta?= =?UTF-8?q?te":1,"Type":15,"Name":"ServerCommand/=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=8F=82=E4=B8=8E=E4=BA=BA"},{"State":1,"Typ?= =?UTF-8?q?e":15,"Name":"ServerCommand/=E5=90=8C=E6=AD=A5=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E5=8F=82=E4=B8=8E=E4=BA=BA=E5=AD=97=E6=AE=B5"},{"Stat?= =?UTF-8?q?e":1,"Type":15,"Name":"ServerCommand/=E4=B8=8A=E6=8A=A5?= =?UTF-8?q?=E5=AE=9E=E9=99=85=E5=B7=A5=E6=97=B6"},{"State":1,"Type":15,"Na?= =?UTF-8?q?me":"ServerCommand/=E5=88=86=E9=85=8D=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=B7=A5=E6=97=B6"},{"State":1,"Type":15,"Name":"ServerCommand?= =?UTF-8?q?/=E6=96=B0=E5=A2=9E=E6=88=96=E4=BF=AE=E6=94=B9=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE"},{"State":1,"Type":11,"Name":"UserService"},{"State"?= =?UTF-8?q?:1,"Type":1,"Name":"PCPage/=E9=A1=B9=E7=9B=AE=E5=88=86=E7=BB=84?= =?UTF-8?q?=E8=AF=A6=E6=83=85"},{"State":1,"Type":1,"Name":"PCPage/?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E4=BB=BB=E5=8A=A1=E5=88=86=E7=BB=84=E8=AF=A6?= =?UTF-8?q?=E6=83=85"}],"Version":"v1"}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .collaboration | 315 +----- Pages/31a709cea02e45ad83bb92336a6d829.json | 16 +- Pages/94f8bae36aee4ae7aec2a063ca731b1.json | 8 +- Pages/任务/任务-任务信息.json | 26 +- Pages/任务/任务-关联资源.json | 22 +- Pages/任务/任务-基本信息.json | 71 +- Pages/任务/任务-基本信息.rd | 3 +- Pages/任务/任务-子任务列表.json | 22 +- Pages/任务/任务-工时.json | 234 ++++- Pages/任务/任务-进展.json | 22 +- Pages/任务/任务首页.json | 111 +- Pages/任务/任务首页.rd | 10 +- Pages/任务/参与成员管理.json | 71 +- Pages/任务/工时/分配计划工时.json | 690 ++++++++----- Pages/任务/工时/分配计划工时.rd | 4 + Pages/任务/工时/新增报工.json | 1010 ++++++++++--------- Pages/任务/工时/新增报工.rd | 3 +- Pages/任务/工时详情.json | 60 +- Pages/任务/工时详情.rd | 7 +- Pages/任务/新增任务.json | 17 +- Pages/共用/项目菜单.json | 79 +- Pages/共用/项目菜单.rd | 4 +- Pages/项目/项目任务分组详情.json | 17 +- Pages/项目/项目分组详情.json | 14 +- Pages/项目/项目分组详情.rd | 8 +- Pages/项目/项目首页/项目标题.json | 178 ++-- Pages/项目/项目首页/项目配置/项目信息.json | 12 +- ServerCommands/任务/同步任务参与人字段.json | 2 +- ServerCommands/任务/新增任务.json | 14 +- ServerCommands/任务/更新任务参与人.json | 6 +- ServerCommands/工时/上报实际工时.json | 486 ++++----- ServerCommands/工时/分配任务工时.json | 897 ++++++++++------ ServerCommands/项目/新增或修改项目.json | 16 +- Tables/任务/任务表.json | 25 +- Tables/字典表/工时核定方式.json | 54 - UserServiceDB.sqlite3 | Bin 561152 -> 561152 bytes 36 files changed, 2569 insertions(+), 1965 deletions(-) delete mode 100644 Tables/字典表/工时核定方式.json diff --git a/.collaboration b/.collaboration index 74792c3c..76d3546e 100644 --- a/.collaboration +++ b/.collaboration @@ -80,16 +80,7 @@ }, { "ModuleName": "Table/任务表", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-05T00:36:28.3001245+08:00", - "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\任务\\任务表.json" - ] + "ModuleType": 7 }, { "ModuleName": "Table/任务进展", @@ -111,19 +102,6 @@ "ModuleName": "Table/任务类型", "ModuleType": 7 }, - { - "ModuleName": "Table/工时核定方式", - "State": 2, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-04T23:59:35.7273198+08:00", - "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\字典表\\工时核定方式.json" - ] - }, { "ModuleName": "Table/项目状态", "ModuleType": 7 @@ -527,17 +505,7 @@ }, { "ModuleName": "PCPage/项目标题", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-04T23:46:19.6679321+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目标题.json", - "Pages\\项目\\项目首页\\项目标题.rd" - ] + "ModuleType": 1 }, { "ModuleName": "Pages/项目/项目首页/项目首页-容器页面", @@ -589,17 +557,7 @@ }, { "ModuleName": "PCPage/项目信息", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-04T23:45:44.3705424+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目配置\\项目信息.json", - "Pages\\项目\\项目首页\\项目配置\\项目信息.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目岗位配置", @@ -651,17 +609,7 @@ }, { "ModuleName": "PCPage/任务首页", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-05T00:00:48.4443771+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\任务首页.json", - "Pages\\任务\\任务首页.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务部分", @@ -673,93 +621,27 @@ }, { "ModuleName": "PCPage/任务-基本信息", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-04T23:55:07.3542164+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\任务-基本信息.json", - "Pages\\任务\\任务-基本信息.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务-任务信息", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-04T23:42:39.9880222+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\任务-任务信息.json", - "Pages\\任务\\任务-任务信息.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务-关联资源", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-04T23:42:56.2152041+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\任务-关联资源.json", - "Pages\\任务\\任务-关联资源.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务-子任务列表", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-04T23:42:23.8611704+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\任务-子任务列表.json", - "Pages\\任务\\任务-子任务列表.rd", - "Pages\\558ca610fafc4ffd8884b819161bfd6.json", - "Pages\\558ca610fafc4ffd8884b819161bfd6.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务-工时", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-04T23:43:11.4840841+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\任务-工时.json", - "Pages\\任务\\任务-工时.rd", - "Pages\\94f8bae36aee4ae7aec2a063ca731b1.json", - "Pages\\94f8bae36aee4ae7aec2a063ca731b1.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务-进展", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-04T23:41:34.6462219+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\任务-进展.json", - "Pages\\任务\\任务-进展.rd", - "Pages\\77fae08dfbac4664a299aa7ec207218.json", - "Pages\\77fae08dfbac4664a299aa7ec207218.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/工时详情-列头", @@ -767,33 +649,11 @@ }, { "ModuleName": "PCPage/工时详情", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-05T00:11:16.5829146+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\工时详情.json", - "Pages\\任务\\工时详情.rd", - "Pages\\31a709cea02e45ad83bb92336a6d829.json", - "Pages\\31a709cea02e45ad83bb92336a6d829.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/新增任务", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-05T00:39:06.5155745+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\新增任务.json", - "Pages\\任务\\新增任务.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/新增进展", @@ -801,17 +661,7 @@ }, { "ModuleName": "PCPage/参与成员管理", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-05T00:42:35.7943754+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\参与成员管理.json", - "Pages\\任务\\参与成员管理.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务成员详情", @@ -827,31 +677,11 @@ }, { "ModuleName": "PCPage/新增报工", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-05T00:03:42.1575665+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\工时\\新增报工.json", - "Pages\\任务\\工时\\新增报工.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/分配计划工时", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-05T00:36:28.300446+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\工时\\分配计划工时.json", - "Pages\\任务\\工时\\分配计划工时.rd" - ] + "ModuleType": 1 }, { "ModuleName": "Pages/共用", @@ -871,17 +701,7 @@ }, { "ModuleName": "PCPage/项目菜单", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-04T23:48:49.7427474+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\共用\\项目菜单.json", - "Pages\\共用\\项目菜单.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/编辑删除页面", @@ -1061,16 +881,7 @@ }, { "ModuleName": "ServerCommand/新增任务", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-05T00:39:35.1528869+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\任务\\新增任务.json" - ] + "ModuleType": 15 }, { "ModuleName": "ServerCommand/移除任务成员", @@ -1078,29 +889,11 @@ }, { "ModuleName": "ServerCommand/更新任务参与人", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-05T00:49:25.4439513+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\任务\\更新任务参与人.json" - ] + "ModuleType": 15 }, { "ModuleName": "ServerCommand/同步任务参与人字段", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-05T00:36:28.300469+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\任务\\同步任务参与人字段.json" - ] + "ModuleType": 15 }, { "ModuleName": "ServerCommand/提交任务评论", @@ -1120,29 +913,11 @@ }, { "ModuleName": "ServerCommand/上报实际工时", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-05T01:16:11.4229039+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\工时\\上报实际工时.json" - ] + "ModuleType": 15 }, { "ModuleName": "ServerCommand/分配任务工时", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-05T00:20:44.2941874+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\工时\\分配任务工时.json" - ] + "ModuleType": 15 }, { "ModuleName": "ServerCommands/项目", @@ -1162,16 +937,7 @@ }, { "ModuleName": "ServerCommand/新增或修改项目", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-05T00:41:27.7874632+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\项目\\新增或修改项目.json" - ] + "ModuleType": 15 }, { "ModuleName": "ServerCommand/移除项目成员", @@ -1591,18 +1357,7 @@ }, { "ModuleName": "UserService", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-05T00:43:09.5606811+08:00", - "ModuleType": 11, - "ToRemoveFiles": [ - "UserServiceDB.sqlite3", - "CloudStorageProvider\\data.json", - "SecurityProviderV2\\data.json" - ] + "ModuleType": 11 }, { "ModuleName": "CustomLibrary", @@ -1634,17 +1389,7 @@ }, { "ModuleName": "PCPage/项目分组详情", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-04T23:51:46.2638846+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目分组详情.json", - "Pages\\项目\\项目分组详情.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务版本详情", @@ -1652,17 +1397,7 @@ }, { "ModuleName": "PCPage/项目任务分组详情", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-04T23:50:17.6366507+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目任务分组详情.json", - "Pages\\项目\\项目任务分组详情.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目任务分组菜单", diff --git a/Pages/31a709cea02e45ad83bb92336a6d829.json b/Pages/31a709cea02e45ad83bb92336a6d829.json index 5a6de374..3a876b8c 100644 --- a/Pages/31a709cea02e45ad83bb92336a6d829.json +++ b/Pages/31a709cea02e45ad83bb92336a6d829.json @@ -224,7 +224,7 @@ } } ], - "ID": "60d2b8e9-6c48-4137-9147-a17f09f649d0" + "ID": "e17c6a02-e2c7-4995-ad7d-d02af8b74c57" }, { "CommandList": [ @@ -239,12 +239,12 @@ "BtnText": "知道了" } ], - "ID": "79cde712-b565-44bb-a585-369bb28161fb" + "ID": "df34408d-9f79-435a-9a4f-e6fdbaa91083" } ] } ], - "ID": "98cc84e2-5dde-4722-852d-ffd62e839539" + "ID": "fb9d03cd-fd2b-4a1c-9b13-7704d9fd237e" } ] } @@ -366,7 +366,7 @@ "value": "编辑" }, "CommandList": [], - "ID": "cd56b9f1-2e4a-4078-b91c-4f87ca6b03f4" + "ID": "93ce35c0-18d1-4f00-9f81-9f37c8f5c90d" }, { "Condition": { @@ -420,17 +420,17 @@ } } ], - "ID": "65bca8ec-1b35-4c6e-a093-26d98bc7dd48" + "ID": "afce6fcc-251a-4c8f-8adc-5b682cb6e19d" } ] } ], - "ID": "3d397f38-7d10-4a00-8d76-fb4be76e3392" + "ID": "d3ccf4c3-18c4-44f6-9533-e51b77c91ced" } ] } ], - "ID": "9e7cd2f1-cc3b-41a7-b3cc-19ddf9919357" + "ID": "ac314131-41c8-4631-9e01-ba8ec02a1536" } ] } @@ -550,4 +550,4 @@ "PaperSize": {}, "Margin": {} } -}//RU1z9eG8DELmkChaMFnw3aKm+7gQktrwbj7MJCmMzXOtHPE9ylIG7SyZ+ph7wLYaSq9FeKxufRNLEVMawUkevd6/Vv8Aiy7E+/ybWxsSpI3lEvpuBfsdLIJe9FGJRKvHXsCEYT06HdNBdrpYI7OWuinOR7phXFhG2LK4rnP+Y8yiSuZcmREmCFeLrO22XOFwUyNffuCN72M+97C0I8MZHz22uuu72QwGWZzLBUnlx0V0bkB9DC3oaUqrk9i4cWTmy6oeMC7Kh35o5ht8CMapm4V1+llzB4nmoRb0i8Dhzm4PTMNnUCAHp8r398JGZ4Ef9cfAkj3M5WGWT+59MV1PgWlYqft0D5K/fjEjeGJrfiVI1rqAFZo0SDzZhKGy+ebGQi46HjV6jm5AZLHNoW0Dy9R0ZAMlfW2Di8LOZvyaxDC5WzVFlGQR4p0Or77R9IbbrHBdX4GJZXUowZTV1Mm8rW3T+tvW3VJC3RS4487UWSm5e7cwZttkgzPDaXE7DTW0LuDUtA2TTNhm9RYxuVc90q2s5CCOs1UIzip/sQ2k/bgWmGFOQcxkBaD+rPLaUhssD8sQX9NHJe1DRZi80xTgDsBqafk+j5S5IVpYbBNivXK9P1kx3kXCztSXfBhGMuT2Bsh1bU7pqHVEXVhXwouWoeelbYWdM5OoOvwKl/Udq6uNh067Yv2NwBdJIM45nOpgZWpjPMK6aZEbfpf1k3G0xyJZF48rDgnBEgLbGaaP5dRGoDapycabWadjuGYkbS9ozZsp9PJqdOrYqvgb2biULejC6Gqjg0hVgjHtlG/6g2IdMhw3eACJC+DmE9SKUbfBm5E3r1FbDRDqYqsaY6Tk/v9TZrekjfKhkrKAUqGslJV2T1POtjWh0CEvIegNh7kMoqYttbfZ+jfoF1VymUffgg==|920 \ No newline at end of file +}//io1jvqFCqRKOc5mJdqEVpblzYrb7Fy+9d05bJaXkAp4VdLMTcBi8LAiy9fGIwiI9193thBtTm9E5tKeqRLTG5MbyQUS5EM8Nf9S9GItv73P4R4I1ZtPf7NoC0Utlzv6au6mymbduPTX7n8y5aGQF0GY7jROJ6k2ioTtnBcmoc+JlcnTwq/6WWW9n5St+E2vSzqQAXW6roKwwoImHU7MlJ/CwtksITKJx6+zcshChZ6hcSpbQOJyQwGADz/WggkuFKqDGyGRUckmsGAjsDX6ft9IozvQrt6UvNDgQwM8wrF3O1YPQPhI4hAn2D00EPmu0tT81JTAZNzXH74B7Yy421HJqIfJ+eRAzYSSLUozsnAppYbsrSKLr2Uiyr5ErukD3o5MvIfVzbkga7zA1c+vmCQUpOPceWvxDu+IARWxoqcpTc112MVmaJCuCJ/Y4eD19+0C+3+9zWW1H6nwAIUxC8Z4q5Ck13wcJko7Y/6rWgJWGOFXf2EipL4ecKw8fjkwKt7qfGet6KcsY//5hhBcUOreFo+RjawUBw2wUmchdH90LSarB9yA3et+VXOp5inpTOEoEWK+iDIxRvY7DOlepAFpujGDuWvGak5Vwf6HLhGG4QAfJnWW3My8i2lugLFa1OVHWVdKzNzxZz46rG2lUK1ftn9gMoSjQqlEeL2GZU+DT3OPEQ3dBgWTl4UZco4Ye89vAkiMDSbBln5DIpHQ9TDRrv7rJzV7RE3tfmNSb5a0ppo16jRyFwzX2aMxUehhXYAfDNfoacAacf6BZ/ljqoEgPoswDgkplkvQUu10Jovx5JEAj0Kux9Qfda27zOVbIfdi0WpXeSI4/A2upL0YCofJ5SIgn+FAa+PGKu/4+1z7pMwB0LuqH+y9REG/JRxM/1SUt6yIZc44uA68wIjeyIQ==|920 \ No newline at end of file diff --git a/Pages/94f8bae36aee4ae7aec2a063ca731b1.json b/Pages/94f8bae36aee4ae7aec2a063ca731b1.json index 9e5d4167..4cd65fab 100644 --- a/Pages/94f8bae36aee4ae7aec2a063ca731b1.json +++ b/Pages/94f8bae36aee4ae7aec2a063ca731b1.json @@ -145,7 +145,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "1ae34e42-0a90-40e0-9566-199f0a25a932" + "ID": "06eb9e3a-4f93-48f8-b44d-a962068fd873" }, { "CommandList": [ @@ -157,12 +157,12 @@ "ConfirmText": "您确定要删除吗？" } ], - "ID": "d28e2051-93a6-45f3-8a6f-c9bc5dec62cd" + "ID": "490f3673-ca6d-4838-a14d-608f02536a17" } ] } ], - "ID": "e97702c6-9f48-43eb-ad61-669938c27f94" + "ID": "bf83b8b7-7b53-49ed-9797-315b16efb1f5" } ] } @@ -230,4 +230,4 @@ "PaperSize": {}, "Margin": {} } -}//JV4wRukg+ELCcajeMmtu1h3hnAV2uUQNMqrkxY3xNtocmLVCCjBammzN3SOy6nb9IPwnX60CQvvQiBvvnkJbmzUF92Csmy44T9fpiLS2bUl1b76GdpujGsq4b0mHHBceAOBFGVCuLo1Tmbp6CU0p0M2El22p0QU4Pl8zajHK2s5G/HH5MbEhP+k3fWnNS+AeMll2Yn11Dca6gwvLOBEk8pKRb/9AXag0oK1+QgEiLKDNXnOdqnifreBdQuY74xwkXeM8o2mTk+8x7WCekIkSG80e5RzJUVZV8cQ1lfCXGIwB90Xq96KWiCyHAi5GKZiq4XZQEn8ozBu/0Aysu+VaIcq1RBMfNB5QkWkiIK7gK0H8O7xZiI55moSsMWlPqo3qLQKMWDefuzSAD4RlSgnECGsRBxVi4004MPHBfLiqgSl1y+t5pviQIHW56biGVIMWzmoMShJQwf+y7RnZ0K9/uFNU//7KXfXN/hgNaWQLU7pb7sgTJtQIFvxM7mIb+5+RT/8slKz2p66mSvTvF4GZ4S1al2IqcdybGIbhcu8I2Jh0IHb2EM6UG8qx5YWWal0ZlPhyG5EFn6tbUmE8TjjB7l2Lhr6NaD0PJD5k9/sGiTRrgREr77gy101KtB3RN2I5xbMdX6gFBoPg7/wMpBbhAfPRlP0u3jBx86vK6EocyV4F8Nremly+UJB+HjQ0F2tf7g82ZHJP4p6a6Vi26v11onceGdeciROEKH0KPCfeE4oBtFu9D3TiSGc1AQC44Eu6sBzPOLPDRN5DDNbxZ5N7TmPC/SMLKXmhG9UkcWf8m7Wqa2hoUN7HKGmFzHb03coJeDMeoOYpl718Ip9186ZP78iQk2FLXYM/JLC9CG5K5Xim2IdnsuXv4yV4g6OCPGM47a9hQSrso9W8CiBZrMPipQ==|920 \ No newline at end of file +}//TOsn/haRm31h8/3XjVcS4fcMcrGHd8Sf8guH6+QAzGTQSwmbjLJcZEos7CnQ3ONZBfXG+Iv3kKjyzdT+9IfSKimgx/2StVvkVsi9tyVL6cEvK6/W5QEgODrJmGKWFEK9TXgeJABT5gOo6tcZCnn6YpFI2C3VNSIX5MVt/FKA/psjTsVlVjHzvNBWpeOi0BsmrdltiNlHl3Jiin7xDWCH/1NiKYn/kaT0mq4rd1FEHjQUNg09CTq1Ts0wECBjJGOBNHGHT+pO6wdS2e6gfDa5ZM6BcYBIwiIUa1RBsGNfYHtPxvMmMXMIB6DBdkTjSF04zdRUykcxAXsqVk+KLMg/TwRDIVQRGiX+AoBxEum5y8a3DKZ2n8FVGBAI2b0EG+tYRLkMpL7kesNBp1nOeKZujGztiMsIJdM8R0LGP3wwCyQrmKblRM0alpu7BTZWIqgKNiisIv/5OERU2gh27Y2x2UzVulBcOJPBFZRq/MSE4QimiEUcO9WMaTXYCxSgwhNjHDOrsDWbljATzhvLc0KIJOcA/rit5zIlkTM/vIQ82kGOwVJ6al6lMiHOthnF4TCstY5LX3MduRb1Ayhn9n+B7WpLT0RvN0rQNBM+QCMpS2MCaC+RpK8/FkbUcNM0NMB46J/kISlXJnu4qWhS8zEq5t3n0OiUA7nBXsUSB+sFlrQJiiCNrNuMjg/FwIEHYA3PTORcitDKEQJHoTsGFvsSP4j0n2wtXALo1nsRNX9TzGWK7E+tQbJo/9YxctaD7IZLqwaxFn6S+tI0GQlqZ7t2K5wGV76EoSGPS4vMYTjELPF7RuCJQG+ea2zCb5jm0fJET+GuvpoC7cyHnFU7T1ud8+QgSUdrwxUFrM6Y81C7oPaadWuFXaZUfhTSx2frB9jTDiLBkL+16jUL3NiCcHQycA==|920 \ No newline at end of file diff --git a/Pages/任务/任务-任务信息.json b/Pages/任务/任务-任务信息.json index 53274305..97baa0ee 100644 --- a/Pages/任务/任务-任务信息.json +++ b/Pages/任务/任务-任务信息.json @@ -163,13 +163,19 @@ "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ { - "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", - "TargetPageElement": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-任务信息'!AB1" - }, - "TargetType": "Forguncy.HyperlinkCellType, ServerDesignerCommon, Version=10.0.1.0, Culture=neutral, PublicKeyToken=967100671921c115", - "MethodName": "ExecuteCommand" + "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='任务-任务信息'!折叠任务说明" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=NOT('任务-任务信息'!折叠任务说明)" + } + } + ] } ], "Text": "任务说明", @@ -349,7 +355,7 @@ "ShowConfirm": false } ], - "ID": "59554fd3-6a66-4edf-bdba-5a705838bbe1" + "ID": "4e9e1367-5d07-41f1-b120-db84370b6c9d" } ] } @@ -437,7 +443,7 @@ "ShowConfirm": false } ], - "ID": "38895c38-65d9-4cb6-9c0d-0f09b58925d1" + "ID": "89fe97cb-dec4-4315-a25d-9495b2c324a8" } ] } @@ -706,4 +712,4 @@ "Formula": "'任务-任务信息'!$Z$11" } ] -}//SmcA9Sw9yVCicaZB/VlcdwNj102LVttGRM4XDPbuaZre21crg2iwAC4N66M4LzHAO+rXFbCUmzkrmM3ExsT+NVx6o38EUktcfuJ/NUukRIhhWhB/M1n59MI72fXiCb0w78rE7Q2YLk1r+xWJtil0ZHcFUAYM9KpR8cUHi3XNmT5eSwDaJGvs0QBKG0o5kh12mvqMtbFIDDzkZRfMAfC8uyUjYlklnUzjsqNhvaYQRVr5chNh794D/Js94EVgWM6QWFtWqSYA7gEqDqBSgceDs02lwg00N71AY2q3+lQ4ZG2yZ5xWvTZVCtiQzaC0kckfwJWfY51ZsLQvRe52gpP0ms2XPobAZXpRay0jWZFoSPDvp15vG8uSFWhzLAurwSXOk0Ldowz8fRTRDFbxZ3JqTgSMISwn/LP0fmfTm6OmVIlkqihTMPWAfGTvMEQsKwFHSF2hRVvGdxkXixDWNiB3RBUmCsf9wBVW6daEquK5MBSW8JPZ87jPfKJ6qAR4/B7hcHcoqLosacwoVJ2L5rPc7gasvuA8avJnLVTA2JJC2SONglzDAV7ODH5Jm6KrWlE7Tp55usXCkhonvyfHQYCXfozVoYtj0nE6SvdOSms87M8BvCT3imEyd+KAoH6O304DxStxLDK7/K6Z3gHq375uij9zOTcfe3K4Q2z/NrQStaB7jtdGgoJ3Wnlgp5pskJ9F+FLEmNUupTsoiiWvVLohh21v5fgLViheVFm2Dig8fSuQpWysO8VqflB6a+hkX0b6BDGBxOK1RAV28NY+rzqZBvqJW8TEWv/2I22vJ+SQ6DWQtCcmsyGwCscbUxpoR+CQITrporc4TsUW3ruAyRlzTOjp9NJaLC/gtAX406MjfODdeCYXmpbkdxsXqZS37vy1UNCTCMZQnQeEo23e8BuMiA==|920 \ No newline at end of file +}//nyAST56G9WITROuOnDFE4vjZXgfnAwIbtDv/EJIf/RgKnN4dsa+lj4m7Blpab1Tr9RGjcRgTxtLgR6LL22wuiy0wiw981kG2XSTgCiTbJ7OINApATEMonK3Y5boEBSNLBN0vcAyZglN+QVt7LJFehPaZdy04vea/XS3MGAeqiHD5az9ScduP5M6C6ePCMexp6a2zS6i66EOrOYumNa9N6z1312n4kzQns5Qrlio3zDjOI4eFZMLh+3pAlLAldl9YuWJeQ3GS0LPxR0K1mTu3rQKifzPmHiHTRQvywPquKyxXWk2EqQr071M/5/fquHQ7B964OJ0Vs/i9XgOm49kPDgvQ7grb9lJNtG6D5vnuW46LwAXUBEZfRjombVDIrBo6Wbxpui8LIUBTXXEedpctfG2TaaWWxzF86WPLenzO08VyZmt9d27GZinD9ocguG1J62zJVc3+Yg909uLjttKULE5uTXEao8Bh+BIktlVlqKmIiS3NV8JI5wtaEBYO13hBF9UuH82ntOl+BKxJlVmlvKdfhCtzwLLae0dWR1ktsh5AWAF20SSknPLqBX7T/3gSFmgBmserNun39aVpBpbBR5tfi+XWXreavJM5mSSUdgfryDwwmySIO37vyDcjiBMUw2We0xThR96qvBttZsHSEnWi8dHP0jPT8Wcew6unPj4pnjfKfq480wyLc7UxDRBDg7GxEeNNUjoFPepUAGITV6N+a7ySoIZe/XoJHn4fULMoGQon6srMh54OpmWCnByiIQrUvg6Uqy4BjOIEHJfnzCHPjV46idDiyMDE0+Bx+iYeTtc0TJUR1nrW5HEASw3bSvF6PwXTskarQtZOMM2rHcJgbdrdtNdOTl0wXPcsaWPVvlhqzpFR6Vmz2KR5wr8NjRarFkTh8ZlSCSSbVHbadw==|920 \ No newline at end of file diff --git a/Pages/任务/任务-关联资源.json b/Pages/任务/任务-关联资源.json index 01a93a56..02e30d67 100644 --- a/Pages/任务/任务-关联资源.json +++ b/Pages/任务/任务-关联资源.json @@ -144,13 +144,19 @@ "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ { - "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", - "TargetPageElement": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-关联资源'!AB1" - }, - "TargetType": "Forguncy.HyperlinkCellType, ServerDesignerCommon, Version=10.0.1.0, Culture=neutral, PublicKeyToken=967100671921c115", - "MethodName": "ExecuteCommand" + "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='任务-关联资源'!折叠关联资源" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=NOT('任务-关联资源'!折叠关联资源)" + } + } + ] } ], "Text": "关联资源", @@ -366,4 +372,4 @@ "Formula": "'任务-关联资源'!$X$5" } ] -}//03pLmsP2luF50MvUqW3909EyQB2tuFDybcGEQeuGj56FLclmhXcXV+LlYhfy1c592CxfbrsvT69Ve2UYI83FT4M3+0ZTGBFP8sPKoFVl600c4tL6yvnsCbIC4O9a4IVpPSYbaTfCs4TnxEBSzWkM/2NUBVk6dgpwoLNGzW1MIwTPxoQQNq8nWeQevOhvU1XI+TngP1ltfqenV5Tp00gKrGJq0Nwnqjmos2mMW/nhJGn8pGawMxP5I52/p49nvqmZ35LDgznl09EwIsOb/QCoCY0iMsDmrwJJuCWFbej7CJ4nT/pBiaE7SU5Xql6EvzkccUvqYGYzcPHyGMrIzMVFicP6wr2IPm+qa0IA44U0JZyF4MWNmWmk/3tIUR5fn8SDEMIEKlwSQrG3A8QZ/NGA2FgK0/jR+hiMZnZNZpRnLxJ7O3fcDySmjdQ7xpwt9WQIy7Fj0Sm74JFYQES73Naodjh1wmZAdR6DTn5RvfGPdsl1c2srEC+TW305fL3r57WhzkGXrzX9mWtQGW9BLAWmwXInai00l/H4qMAsmIRCuLmCSI1Bsxv5MuY8t0/aHS1U7ThodiKfayJTtnw1Y9D8a2BTFJgIKF5j0+YreNpy+m1TbF3JFrndW3PiFc1RzPc4u1bR2DrSlQ0E2OvGlXdO17S0/KHrUkqMWigFZVxwxV/GQNHy3O5beqNgfYW1olIiUFhwZ8pz7B31oGkZOrt5n+pJjLuFpN6vk5/D9lPI22aad5SLspNdTsbVcbS1Q1FsfSezDzdG3O/PUuKv1XfgUvbF3WiahjUm7/X85rrXLc3sOSsHmw8N4vDLPj5Y5tih0x+MXyNEr4Kmagj0e3S7gG+MgAfhlx0vTe69oMVUJPln1MMjxmySfm3W6eUYxzSqdL4WTiTknlHKgEy2yskkoQ==|920 \ No newline at end of file +}//o53lBUBAY4nE4Cy95jgIjdR5tRJ6gU77LVaU9MwEKJW+2AB3C/aSDOIdHi3U7VJ7AxeciZdHFGTJIiHbAbCG48zyfJat1LwLR3K5Vs/Lvlayk9uQYEAz3V+nN6mjYcGORuAqS31k6JIUN1bT0a0tuIF9XqQCnUl+mEHMnkJgylCiTdty3KNnuvwvdJqhJ2nIeTD0iJ3vaRD8ojann3ah6WCfK3xYESuJToQvJZ70fxqD/CzNZq0wLXJEa6+RIugsmmYy8CmBfzUgF0uDHYzltNSpT2P5nU5E+0bjDMlk1sD14Kb4ZAaikkXFtWZujz5VIpIzX6TsxfBsMp3F/wjIW5QZQloK+jprjBLkvUowU3e58V26b1a936zy/S1Zq/WHqa2m544ePRO82gEZpAWfmDnQnD2buOSOPW7LEqAP3WYUGM94iuRmD3PSpnstopHloPoI3ttABw/JRiEWoP3qoO0j/71sIGGgZhKj9io76+Kxsk9bc/mCS29pXT42fWhk/ksHnmI0NpW5BPvKUcXQu0ll1LoyhTbUd/JPwd4++juURBUgsU4UpNHV3/R8EJuJZEChUro9pTL0Gmg3wsz1oytMzTtyGYEqnwegmXgrc6bq9XIESL7+K5O7awzjWb1v2wnp5popySldTNNhp/yoGF4eGWaim66S4gPtzz3X2RzFpQ/L/qY7s+xuZyt4iw3f39Dbt48z3yT1kqQ9Aui2sHpvEne0QuVge6KPR/16Vp4Tm/NJ5YpjUFcwcbPWs8JFTSWWoErj2NxE4x1ClYhMo+oDtmi7b99FKEzwCB8EOopTyP8I+72i+pTyEP7Z/l/A4VO4fGTKHcU3UzrKZrapYDNzEAiFhCyHD8THaS8d7SqJhzo4XK3a55uqeGsRW01UyGqfLfAl1jN2T9+XWpQ+Ow==|920 \ No newline at end of file diff --git a/Pages/任务/任务-基本信息.json b/Pages/任务/任务-基本信息.json index 96a60750..bfd5d64f 100644 --- a/Pages/任务/任务-基本信息.json +++ b/Pages/任务/任务-基本信息.json @@ -196,7 +196,8 @@ }, "Formulas": { "11,2": "C16&\",\"&J16", - "1,18": "IF(折叠全部=1,\"展开全部\",\"折叠全部\")" + "1,18": "IF(折叠全部=1,\"展开全部\",\"折叠全部\")", + "13,17": "C14-任务总计划工时" }, "AttachInfos": { "1,1": { @@ -211,6 +212,33 @@ { "$type": "Forguncy.CellTypes.Models.UniqueValidadator, ServerDesignerCommon" } + ], + "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": "任务表", + "ShowConfirm": false + } + ], + "ID": "ee69e102-a572-4322-afde-faf53fe179f3" + } + ] + } ] } }, @@ -424,7 +452,7 @@ } } ], - "ID": "0d35d364-e5cd-4eba-a2f3-c37856f30265" + "ID": "369e8c39-1f91-4b36-b6b1-04a19348997e" }, { "CommandList": [ @@ -439,12 +467,12 @@ "BtnText": "知道了" } ], - "ID": "4d4ca047-7f59-4265-a345-7cde9919fe16" + "ID": "79da7292-f940-4e9a-81b4-cf3e677660e4" } ] } ], - "ID": "46dcd830-1bf8-4398-af55-999f0608dc78" + "ID": "3b704a31-a91f-4c92-8354-9fd93cc1b6c2" } ] } @@ -502,7 +530,7 @@ "ShowConfirm": false } ], - "ID": "fcfef7ed-4a0b-4243-bc74-19c77c11872d" + "ID": "ae8ccb5d-6c66-41f7-a434-306c54578b30" } ] } @@ -606,7 +634,7 @@ "ShowConfirm": false } ], - "ID": "e70da13e-42fe-41c8-9d87-dfd9b1965492" + "ID": "a6aa6356-dc7d-49ea-8b55-067b80994118" } ] } @@ -712,7 +740,7 @@ "ShowConfirm": false } ], - "ID": "3be5d0ac-0b4b-4687-89e3-7f4af3182485" + "ID": "28b9d226-6c91-446c-84e8-3c74c0345670" } ] } @@ -749,7 +777,7 @@ "ShowConfirm": false } ], - "ID": "11f1cdac-20f5-47e1-b534-1199104fd164" + "ID": "fd080990-7d0a-48ce-8da1-9028a1affbc4" } ] } @@ -855,7 +883,7 @@ "ShowConfirm": false } ], - "ID": "a4cde5d7-3114-4535-b385-9abeabe92c84" + "ID": "35ab50c0-fdc4-479b-9e7f-70be84172174" } ] } @@ -1009,7 +1037,7 @@ "ShowConfirm": false } ], - "ID": "47665bfc-67b2-4907-96d1-3ef5818df591" + "ID": "8b6de6b5-5312-442f-bd1d-b7c92bd08ba8" } ] } @@ -1148,12 +1176,12 @@ "BtnText": "知道了" } ], - "ID": "2e76a916-4dc2-494e-98d0-812d00f64ed1" + "ID": "ad1c2305-30b7-4a78-8c09-144d7ac26774" } ] } ], - "ID": "e2a534ce-6c77-496a-9f22-fccbbe04c52b" + "ID": "19a30a96-6fab-4083-afba-7aa2268821b2" } ] } @@ -1179,18 +1207,6 @@ "controlsPosition": true } }, - "13,17": { - "BindingInfo": { - "TableName": "项目表", - "ColumnName": "ID", - "GUID": "409d7714-3aac-49da-92a6-e29098230608", - "RelationBinding": { - "RelatedTable": "View_项目统计信息", - "RelatedColumn": "项目ID", - "DisplayColumn": "工时分配情况" - } - } - }, "15,2": { "BindingInfo": { "TableName": "任务表", @@ -1269,7 +1285,7 @@ "Text 1 50", "[AUTO]General", "Left", - "\"工时使用情况：\"@" + "\"待分配：\"0.0\"h\"" ] }, "CellStyles": { @@ -1423,6 +1439,7 @@ "15,2": 3, "15,9": 3, "15,17": 3, + "15,18": 4, "15,20": 3 }, "ColStyles": { @@ -1465,7 +1482,7 @@ }, "RowBreakLines": [], "RepeatRangeSettings": [], - "RelatedDataTableName": "任务表", + "RelatedDataTableName": "项目表", "ConditionFormatRulesCollection": { "Rules": [ { @@ -1531,4 +1548,4 @@ "Formula": "'任务-基本信息'!$B$16" } ] -}//ywsxpqF/z8ZZ5pZCGQfgJMyh7cKz8v+bFT4DmWzIr07bVJCTS8ph7ubNoqyQkqdRXud238iqEPKkZlA86zB4tCBdW/lKF+mZ+JllVYF44Ngis+Xy+Kxpam0fbikrCNz/tTkYwMOx4Xt7oiI4Oj7Yal1+bWlX9uoQ/moqJCqESBJ1GnAkg05mz8SxGYmOubdNecMgwB2CIuNEvZOy+pr9sGM4JVHd3vUWeoPP03UktAZmXqswsQst2R1If6WkfhAmKKK5YlUAVGnn32xKygFlD8MlDIl2NMnLLatUzcqLaIkOMv417/VFrvr13Azr+PPpI6/tvo5V0R4fWtp5D5CLHbPK9QOLoPxWGmJcV++kSc4SvOBRqVyEiG1gSXbpHu3JImpQXglE5hoesuhcoz81imFziYYdxt3Psp85crvubgWM6AYklmNgMaGIhzCiEKNbQQ9wZDWNQ6PUgEJW0kih8Da2yGgmLdLsTSKR9O4pZcDoiix02Ma6yHpvsR7j9wvjvpnzfrYT6DQLfTS2Vsg58oXTuePNS+6LfiYhtoB8M+m0zsHI0VJjBLjznPTVyZJwwl06/erYz8KlHkpR8Od1pKqj9R1C3uDORY6wSRFQWV6o+m3U5abKGFA2+/xDsOI9nnI0y21JeuExpp4OGUSN+zZ5Q+cqYPqytyDPf0r3LTFXgkLC4Rw9SlgMCzjROnO17bO3DlVLejZxavcECgKWsevoGpbG3cpHpMynRgMsuByRVSMwiMFRqPJl87vehfLT2ZVa9gHJjfHI0m/MH+mQcDClj11itmq6gpWRW/xjm+YOtWPE+mh0+3gYE7K5z788U7snRaxujYY6K9vuLRujh7lmxvQnONc+bl02xxbDwRwKjmXU1dfM4OcD9FawkGxY1srQoXFOz0UkFKXPMjFyTw==|920 \ No newline at end of file +}//YMsMP+l1qFZtI+rpsA/Pw0wq6XfqGjy6Z+b1sqVSpcv2plOHorZh4ND8pO+JdFta/SXrzXk8uPldDYg9+0c3KHj8tATcYEN7ceUYUr69qIaXypwUpysJbjnY0wPPmLQISMZC2et3fYRFi5Bpcnjm1OxNFsLdD5UyyBslSzxYFR8fTMPyxxOaTYkVQ7MvQlMENpIE1iY5ENMraRnz2Tzzjb09Mx9+UZe170nyUsZdAbcuyPZFj9w3I7nrjFRN3VyRwExwaTLDVg+LGq/XxsKGM7NYHweSt6vfcbkjq0dtaqliy7Smn8UceFsaL3Rq2x73b6eSKjnqXteNy1KFcRuPxW0f3bVPIEzx5mydxGDRvEoULP0iM9lVA1qCqNZglDyanEkHUb4DojkebXhzsccuA83UL3E630UqNOim/0LJGaooVYQG+mCKN2LPllMnfa8UzhKxJt0AaS7QqDdV6D+DrHHgn7bRDfnBHK5Saoc1xGIn8ZL9/9EZJLoctlEKk7e7JYle15Z8toeFutu3DKHWGW1wWrfCMVsDf3dCnvk1QcZa2jD8Qy49RJuKwlpNypDn/mkkprU/qpRaYS6qn6QRZnw1BixYlcU+m3R5zdX7u/V3p6oUadDeOnIWzKHiHzhE5LwpKZK0D6EyBniA5X/ShFv6R9TaKlGcpooi95DvrKhciGni9nL5RqUT6CKYkBo9PmMB7yPrOVfOOOKY09G91AjFuSVRVDVQfbsQHAPbz7x4KSyMwYU9/91TpmfI6RTkwiHaghUuJa1EBeqoMDrad//sUM4FqiuzAUiarv2a6OHp9IU80luDVRZJEMjh0S0si/ljB53Xm+q09d076cIwL4U+9Mw1UrKDsfr42KURPKv8iSFGVa8Dcpc6AxPupVQ7XvoGRE6ClSJ4blt6QHtlWw==|920 \ No newline at end of file diff --git a/Pages/任务/任务-基本信息.rd b/Pages/任务/任务-基本信息.rd index f12570ab..a7760f83 100644 --- a/Pages/任务/任务-基本信息.rd +++ b/Pages/任务/任务-基本信息.rd @@ -4,7 +4,8 @@ "RowCount": 16, "Formulas": { "11,2": "C16&\",\"&J16", - "1,18": "IF(折叠全部=1,\"展开全部\",\"折叠全部\")" + "1,18": "IF(折叠全部=1,\"展开全部\",\"折叠全部\")", + "13,17": "C14-任务总计划工时" }, "CustomNames": [ { diff --git a/Pages/任务/任务-子任务列表.json b/Pages/任务/任务-子任务列表.json index e408891f..3564a178 100644 --- a/Pages/任务/任务-子任务列表.json +++ b/Pages/任务/任务-子任务列表.json @@ -156,13 +156,19 @@ "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ { - "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", - "TargetPageElement": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-子任务列表'!AB1" - }, - "TargetType": "Forguncy.HyperlinkCellType, ServerDesignerCommon, Version=10.0.1.0, Culture=neutral, PublicKeyToken=967100671921c115", - "MethodName": "ExecuteCommand" + "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='任务-子任务列表'!折叠子任务列表" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=NOT('任务-子任务列表'!折叠子任务列表)" + } + } + ] } ], "Text": "子任务", @@ -600,4 +606,4 @@ "Formula": "'任务-子任务列表'!$Y$6" } ] -}//ytO58gzn/497B0VzQNsgqi/mp/fOuSl1eWvgLM2U/vRs+/rJL3Zya5mvq8AnLWSOdEQtuGt50OkEvpcUsebKGwlsi7UQHWAZV+D37GQ0jO9ciM3Tg10xXSTZofRL+ESGNa6Tua1wmQLcMUsPA1kzfR2nlk6VfM2m0eNb1SVO0HdPiJNRYV3088347a/vK0NvsMAtNuWKC/9Yeroxgt9dKYfRn8pj7HuC1x+Ct7qsR/0nMmSLUfWSCOmrM5hHTxVOYs2n5VSF1oSnP2etzY0Q3QAfacpeGSXuD3zsXIvPvVm2nPLyMpKM5omfXmuicf2kJ+DQFkW5UL7DQoNkGu8u1S+3gfK9AFUEokFqIEAhB/VhNG8bMBOUgrt0kO6VX0bpSNKhH9Yye3D+N56i31g5MvatMugZagBt0Qyx1i6ALgMBuE5IcWdHyDgwb+ax7xtGVeI/ah11oSdXmHVZjC3sgB1dKOj63jcYLKPIGzKVwQ+8nCMxN8Zq4ZVenKaYbvSxGKZQ35Eu5kryeS5aFjKRtkbot83mW/AGQTPiX9ln5zH47t4jaLOCsn/nJrGDcJgJCPhDrkv3btql/MXMiyTbMCfUkWs2c2T9kf4jmsTBMuAhBVL2bIWHWl8eDf779XrJgrbepvrE0s7UU7nMPuGNdzBximVHXvtSoVgjqFR4r1/+fL2WbpI14yhyvstWcqqY2YUvVZsCSjHKplkoTQpZ2oUTOQds0Ep64UyxHUW1mphjub/6npQPuCNGqoH8MHd4Wh518SUqs+7qMGDypKdU8AOXH6UbuCRJUOYUwOytkaMLiqfD7u/zDyNF3wCKSsyBdBejH9dmh1OyqskgbAJYof11JoJxlU6wdcpK46RgEFbK4xm+iaca8VjnvrhBOzUphq8ESC7iNlZc8RjAQMBcGw==|920 \ No newline at end of file +}//CQlBD4PvupQrDCiRU6MnfknbHc4bchf5FjHSDniB9G80DocbsQfKJ/f34/UL6t5uO5d2W6fbeuu4yCKpHA+OzG8xsPOeL5bIpLjdbfvbj4GtP8OY/JyHb2l7engmqRYhk7xVZzcQjmVNHN9ajgQhzUsDJKOOJiGmBrlgO5JfepWwVHqtLNbe0WJP9FEb4f9q4XZEV+Yx8FO8As6sSokDkvYLHS4Lyv/UO2sxzKxa8tqZPy90+2xT+Ctcq7v2OidQCjH6M6F2gB0mtSTSi7LY9xdfUQtl47erl/d+X7aK2iKXtl3PgRM+V0hoiCWNa+wawSwItyD90RernTmUS0L/e8tDhxI5rxDHCG9VTJVj8YHAp7/kLVgkSSPq3EDE3bOu44uHWqdKbc1ZreCaacMcxZ/hF28ri7hJH1ez+0NgOq5fnnHGP1Rg6hTJ35URlbgyglQ4FuluB6J7jyYN35QQ1w3FnQnotqcQokwyBi68RQGPqJ7TWlZZcMBYY/yj5vPtnfiMbrvnZFWl+kHwxYuiFoltrCfSPa7iCwQK2yiSD9vOkcuG1P5IRF3bJXSVHvuru5qGt3inPror+qqx6/VEfeawHFKyF7CHG3kAA1+0GT7MUa+d/y8RskGjSJMxxEMTWPIhqb6eeW9wYTjBKWLZ9U8WYgNirZJOVwCvb5rBV/xqZ3U0tO1pzqN2oCM8eTxu+CVa6nOXPGEOOlwkiQ6MKzVNqZCRoYncXVuquZfShWmqdLeB4MJWoR+0KHpVZDdrNZNbfgnMDIAtlPE64M9wcgOyEM18F5tIQUZ4Kcc4kiYwKiyIKOVxEIO/TdYNIDQP6WzN/RCDACDs6oetZEJz9OgNyJj4EVD0P30Wt2vZtgbprHkoLozW6pMRIq/JHeWlOLBSW41mM7T3kmzt7NJuwg==|920 \ No newline at end of file diff --git a/Pages/任务/任务-工时.json b/Pages/任务/任务-工时.json index b5ce1f4d..c201128a 100644 --- a/Pages/任务/任务-工时.json +++ b/Pages/任务/任务-工时.json @@ -195,7 +195,8 @@ "3,2": "计划工时", "3,26": "计划工时", "7,2": "实际工时", - "7,26": "实际工时" + "7,26": "实际工时", + "11,27": 1 }, "AttachInfos": { "0,1": { @@ -203,13 +204,19 @@ "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ { - "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", - "TargetPageElement": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-工时'!AD1" - }, - "TargetType": "Forguncy.HyperlinkCellType, ServerDesignerCommon, Version=10.0.1.0, Culture=neutral, PublicKeyToken=967100671921c115", - "MethodName": "ExecuteCommand" + "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='任务-工时'!折叠工时详情" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=NOT('任务-工时'!折叠工时详情)" + } + } + ] } ], "Text": "工时详情", @@ -291,20 +298,46 @@ "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ { - "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", - "PageName": "新增报工", - "PassValues": [ + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ { - "Source": "计划", - "TargetCell": { - "SerializeProperty": "=新增报工!工时类型" - } + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon", + "tableData": { + "TableName": "任务表", + "ColumnName": "参与人数", + "GUID": "7f270bce-2f3b-4c1a-bf68-176fa4240638" + } + }, + "value": "0", + "compareType": 2 + }, + "CommandList": [ + { + "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", + "PageName": "分配计划工时", + "LoadBindingDataOption": 1 + } + ], + "ID": "651bb733-0a91-428d-bc28-e8c51ec20dbc" + }, + { + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "FourStandardStyle": "warning", + "Message": "请添加参与人后进行操作" + } + ], + "ID": "f74c9d36-31db-43f7-b4b1-7b934bc5c787" } - ], - "LoadBindingDataOption": 1 + ] } ], "Text": "计划工时", + "IsInvisible": true, "TemplateKey": "Gost", "Icon": { "Name": "Application/005_add_5.svg", @@ -313,7 +346,10 @@ "UseCellTypeForeColor": true }, "IconSize": 14.0 - } + }, + "RulesGuidList": [ + "b34ba4af-48de-4a25-8bd8-ddc8ff3e714d" + ] }, "7,4": { "BindingInfo": { @@ -339,17 +375,50 @@ "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ { - "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", - "PageName": "新增报工", - "PassValues": [ + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ { - "Source": "实际", - "TargetCell": { - "SerializeProperty": "=新增报工!工时类型" - } + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon", + "tableData": { + "TableName": "任务表", + "ColumnName": "参与人数", + "GUID": "7f270bce-2f3b-4c1a-bf68-176fa4240638" + } + }, + "value": "0", + "compareType": 2 + }, + "CommandList": [ + { + "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", + "PageName": "新增报工", + "PassValues": [ + { + "Source": "实际", + "TargetCell": { + "SerializeProperty": "=新增报工!工时类型" + } + } + ], + "LoadBindingDataOption": 1 + } + ], + "ID": "7bb2f23f-9c5a-46dc-8bb4-96e566e664f8" + }, + { + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "FourStandardStyle": "warning", + "Message": "请添加参与人后进行操作" + } + ], + "ID": "47baf1ef-15b5-4d5a-98dd-a957087ecab6" } - ], - "LoadBindingDataOption": 1 + ] } ], "Text": "实际工时", @@ -533,32 +602,84 @@ "11,27": { "CellType": { "$type": "Forguncy.CheckBoxCellType, ServerDesignerCommon", - "CellDefaultValue": true, "Caption": "折叠", "Style": 1, "CommandList": [ { - "$type": "Forguncy.Model.SetRowColumnLayoutCommand, ServerDesignerCommon", - "PropertyItemsList": [ + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ { - "Location": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-工时'!1:1" + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=任务首页!工时分配方式" + } + ] + }, + "value": "1,2", + "compareType": 12 }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-工时'!AB12" - } + "CommandList": [ + { + "$type": "Forguncy.Model.SetRowColumnLayoutCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "Location": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='任务-工时'!1:1" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='任务-工时'!AB12" + } + }, + { + "Location": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='任务-工时'!2:11" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=NOT('任务-工时'!AB12)" + } + } + ] + } + ], + "ID": "bd720028-d4f0-43ba-bed9-43b3f38e7eb0" }, { - "Location": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-工时'!2:11" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=NOT('任务-工时'!AB12)" - } + "CommandList": [ + { + "$type": "Forguncy.Model.SetRowColumnLayoutCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "Location": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='任务-工时'!1:1" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='任务-工时'!AB12" + } + }, + { + "Location": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='任务-工时'!6:11,'任务-工时'!2:2" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=NOT('任务-工时'!AB12)" + } + } + ] + } + ], + "ID": "ff7c2114-1391-4a12-920d-ac840c804050" } ] } @@ -767,7 +888,26 @@ }, "RowBreakLines": [], "RepeatRangeSettings": [], - "RelatedDataTableName": "任务表" + "RelatedDataTableName": "任务表", + "ConditionFormatRulesCollection": { + "Rules": [ + { + "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon", + "Formula": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=OR('任务-工时'!工时分配方式=1,'任务-工时'!工时分配方式=2)" + }, + "GUID": "b34ba4af-48de-4a25-8bd8-ddc8ff3e714d", + "StyleInfo": { + "Underline": null, + "Strikethrough": null + }, + "IsDisabled": false, + "IsInvisible": false, + "IsReadOnly": false + } + ] + } }, "PrintInfo": { "PaperSize": {}, @@ -810,4 +950,4 @@ "Formula": "'任务-工时'!$AB$12" } ] -}//Ghuy0TUZYAY/PqHz1bq8I5oHrCoB4pMYF/k9yc37/6X/Giex2fuzNixWAwbnRUy7gntbu1uPiYJ2g/g8++wurjdotDFLHO5srTv3Aatmp6Z0IdTdqLY3E/XYQIguunRrbwK2jrRGp+yuNfpcnugXDs2D8AXFpnK0u4m+rcO5M6VbY7oglK6jLSY3Pgw7Nu4LWdrvH5lzhho/f1VsiHuwt/Z6oJ54P2knyKgtOrtJhKh8vFKEvf69Y8qkzJRYIcuZiLTSmbBKg4GTe/ppuYpvF7H/CWgcm2uQ37Tq+X5IHrIoT5vMKHWJh03cxeUj6xCCC0/sKnhIblAyXQN7UqcuQZpZIiHRhP2vgjrriluiZPclwdRr6C6DpES90JF7M53gL4oTdci70gJ+dk8aEnhStU1dDVW3KlujkRUI5F75kuwVeR39lxAUi0DUz4eyTCV6v3OykqNH50jfNg1b1VXBG7+qa1c5uyZyO0UpSX4g+9XIWwAHU6medctWvpkc1un40WDoUjVJTwrGFgYEZWFJQtrM0FLsniIG2F6eeWOI6m47omgWnMH+4v5cdBDJaf9P0sgNZIzRrcNMn6OqFQa8BXB1aeMjnOw6LalkivBf8UE5N8SH1X2mhHUVoiHl0FTTa6H2oflauOxb8AI2mSnL/KIQUthcLntXnRTBxVAn3ZJNQ+Cwnb7tlQ0CSTce/fZd+mJ1dpQx9qU/MMjSUCgN2/EkZQs4DvpQssRCQwFudd5ayVEYUhp4oVwo5cYBRXdVOhg7+QjaRGuELaEDSHDSg95RGkUIsqXegVhDyp9NBVBZave3zop6croQtmcrOdVVaMs/V1OY35K9jUEBQOoz3BJPSgqcivLZWOrzb37qZJmgVPl5LqeJ2ucRwSEnpuM+s+WMVsBIubynUfMrZtrM7A==|920 \ No newline at end of file +}//EMwDodNYMAZH3dVCUbCZ6gGMCqzv3EXIfubN4J2O4xPdwYzM+yrvhysKbZWrqZ9AYH4FbIHEjC001TeHFi/kEzqSbyt/Jet5oJrVnERJsULqTpxEKu1rO37s+d+Yad8l6sX7h8abmuYHS1Mr5H7A0AsU3HUSWdM5YbKa5eeMR3epAqKvaqxKP8N8fw4U4QFWUyMtdgQScAXjNoesGQ7JElz1Gq4tjMGiPsdkYAy1MVRsvga2ZGCslO2KTsYgoit8qlLvKg/CnDD+CJg5Hc6AHRF0ullokp+HPznPTzkzvNroV+XmoNNRao7rFDzUUYR7ctq25ysPNr2Soubt4/qXLPltQzQX3RBhQOBTzpqZ9UbRDPZ7ct2yT49IX+X2w9Wxrur5j3p0UIljaPmorRg87bIKZSyLMcYQjtwaIYrd1P5Y2WrDu48JKpGvF0soAtBs49llSvJTo3DkcPhAdtu9dv1odKdviER+r1gHDapRvlb339Zf9CxBGL2mbZIshQ5YqIrzXkkkkdxep1asm0Gt2Yvva+wT+jmY1TQeYs1USELkvFOSyw9klQAq1onDNuVWctuVMILO3gV6wKARmemv/cWnTvS5yKaDicg/JUNSWyDab83baxDgOq8x/b8aUB8DY6Krx+h9YHDa3DyZGXCdymOOIMYmuyOcDgTZNOA9MjzHdl4DvdqJO+7GTfzPi/sAPYfuL5IkMNQkUaBwDT/fpuG3SUKu/sifjzi6WkFHOww/i+lCEivKIwXWr0rAng6VojZsiOWCV3+Igaa3QJU8PIp899rxTJ6TZStW/0cCu/WxUDcUuMCOx+jGNnlsDT6mepDdq74pXzA1gUwm1jFGX5N4bnk7ixeh9I70EPUqUZBATizIKbvSvnJefilfa0lZoaKIxdDL3KSzQBGriGHLrA==|920 \ No newline at end of file diff --git a/Pages/任务/任务-进展.json b/Pages/任务/任务-进展.json index 1a949424..a1bdb19c 100644 --- a/Pages/任务/任务-进展.json +++ b/Pages/任务/任务-进展.json @@ -164,13 +164,19 @@ "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ { - "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", - "TargetPageElement": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-进展'!AC1" - }, - "TargetType": "Forguncy.HyperlinkCellType, ServerDesignerCommon, Version=10.0.1.0, Culture=neutral, PublicKeyToken=967100671921c115", - "MethodName": "ExecuteCommand" + "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='任务-进展'!折叠任务进展" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=NOT('任务-进展'!折叠任务进展)" + } + } + ] } ], "Text": "任务进展", @@ -572,4 +578,4 @@ "Formula": "'任务-进展'!$Z$7" } ] -}//KlpvRGGIycNYb2PSPKGmIEwtsQJgfpy1tgwX7jyeiWzStbqJZ9WNm14G9ql0vPKx3QrViIouWFrkY13mAuCdUY5wnTTX4VtmEC81/ql/KyqqLs/U4toCPw2XXQTscyA2HB1VVozYEtrNnvACSKchYnft1cYJWjDhIf/i6u9oKlZDaOawllZWHQ+atmX1fNHxYu9LMk6JUV+dHHVPhK0jWeu+brVhFn4rHHx2pkh4+hs9vNLrW3reOdvkWjXL5Yzx8QsYzfCdgoRWowmwL0FD5oF37qANFJLyNmNWOiZ142kl8Pgs7WHjLgfylsyY/Z49+FiTxSbauIxuyjtf+vyc6nlcKWG730IO79NYa+FGxVlOMU/ip63Mtuhp6/F+48oyHPEbrT/bHPcIP3KN0JMg+hKT3Pek9seNChriWLh+x3ton6krSiajxbUFdqDNvjyhYfwmLUA1WXOaKjhnUQBRx0vUTK6qTCIkzWxZu50bRRt9peXi7qzmwDWGdritZUSm0g0ScHP29HHdghcQXG48+cYWblF8UVL8vw7gV7rNaS0Pvrs+y5POD79czi205bDoIYW0BeBSYUdpRF9rngA7b/PNlc/2caFm5lcHIoNbN6ULelEBp0ch4Ei3XlL8pShv/svcCPDo0WFxhqOy4V5GcMxUv4cCAEijVvGGdD/HXc4T+t3gqgM9aUCcb/52bjCd9vCyMeVDtRpzxpCZm19MnVbgpwPQvT1rLeQm8vuhN2twrNPx2y1W8mL+JR3sgQYu+B23VVFucyGweHC28JeY/eVwhrGPDI8nhtE58ECJO26otgTbDLtALL7yAhpZ6LzVhU8lpjZRxStElLXmGWTiBC7gJTafWabEZHM/ZUm7JBDGi0H9gtD4mR9LxbPTzr2EqHKXjrxufv9FQ/5n57xsMg==|920 \ No newline at end of file +}//YHrlh6mUCOnuX+0yTh6iTa45PB5bXF13EDn02C9gjQocEGs3SJB+HtoxbSnJ+bdjBbP1AS+qIJhyloQhOIqys5zNZVLJcleLOCwc1z4b1IEr5C67y9rBsIxiK5KqEQTvLIhU+pi0fdi4UiIeSv+UQaBZWL0vdGCBk1+8eFtMgCjuxYwo8e/mL/WQSpND6jdNBNLB1kPJVJDrH4j0xP1tD75MVCiLXlZJSSta4RoBCu6zOTCpNor3WaRfCF7YOZ7dWIGRS2alY6U7CscSquLws7T4PPBx1SThy2/qqHlyLmwwe7DEVupcSbLzRofGoEW/n0sS3Zt/4m4JwR6Yf6uNPQ4SSu8dEAOa1l++bdHXA37w2qCIDLo9M/3RmTT2ip6X8s5mOiEqm5WF5Bkj6QclnskRMczQjlgfwzyyT8plalJx1EQ/C/GY2JBzACswum+uIYqOE3ka1BcVpD39gwXKLOvWwYnoyRPMznzXIRKxBR1tZonmWkxmXkBAkjvZ7SNZHOlzQH0ORDJzkevuVg1msi6N22YkaaKhs0eGklrgaDFHRh5xXAZ3Lb+hb9F9cdxEeMITJb8kQddC5JAEPU0X/aare9+6qY2oS3S9p2Xei4cciPzpfhD6WzmmpBrLOz21xRyT1sXBLq5/Blnv3k7EcQCAJmfSninvBVYRUsI1p1p+egpv1RtsG2IQ20+T+aTD2cZAHKYKbJO+ZKt4XCtXQhMORoZ7QWGOCCBfpTDfhapSvNgsyH8Ei77ZrPdL61RQ/uL1RAkmP+/zvsZRm3SMD11hsWUGjy+/6rl0HQ46Flc63QF+h770aU+uNKBPZd32BE0PYOcDURmxRBx/VpXK4PFOUzPF5T4/pzC6n27kuvay5tznUCYyuc8K7hgz8e/Pf897aleG8f865j1JqcL0ow==|920 \ No newline at end of file diff --git a/Pages/任务/任务首页.json b/Pages/任务/任务首页.json index 69859877..c7ae4d9b 100644 --- a/Pages/任务/任务首页.json +++ b/Pages/任务/任务首页.json @@ -35,14 +35,20 @@ "DesignLengthInPixel": 32.0, "IsHidden": true } + }, + "6": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } } }, "InLogicalVisibleIndexes": [ 1, 2, - 5 + 5, + 6 ], - "Count": 6, + "Count": 7, "DefaultSize": 15.0 }, "Cols": { @@ -217,9 +223,11 @@ "0,30": "任务-侧栏", "3,0": "任务部分", "5,3": "任务ID：", - "5,10": "项目ID：", + "5,8": "项目ID：", "5,17": "参与人数：", - "5,23": false + "5,23": false, + "6,1": "工时分配方式：", + "6,8": "总计划工时：" }, "AttachInfos": { "0,30": { @@ -361,6 +369,25 @@ } ] } + }, + "6,4": { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "项目ID", + "GUID": "809c751d-a642-440f-bb14-1e45caff2246", + "RelationBinding": { + "RelatedTable": "项目表", + "RelatedColumn": "ID", + "DisplayColumn": "工时分配方式" + } + } + }, + "6,11": { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "总计划工时", + "GUID": "66115867-4c74-4e00-9197-9b03a2a24e92" + } } }, "StyleDatas": { @@ -394,25 +421,21 @@ { "Background": 4, "FontFamily": 0, - "BorderBottom": 1, "BorderTop": 1, "BorderLeft": 1, "BorderRight": 1 }, { "FontFamily": 0, - "BorderBottom": 1, "BorderTop": 1, "BorderLeft": 1, "BorderRight": 1 }, - { - "FontFamily": 0 - }, { "FontFamily": 0, "FontSize": 13.333333333333332, - "HorizontalAlignment": 3 + "HorizontalAlignment": 3, + "BorderLeft": 1 }, { "Background": 4, @@ -430,12 +453,22 @@ "BorderTop": 1, "BorderRight": 1 }, + { + "FontFamily": 0 + }, { "FontFamily": 0, "FontSize": 13.333333333333332, "Formatter": 6, "HorizontalAlignment": 3 }, + { + "FontSize": 12.0 + }, + { + "Background": 4, + "FontFamily": 0 + }, { "Background": null } @@ -504,22 +537,37 @@ "5,5": 7, "5,6": 7, "5,7": 7, - "5,9": 8, - "5,10": 9, - "5,11": 10, - "5,12": 11, - "5,13": 11, - "5,14": 12, - "5,16": 8, + "5,8": 8, + "5,11": 9, + "5,12": 10, + "5,13": 10, + "5,14": 11, + "5,16": 12, "5,17": 13, - "5,18": 10, - "5,19": 11, - "5,20": 11, - "5,21": 12, - "5,29": 13 + "5,18": 9, + "5,19": 10, + "5,20": 10, + "5,21": 11, + "5,29": 13, + "6,1": 14, + "6,4": 9, + "6,5": 10, + "6,6": 10, + "6,7": 11, + "6,8": 8, + "6,9": 12, + "6,10": 12, + "6,11": 15, + "6,16": 12, + "6,17": 13, + "6,18": 15, + "6,19": 15, + "6,20": 15, + "6,21": 15, + "6,29": 13 }, "RowStyles": { - "3": 14 + "3": 16 }, "SheetStyle": { "FontFamily": 0 @@ -533,7 +581,12 @@ "3,0,1,30", "0,30,4,1", "5,23,1,3", - "5,26,1,3" + "5,26,1,3", + "6,4,1,4", + "6,1,1,3", + "6,11,1,4", + "5,8,1,3", + "6,8,1,3" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -591,6 +644,14 @@ { "Name": "折叠全部", "Formula": "任务首页!$AA$6" + }, + { + "Name": "工时分配方式", + "Formula": "任务首页!$E$7" + }, + { + "Name": "任务总计划工时", + "Formula": "任务首页!$L$7" } ] -}//MH47e29jSVNS8oZ41A1n8m0CoOGJ+GZBPmHdWf0F+IfN54jxwU6mQDlDp5uWBYBRudFuy1PIhvxYAPA+lrOqFdkZb5kidSJ9CK+KeTA85o0v7CS64fnmeyK8/rKhS9QCKwX3L4qQ8nwAi420owA35kpD5fgQ1Rx7gdAnjpBBW/LZ3Y5xftvBARvZEM994+FaaH3ilTmWpr1LEpmSB0yqmj2YYnEXXxmKDz4z7ZDLMwnCn1O8KpHdXcnociEB2ShB5qV9ylbHS2MJtq/YKy/0kiZRZhC/ucfZsWf+THFRVqQiG42MQ+aYMt937lctgldJ0nMD3In0PQBdaw+NDCbcna7EfU0/sv4kT/TjEGQZ89DzH3UVkiN3UM+3W5xQfHBOTvRxBlZziSV7f61sBgo/RP6xbhJuWfO1OWeI2+wKhCsItXnS/kKC0N8U6KLOy2x4vmF6K5jFgBnFgPsO45UvxaCvgtz8escv8fKM4ikE6O4X++GpECkln458e3pL3ALA8M+dn3jaFaxCPwxNA2p6Rc2TqKelQ2SOCQvnRh5xibYPDMRlsnYOERg/IT69GKbdgVnvU7W2stplPQt7XAmhfKyD08zTJPLi9xXvctF2PGF0MqktFUIqrfc2lK1EATLdOKn1yBAWQlbdd+40twgjKaTCznqYm6RDyVqg6ReWBnZF7PF/Or0onRHRo8bvA4G7k/zkAMrNFs/W+MWqbYKsb3Fq/HRxVrOUbaXPk5f0sZDzdn94z3+H9FzWIEbRwCUdvtJJsiTgK4qd14dpc6Ie6aumMc1Q1MasSj+LhIwMpZR7m3EX8BwKmqnCXhIsJ2HuAZQW4zbT23mYVghDIuzqTTZPOzYlmLkhfdSTtG8Me3nmlb0KcdT/7mpn6HlwUm3Xhj70yHmfFWEuJscD5wDLmQ==|920 \ No newline at end of file +}//9iWcTkxJ7wb3iqOy4Z7eqTreJROVl4qRJuczkE8bJYrIeCiWt23ZIag9oSCGHKBdIB1eDVWY29WSQQyj9HWlUGK/TU/z/wsRus0hbyvZZQ7wLOvc3s4+5PIT2/bsQ9Y0HLml8rXMYr5jdg/ARhFnrxmKYZOIy0SvcEyczoDf214ZlHzxPAyUUeER8BiUG0qK3MLKNcpxsSOShZX+XRyDWVgNTTeyd31MwkZTZykhU9rJVAWSaPeIzyhOq8j6Q5c4b8uBxoGfurmTbC5RqbxkkSWxV4Zc33kmmppNG9ri+KA7X6OIR3cfq8GII/1d0ibFY59wqHpVxVJZUzFCSAJWrSgaFmjWv4uaXH6jbVEkT4lBuP/A0haOU7Ft95MiUYxfDZhIjI7BHVeo8pCGqlP2F7Vi8wre3mUTSEfx3PUJZrDg0xfeTEO1WccP3HWD/atGOWu7TM++ImZCvnRB7CG3XFUWWK8CyKlH6RIS53twDe5SguLwVtR44WX1kut/GmtKBGggj9MRG59DxHrPqM2aItNRn5kMKqg+z5Xyet5wESuCo4BpWd1io4bdujNbzsTZgVspcq6iQiNtC4xuuZAGvjzNynZVq737gZD40dXHLdJN7s8EhY4EL34HeICnFEKHLQRKNOUM9t4bc9Q3e4j7F7x4fmdjJtL6jdECKLxH1Xew8NeQ2++XERL5xTJ4rvR+NGEPG5ZF036dmYIem9o6zLY5qn0YEnNVrrvdFvxbwILwh7+Tq8Ca4tXK6znWrKJ+n2r3gxIDaFPTs5DDSUDmRHPDd0csT5g5+/J/tCKrKwTNtVdEO55bZOdFOedOxZYGHvT1+muW2JVKF+wjjUgCjol7dM7BgdyaA57XHtziO4Zg/Ev6hztMx1eobY/Fl2xHNJJVr1i6HJMkZVdcrN5usQ==|920 \ No newline at end of file diff --git a/Pages/任务/任务首页.rd b/Pages/任务/任务首页.rd index 0629d61d..c60e62da 100644 --- a/Pages/任务/任务首页.rd +++ b/Pages/任务/任务首页.rd @@ -1,7 +1,7 @@ { "PageType": 0, "ColumnCount": 31, - "RowCount": 6, + "RowCount": 7, "CustomNames": [ { "Name": "参与人数", @@ -22,6 +22,14 @@ { "Name": "折叠全部", "Formula": "任务首页!$AA$6" + }, + { + "Name": "工时分配方式", + "Formula": "任务首页!$E$7" + }, + { + "Name": "任务总计划工时", + "Formula": "任务首页!$L$7" } ] } \ No newline at end of file diff --git a/Pages/任务/参与成员管理.json b/Pages/任务/参与成员管理.json index 4f0ae2eb..88704f3b 100644 --- a/Pages/任务/参与成员管理.json +++ b/Pages/任务/参与成员管理.json @@ -194,20 +194,38 @@ } ], "SqlCondition": { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "项目成员表", - "ColumnName": "项目ID", - "GUID": "2f594d01-dffd-4dc9-99f4-fcc3d29f63f9" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=参与成员管理!B2" - } + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "项目成员表", + "ColumnName": "项目ID", + "GUID": "2f594d01-dffd-4dc9-99f4-fcc3d29f63f9" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=参与成员管理!项目ID" + } + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "项目成员表", + "ColumnName": "项目成员", + "GUID": "4bba478a-f28d-42ea-bf38-4e2244a0abc5" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=参与成员管理!B2" + } + } + ] }, + "NullFormulaValueQueryPolicy": 0, "TopCount": "1" }, - "ID": "4550405b5d2e4868a21bae55dca59b98" + "ID": "71ac7f3543074950bbc230bfb7490e06" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -236,7 +254,7 @@ "Column": "成员", "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=参与成员管理!成员.用户名" + "SerializeProperty": "=参与成员管理!成员.项目成员" } }, { @@ -268,7 +286,7 @@ ] } ], - "ID": "7af75ef0-c8bb-4933-9057-1ff8ce842526" + "ID": "6a54dc8c-b0d0-4526-a0ae-f3dfd5d3101e" }, { "CommandList": [ @@ -276,11 +294,11 @@ "$type": "Notiflix_Forguncy.Report_Command, Notiflix_Forguncy", "FunctionName": "info", "Title": "温馨提示", - "Message": "该成员尚未设置默认时薪，无法成为任务参与人", + "Message": "请先将成员添加到项目成员中再试", "BtnText": "知道了" } ], - "ID": "602998fa-e3d6-4a35-b01f-6bb3d28f7914" + "ID": "d45ec786-b1b3-458b-abe4-5512dabeb181" } ] }, @@ -342,7 +360,7 @@ "BindingInfo": { "TableName": "项目成员表", "ColumnName": "项目成员", - "GUID": "4d97fda7-da74-47da-839d-9fc789e6e43d" + "GUID": "1353a2bc-fcb4-49af-86a1-d7a674cdd192" }, "ColumnName": "value" }, @@ -350,7 +368,7 @@ "BindingInfo": { "TableName": "项目成员表", "ColumnName": "项目成员", - "GUID": "9d9741e7-d136-4a1d-bd47-d8ca4d6b15fa", + "GUID": "ac4c5f99-a88a-455d-b5db-6fd82f4d2152", "AttachType": { "$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess", "UserColumnAttachType": 1 @@ -364,14 +382,13 @@ "ColumnBindingInfo": { "TableName": "项目成员表", "ColumnName": "项目ID", - "GUID": "64b845f9-1031-4683-803e-781b50274e2a" + "GUID": "323485a8-fcad-41fc-b82e-d128279a0cc9" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=参与成员管理!项目ID" } }, - "NullFormulaValueQueryPolicy": 1, "CustomColumns": [] }, "placeholder": "请选择", @@ -421,7 +438,7 @@ "BindingInfo": { "TableName": "任务成员表", "ColumnName": "参与人", - "GUID": "69880c69-c462-46e0-ba9f-4a2c71d0af81" + "GUID": "638e0456-7356-49e7-9385-8ad1f5976da6" }, "CellType": { "$type": "Forguncy.DropDownListCellType, ServerDesignerCommon", @@ -448,7 +465,7 @@ "BindingInfo": { "TableName": "任务成员表", "ColumnName": "岗位ID", - "GUID": "83c7818e-5c43-4ca6-a078-3bfbd3a40187" + "GUID": "e5becdb3-f5bc-4056-b5e5-0efa84a95147" }, "CellType": { "$type": "Forguncy.DropDownListCellType, ServerDesignerCommon", @@ -657,12 +674,12 @@ "UpdateRowType": 3 } ], - "ID": "92dcd5a4-e17f-4ddb-a5a1-e78259418c4b" + "ID": "7f54fdab-65da-47f0-8f12-2cc07832e7cd" } ] } ], - "ID": "e26c862d-fd36-43c8-bb46-8418cf102157" + "ID": "fc92a3ec-00b5-401a-a4e4-342904b48266" } ] } @@ -741,7 +758,7 @@ "ResultMessageTo": { "SerializeProperty": "msg" }, - "RequestAsync": true, + "RefreshAfterFinish": true, "CheckDataValidation": false }, { @@ -769,7 +786,7 @@ } } ], - "ID": "f7591a32-e1c3-4bfc-9ac9-8e54465ea023" + "ID": "04425f15-73a9-4a07-ae78-f06a4b449680" }, { "CommandList": [ @@ -784,7 +801,7 @@ "BtnText": "知道了" } ], - "ID": "466a5345-713c-4aac-8240-4310ec207cca" + "ID": "464b8080-f6fc-4196-ac04-90ebfaacbc38" } ] } @@ -926,4 +943,4 @@ "Formula": "参与成员管理!$J$10" } ] -}//Y1w2VlW8idUuI/FfX0qlEzWPjneGNF9ywyOHj2NcOOPamSzHs+vedIppyziHGvha5knSYC8BZwivZfKjqvyUG86Xscf44P6Uux2MdtQcUnvxcJYxeTdct2ytvSTN5Pkcx1uE1vFRJhcQyqN+oZGGVVYhlquyof/A8wuhuIZghUeuQ8ALFbwpEsyALwJ8YjTXvu4YbJITwISxedICwczPN9K9xKzam6DV1RP9h9DRGUouxlaKofnaO97JorU2LwTYt5OrJb2TGCAviOVjZpO/W7ITY+WvjnUvn1zYTvHVqA99qAPIde5jfJzORL3T7IH2nNCO5vLagtRM12CjW/iTLim8SjGUjxdzV1LBhEutPTZdZ+eyMwAtBq4O2Jl/ePFUqcUWpIvjDy89ho/dproST6leVIAeb4tRZd+Rt00Hqe7SvwIjlpusZsYqt+p+jtGYWNag1Rjg4MOIrIZyEU9ZC0XZTTKoFL8s29YbLChFqgiJOLxxjcfvFEZ1muNRvVBbpeAQqBp3o3IigXng0BSX8cspmeYvZ+U8e8/QUzZTJQvXFeFRCIZdQVXMtChseT4CLCQFO4YrL2oioWUuFc076LR7/RIIMAO0+f5qxjcmFypZFS/2DybJpUQfa6HWDg0b3JFXHffWtZxo62P2erWhVJ/jF/KSiiRkrCOY8m2YSVA1u2aiP4ZdamQRZzWqpsPIrAbrnlPriqnphBpy5M7iHa5rnPvjequbYoZx4+sWU/ivrEdEpRbDqt4YwDW1OOXd9/RT8zphLWLfnHooZ/jezhoKqO8V+e/Qn4Rr+X73ZLOfTnxe6Q9d0qgaIzMyvE30QqXHeFECmpOTzaJvZSJuPw0aDDqNidK6U7AxdrVpzVBffEZXWaIIxISTpOKRb2+oEORHRaD6O4gJkHbw4kYgYw==|920 \ No newline at end of file +}//PNr2j19h0RQlB5HG1mAjQa2kLHyy9Dm+Zq4WVoJWHO260MP3hwsKPPx0Un3uHKdoNlHJuZ4d3GyWEcAWBeKxgU3G6BVWxpMBHVgKH6oOCJlB60vwR4udRRG4SjO5V8F6uoXTOx9zO669NKfBRKyZoFJFlx+0cFqO/WZbS0yjA/jZD9bpd35QAtKGzbRzZBEKd+Cb0O88q5pzmdldPn788ePIs+9ZnqEqgMPw0/xF9ToczC3eaNUHuf8VE2GcnVkO3cwd2RDk6vvrXo+I8i/PBzfS333SWQ+Tx7bbRSSOilM05eGpndXcAplMxqCqLiH10DhNhHRUgcaf8WJIBMYsZnM1/X5VbYNMhn5HkurEtcX9rU5dR0m0feZNt21LjSDivnnpTB246ZC6YO4184gj3GnffS4vb8CEUnifSLCLX4eAdBh6m3vAvk+YBkCsgpF7+6hi/esa2lb13abawL5iOWliE93ihesZ4yeZgseIzBmisaCmgYy/D+AG1sddWcEtMyR1NUqq8OiExp/bNm7HyGZ9mkUdAfjJPKL6Kbi8CeN+yYRmjHSK8i7zRzbEPIWT6GFgPil866LELcKyn8J3J622b7H+UVhbO6goA0+2B8gPPot6a/AWCvRmNQCap2CH6GqOoajl1RtFtq7mqW+KcdOYnq4+L6exPToyA4XpPmAIvpTc578breBfVh2RxTbwYLivGvHvmbMytQHRK4Ey+hOZsNLt2hM9M+sNtLXseGB1fKZ2opxdOTb+0zg0+h16U+pnRcf+Eunau3+JE0JSgI0daY/vKDtDNnOGysU1+rBY+xbC1oxvDNwXxcvDzLGkqnjGvUxDl15zQ31f2S1EWvSuobPPvlC/9YSw/gJBFrDB+l8VefrV/I29BzBIGbEokiQbgh0V57QJsSO2Z0HnAw==|920 \ No newline at end of file diff --git a/Pages/任务/工时/分配计划工时.json b/Pages/任务/工时/分配计划工时.json index dad2f065..a303faa3 100644 --- a/Pages/任务/工时/分配计划工时.json +++ b/Pages/任务/工时/分配计划工时.json @@ -235,8 +235,9 @@ "DefaultSize": 32.0 }, "Values": { - "1,1": "工时执行者", + "1,1": "执行者", "5,1": "分配日期", + "7,1": " b", "9,1": "工时数", "13,1": "备注", "20,1": "取消", @@ -289,25 +290,41 @@ ], "bindingOptions": { "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", - "TableName": "用户信息视图", + "TableName": "任务成员表", "BindingInfos": [ { "BindingInfo": { - "TableName": "用户信息视图", - "ColumnName": "用户名", - "GUID": "dad6e6c2-ac49-462c-83c2-e2692ec02909" + "TableName": "任务成员表", + "ColumnName": "参与人", + "GUID": "bcb33806-11fd-48a4-9492-2ba7c9a8d93a" }, "ColumnName": "value" }, { "BindingInfo": { - "TableName": "用户信息视图", - "ColumnName": "全名", - "GUID": "9a8aa953-289f-4827-ac6a-dfa7fae8fb06" + "TableName": "任务成员表", + "ColumnName": "参与人", + "GUID": "87738332-02a8-4175-a55e-6e0e60ba4b70", + "AttachType": { + "$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess", + "UserColumnAttachType": 1 + } }, "ColumnName": "label" } ], + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务成员表", + "ColumnName": "任务ID", + "GUID": "386fa2d2-2714-4607-9974-f86d79f27bd1" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=分配计划工时!任务ID" + } + }, "CustomColumns": [] }, "placeholder": "请选择", @@ -346,6 +363,7 @@ ] } ], + "DefaultValue": " b", "type": "daterange", "placeholder": "请选择月份", "startPlaceholder": "开始日期", @@ -377,8 +395,7 @@ ] } ], - "min": "0.1", - "max": "99999", + "min": "0", "step": 1, "precision": 1, "placeholder": "请输入", @@ -387,32 +404,6 @@ "DataValidationInfo": { "NumberType": 9, "ValidateCommand": [ - { - "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", - "TargetPageElement": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=分配计划工时!B8" - }, - "TargetType": "ElementUI.DatePickerCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", - "MethodName": "GetSelectedRange", - "RetrunParamNames": { - "StartValue": { - "SerializeProperty": "开始日期" - }, - "EndValue": { - "SerializeProperty": "结束日期" - } - } - }, - { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "时间差天数", - "ParameterValue": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=DATEDIF(分配计划工时!开始日期,分配计划工时!结束日期,\"d\")" - }, - "ID": "7323fdec607041d9aace9bcadd23481f" - }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", "ConditionAndCommandPairList": [ @@ -420,39 +411,92 @@ "Condition": { "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", "param": { - "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", - "cellLocations": [ - { - "SerializeProperty": "=分配计划工时!当前值" + "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon", + "tableData": { + "TableName": "任务表", + "ColumnName": "项目ID", + "GUID": "be820412-acfe-4c80-9d14-5c63f55df039", + "RelationBinding": { + "RelatedTable": "项目表", + "RelatedColumn": "ID", + "DisplayColumn": "工时分配方式" } - ] + } }, - "value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=分配计划工时!时间差天数*24" - }, - "compareType": 2 + "value": "2" }, "CommandList": [ { - "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", - "ErrorCode": "400", - "Message": { + "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", + "TargetPageElement": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=\"最大报工时长不能超过\"&分配计划工时!时间差天数*24&\"小时\"" + "SerializeProperty": "=分配计划工时!B8" + }, + "TargetType": "ElementUI.DatePickerCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", + "MethodName": "GetSelectedRange", + "RetrunParamNames": { + "StartValue": { + "SerializeProperty": "开始日期" + }, + "EndValue": { + "SerializeProperty": "结束日期" + } } - } - ], - "ID": "940856ae-4419-4b91-a736-665ed2a82dbd" - }, - { - "CommandList": [ + }, { - "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", - "ErrorCode": "0" + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "时间差天数", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=DATEDIF(分配计划工时!开始日期,分配计划工时!结束日期,\"d\")" + }, + "ID": "f5680fc4bfb94362bb360c0a4c8d86ea" + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=分配计划工时!当前值" + } + ] + }, + "value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=分配计划工时!时间差天数*24" + }, + "compareType": 2 + }, + "CommandList": [ + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "400", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=\"最大报工时长不能超过\"&分配计划工时!时间差天数*24&\"小时\"" + } + } + ], + "ID": "b5824c3c-5f3e-4098-80b6-1db5505f293e" + }, + { + "CommandList": [ + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "0" + } + ], + "ID": "3017d809-02aa-4651-9cf1-8064d5a089a3" + } + ] } ], - "ID": "7b495785-2c80-42ce-bae8-dfdebfa78c97" + "ID": "80be424b-6c3e-4747-abc6-a6c938ca4129" } ] } @@ -504,45 +548,6 @@ "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ - { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "成员是否存在", - "TableValue": { - "TableName": "任务成员表", - "TableValueType": 3, - "SqlCondition": { - "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", - "SubConditions": [ - { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "任务成员表", - "ColumnName": "任务ID", - "GUID": "282c7cbb-409d-4fdc-a4b0-4e667eb6cc48" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=分配计划工时!任务ID" - } - }, - { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "任务成员表", - "ColumnName": "参与人", - "GUID": "b1d64b0c-2af2-40fd-8726-f88f8002f20d" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=分配计划工时!B4" - } - } - ] - }, - "NullFormulaValueQueryPolicy": 0 - }, - "ID": "3b3c54866f364bd88b06bfe8ed829b78" - }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", "ConditionAndCommandPairList": [ @@ -550,156 +555,17 @@ "Condition": { "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", "param": { - "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", - "cellLocations": [ - { - "SerializeProperty": "=成员是否存在" - } - ] - }, - "value": "0" - }, - "CommandList": [ - { - "$type": "ElementUI.Commands.ShowMessageBox, ElementUI", - "Title": "标题", - "Message": "此操作会自动将该成员设置为任务参与人，是否继续？", - "Type": "info", - "ConfirmButtonText": "确定", - "ShowCancelButton": true, - "CancelButtonText": "取消", - "ShowClose": false, - "DialogResult": "是否继续", - "AdvancedSettings": {} - } - ], - "ID": "90b0fd5b-9af6-494d-b09f-6c74498c5440" - }, - { - "CommandList": [ - { - "$type": "ElementUI.Commands.ShowMessageBox, ElementUI", - "Title": "标题", - "Message": "是否确定为该成员增加计划工时？", - "Type": "info", - "ConfirmButtonText": "确定", - "ShowCancelButton": true, - "CancelButtonText": "取消", - "ShowClose": false, - "DialogResult": "是否继续", - "AdvancedSettings": {} - } - ], - "ID": "b029f8c3-dfc5-467c-acd1-c464ea417667" - } - ] - }, - { - "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", - "ConditionAndCommandPairList": [ - { - "Condition": { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", - "cellLocations": [ - { - "SerializeProperty": "=是否继续" - } - ] - }, - "value": "confirm" - }, - "CommandList": [ - { - "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", - "Title": "加载中", - "VBalidate": true - }, - { - "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", - "TargetPageElement": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=分配计划工时!B8" - }, - "TargetType": "ElementUI.DatePickerCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", - "MethodName": "GetSelectedRange", - "RetrunParamNames": { - "StartValue": { - "SerializeProperty": "开始日期" - }, - "EndValue": { - "SerializeProperty": "结束日期" - } + "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon", + "tableData": { + "TableName": "任务表", + "ColumnName": "参与人数", + "GUID": "7f270bce-2f3b-4c1a-bf68-176fa4240638" } }, - { - "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", - "ServerCommandName": "分配任务工时", - "Parameters": [ - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "任务ID", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=分配计划工时!任务ID" - } - }, - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "开始日期", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=分配计划工时!开始日期" - } - }, - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "结束日期", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=分配计划工时!结束日期" - } - }, - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "执行人", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=分配计划工时!B4" - } - }, - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "工时数", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=分配计划工时!B12" - } - }, - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "备注", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=分配计划工时!B16" - } - } - ], - "ResultErrorCodeTo": { - "SerializeProperty": "code" - }, - "ResultMessageTo": { - "SerializeProperty": "msg" - }, - "RefreshAfterFinish": true, - "CheckDataValidation": true - }, - { - "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", - "FunctionName": "remove", - "Title": "加载中" - }, + "value": "0", + "compareType": 2 + }, + "CommandList": [ { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", "ConditionAndCommandPairList": [ @@ -707,49 +573,300 @@ "Condition": { "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", "param": { - "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", - "cellLocations": [ - { - "SerializeProperty": "=分配计划工时!code" + "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon", + "tableData": { + "TableName": "任务表", + "ColumnName": "项目ID", + "GUID": "34a958e2-7c48-4fa2-b670-6477af45712b", + "RelationBinding": { + "RelatedTable": "项目表", + "RelatedColumn": "ID", + "DisplayColumn": "工时分配方式" } - ] + } }, - "value": "0" + "value": "1,2", + "compareType": 12 }, "CommandList": [ { - "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", - "Message": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=分配计划工时!msg" - } + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "成员是否存在", + "TableValue": { + "TableName": "任务成员表", + "TableValueType": 3, + "SqlCondition": { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务成员表", + "ColumnName": "任务ID", + "GUID": "282c7cbb-409d-4fdc-a4b0-4e667eb6cc48" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=分配计划工时!任务ID" + } + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务成员表", + "ColumnName": "参与人", + "GUID": "b1d64b0c-2af2-40fd-8726-f88f8002f20d" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=分配计划工时!B4" + } + } + ] + }, + "NullFormulaValueQueryPolicy": 0 + }, + "ID": "816fb22af85c4a41806dc53abedfceb8" }, { - "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon", - "ReloadData": true + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=成员是否存在" + } + ] + }, + "value": "0" + }, + "CommandList": [ + { + "$type": "ElementUI.Commands.ShowMessageBox, ElementUI", + "Title": "标题", + "Message": "此操作会自动将该成员设置为任务参与人，是否继续？", + "Type": "info", + "ConfirmButtonText": "确定", + "ShowCancelButton": true, + "CancelButtonText": "取消", + "ShowClose": false, + "DialogResult": "是否继续", + "AdvancedSettings": {} + } + ], + "ID": "35bc215e-5647-4941-b282-266dbe907e35" + }, + { + "CommandList": [ + { + "$type": "ElementUI.Commands.ShowMessageBox, ElementUI", + "Title": "标题", + "Message": "是否确定为该成员增加计划工时？", + "Type": "info", + "ConfirmButtonText": "确定", + "ShowCancelButton": true, + "CancelButtonText": "取消", + "ShowClose": false, + "DialogResult": "是否继续", + "AdvancedSettings": {} + } + ], + "ID": "d6025f25-f9b4-445b-82c3-e32ecdbd2767" + } + ] + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=是否继续" + } + ] + }, + "value": "confirm" + }, + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", + "Title": "加载中", + "VBalidate": true + }, + { + "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", + "TargetPageElement": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=分配计划工时!B8" + }, + "TargetType": "ElementUI.DatePickerCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", + "MethodName": "GetSelectedRange", + "RetrunParamNames": { + "StartValue": { + "SerializeProperty": "开始日期" + }, + "EndValue": { + "SerializeProperty": "结束日期" + } + } + }, + { + "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", + "ServerCommandName": "分配任务工时", + "Parameters": [ + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "任务ID", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=分配计划工时!任务ID" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "开始日期", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=分配计划工时!开始日期" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "结束日期", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=分配计划工时!结束日期" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "执行人", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=分配计划工时!B4" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "工时数", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=分配计划工时!B12" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "备注", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=分配计划工时!B16" + } + } + ], + "ResultErrorCodeTo": { + "SerializeProperty": "code" + }, + "ResultMessageTo": { + "SerializeProperty": "msg" + }, + "RefreshAfterFinish": true, + "CheckDataValidation": true + }, + { + "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", + "FunctionName": "remove", + "Title": "加载中" + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=分配计划工时!code" + } + ] + }, + "value": "0" + }, + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=分配计划工时!msg" + } + }, + { + "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon", + "ReloadData": true + } + ], + "ID": "0f162bde-4368-48ed-ad52-e788ae192aca" + }, + { + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Report_Command, Notiflix_Forguncy", + "FunctionName": "warning", + "Title": "温馨提示", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=分配计划工时!msg" + }, + "BtnText": "知道了" + } + ], + "ID": "680c2413-531f-48bd-9233-39016dbb32e7" + } + ] + } + ], + "ID": "b892726e-be5f-4f7a-9525-e53271138ad1" + } + ] } ], - "ID": "f8455a15-f3ab-48c7-b68b-5bc79757597a" + "ID": "5573c6a0-43cb-49e3-8cce-5e4a14cbf4f8" }, { "CommandList": [ { "$type": "Notiflix_Forguncy.Report_Command, Notiflix_Forguncy", - "FunctionName": "warning", + "FunctionName": "info", "Title": "温馨提示", - "Message": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=分配计划工时!msg" - }, + "Message": "计划任务仅支持分配到人、分配到天两种方式，其他方式无需提交计划任务；", "BtnText": "知道了" } ], - "ID": "ffe0df22-0533-4f20-aa89-4c599969a532" + "ID": "1a87a62f-0b6b-4b05-ab38-64f6c331ee40" } ] } ], - "ID": "87802792-1d5c-46da-95e0-c95ae0b5f2db" + "ID": "7263b546-36aa-45f3-9f0e-f6df8af13e51" + }, + { + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "FourStandardStyle": "warning", + "Message": "请添加参与人后进行操作" + } + ], + "ID": "02d610b7-4ab3-4573-b79a-fbcdf2677afb" } ] } @@ -810,6 +927,9 @@ "BorderBottom": 1, "BorderTop": 1, "BorderRight": 1 + }, + { + "FontSize": -1.0 } ], "Types": { @@ -1049,8 +1169,11 @@ "22,3": 7, "22,4": 7, "22,5": 8, - "22,6": 2, - "22,7": 2 + "22,6": 9, + "22,7": 9, + "22,8": 9, + "22,9": 9, + "22,10": 9 }, "SheetStyle": { "FontFamily": 1, @@ -1068,6 +1191,7 @@ ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", + "Title": "分配计划工时", "PageLoadedCommandList": [ { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -1104,9 +1228,27 @@ ] } ], - "ID": "5fe947cf-19fb-4500-86fa-3bc0a801c67a" + "ID": "36587935-65f0-476d-b978-054e9089765c" + }, + { + "CommandList": [ + { + "$type": "Forguncy.Model.SetRowColumnLayoutCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "Location": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=分配计划工时!5:8" + }, + "Value": false + } + ] + } + ], + "ID": "520f0837-ea98-4ae9-a31a-f488888b1d61" } - ] + ], + "Comments": "只有工时分配方式为【分配到天】的情况下，才需要填写日期，否则不需要" } ], "PermissionData": { @@ -1139,6 +1281,10 @@ { "Name": "工时类型", "Formula": "分配计划工时!$L$4" + }, + { + "Name": "参与人列表", + "Formula": "分配计划工时!$G$23" } ] -}//XXOEtBX1P/H87AGfEqDQF2uAxk0VFYf7MYwxHbfj6Aq/rNXJQuPa/er5A1ShBfygCEAOCW5rKOzES5OuyYYEJX6ryOR9GsKrQ/YAuKz9pLRRkgKCjK6tdsn2joNi1Zqzhrg4JNO3ZmTC7LkmgoOiObzWv6luXuJy0Hmgb6GNc2Jg/O0IxAL7oNJ8IRhbp28u1okzpITuUP4fprUCfHRSblk7vMTq8QMbxtEsZNPqmfPcUqRB7teDnn4Twj3ibqdNxptTewOU208f1jcDaAnVq+X8o4Rznu3g4/rTFsZD3OpZ4wnpS7Yd3OJToF39O2c6ldryqFB8nPDve44Ni7KJKcYLdp55m2yfj9PFTI0pdnWF6cpBePsTRy13rbmQqSTwYHeVrPGO+Jajm09oxdFK23cLV+b5N+/V8ekMrx5NEtdz1q+ILQBiS/y+Vb2X0QUSgLULRjsNW2NJyOz+2n6IGs3CKiHsvy6z/7wkiQSPqQyjRI2BMK7vPvmWOpmkRvdZF8YkXNNefd5krwGzm9nxo8fx/P9ZJVAIXiIfX4yLKBLLt67yQ16fzasKVxArrijYthzR/CZV9afhPOBefdNbREZ/IZnvsn26EQt13Q2d08jNip2BqB6/1yN5eS7kxuTTGX6HLjZfb0961Ygk7QpGRVA3qw73ynzRn+7v0cACR33vfFzfU5ajJSZ8Ve17JP6veOW6qJNlbYHxWar/LgbVcRz29OGUtN1KgC9DEjVeuGOR9cBKWTjlFtknuiUePCu6d2VOWCFSPeZRd5D6L65ycq2q/tgDMk18tCLnv+BGEMgKZo8SJgjQbJnfbMFQaFVeT037WWPo5acLB7ISy2UaT3dILzu2ayUBlrCKJ6XEkrhAK8zLSxn+UMyAoP5Ln4Q7hQG0FH2z8EByNWqMWiv/Gw==|920 \ No newline at end of file +}//4pfvOGlyL2+/GlhvEo/Dwcv7Nj1EBZdUJCjStwO3Ok9Jel59V5qIuR90EGy1wJSNFTNZSJM897HOCZIR5raUrDipJ/ry/lvDmdhnJpPqeuEOr/BVNcCFdUN6HpQx0HLacIv1sa0z3JMMYi3yZ5BVWDkbldXKqHV7+VmVKgfuEThd83pl/NqYuBd80tmpumFjvl5JyJ3zQK3Y1uw9DaesLQPcTux1nL69+rAQXtDJUuVA/jwbL4OeW9rmA80WwrYYXsbWAuTSOtMuAwgoFDvPPw397U+EVmyPGxQp0zmLywtZ1p5CLgbMNQlz+Vn8gD6xE296rv4sYPmFowjJ6p/I9IH8UNuOXJaywmXgL47qi8jbcRRTBGYrDvI0S5yqCxrK+dnFzbwCOqbrLT1xMyOTmGkUVlCflCIGl95NpN1pktix9nI7QYxLkmAtlAsg6Pl87ULYBq6W54AZ2clbOBcX254uuUBqpPyADqVnzXohO4H1u2SLEj6nSu4uncJ3Na33XV1EvNXCbL2RFzLsLMEeYVW6C4qtG7gRu/HOJXtx+ose4ZY/cyfKH90fmHkf3GcB/Pq+QO/5shJIzKpvSvKE1sTdUfJbjDJ3EH83F/I/i2pBlekmg/lD6vE4dCzpD/YRn/IsDSxorawTXU89oIbhm4Pzc/8DGErpjZqh92sZF+HpTBAiTIFMhPjYRih5ZVBg8id19+rUq9g6ZbpcXUfcFH1Z1+xmYQ8M8fodrk6x/BfdbHy0bHEFPj6XL6v5u1aXSebnGnBAgojrtX6TIgwF8JSXsmIB3yQEllmKzsaNKnRmQq2d4fEJdwyN+2oT49NeYbxo2h3Iwh762VB9/hz6s7wV5TJ4fHcCfhDXD2FiFmumiRkChlT9VObwDvxdwZM+5gIkZiXFlAjOz418qmelug==|920 \ No newline at end of file diff --git a/Pages/任务/工时/分配计划工时.rd b/Pages/任务/工时/分配计划工时.rd index c2469714..dae599da 100644 --- a/Pages/任务/工时/分配计划工时.rd +++ b/Pages/任务/工时/分配计划工时.rd @@ -13,6 +13,10 @@ { "Name": "工时类型", "Formula": "分配计划工时!$L$4" + }, + { + "Name": "参与人列表", + "Formula": "分配计划工时!$G$23" } ] } \ No newline at end of file diff --git a/Pages/任务/工时/新增报工.json b/Pages/任务/工时/新增报工.json index 6fe4e4ea..09b51f32 100644 --- a/Pages/任务/工时/新增报工.json +++ b/Pages/任务/工时/新增报工.json @@ -96,8 +96,7 @@ }, "26": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 27.0, - "IsHidden": true + "DesignLengthInPixel": 27.0 } }, "27": { @@ -112,7 +111,6 @@ 13, 14, 15, - 26, 27 ], "Count": 28 @@ -244,8 +242,8 @@ "DefaultSize": 32.0 }, "Values": { - "1,1": "工时执行者", - "5,1": "分配日期", + "1,1": "报工人", + "5,1": "报工日期", "9,1": "工时数", "13,1": "特定时薪", "17,1": "工作进展", @@ -253,7 +251,8 @@ "24,20": "提交" }, "Formulas": { - "7,1": "TODAY()&\",\"&TODAY()" + "7,1": "TODAY()&\",\"&TODAY()", + "26,14": "DATEDIF(G27,K27,\"d\")+1" }, "AttachInfos": { "3,1": { @@ -299,25 +298,41 @@ ], "bindingOptions": { "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", - "TableName": "用户信息视图", + "TableName": "任务成员表", "BindingInfos": [ { "BindingInfo": { - "TableName": "用户信息视图", - "ColumnName": "用户名", - "GUID": "7edd7924-e06c-4028-97bc-14789459e5e3" + "TableName": "任务成员表", + "ColumnName": "参与人", + "GUID": "098c0dca-cb67-4296-9682-8eeb5c2ae31d" }, "ColumnName": "value" }, { "BindingInfo": { - "TableName": "用户信息视图", - "ColumnName": "全名", - "GUID": "6d7908c4-432f-435c-9d5f-74cb2be2e596" + "TableName": "任务成员表", + "ColumnName": "参与人", + "GUID": "c8e02056-572d-4108-81db-ed959278694c", + "AttachType": { + "$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess", + "UserColumnAttachType": 1 + } }, "ColumnName": "label" } ], + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务成员表", + "ColumnName": "任务ID", + "GUID": "ab7b9a97-1019-4924-bb9a-57973b0eb1c9" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增报工!任务ID" + } + }, "CustomColumns": [] }, "placeholder": "请选择", @@ -335,7 +350,25 @@ "7,1": { "CellType": { "$type": "ElementUI.DatePickerCellType, ElementUI", - "CommandList": [], + "CommandList": [ + { + "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", + "TargetPageElement": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增报工!B8" + }, + "TargetType": "ElementUI.DatePickerCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", + "MethodName": "GetSelectedRange", + "RetrunParamNames": { + "StartValue": { + "SerializeProperty": "=新增报工!G27" + }, + "EndValue": { + "SerializeProperty": "=新增报工!K27" + } + } + } + ], "UIPermissions": [ { "Scope": 2, @@ -361,8 +394,9 @@ "startPlaceholder": "开始日期", "rangeSeparator": "至", "endPlaceholder": "结束日期", - "format": "yyyy年MM月", + "format": "yyyy年MM月DD日", "firstDayOfWeek": 1, + "clearable": true, "DefautWeekFormat": "yyyy 第 WW 周" }, "DataValidationInfo": { @@ -387,86 +421,23 @@ ] } ], - "min": "0.1", - "max": "99999", "step": 1, "precision": 1, "placeholder": "请输入", "controlsPosition": true }, "DataValidationInfo": { - "NumberType": 9, - "ValidateCommand": [ - { - "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", - "TargetPageElement": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=新增报工!B8" - }, - "TargetType": "ElementUI.DatePickerCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", - "MethodName": "GetSelectedRange", - "RetrunParamNames": { - "StartValue": { - "SerializeProperty": "开始日期" - }, - "EndValue": { - "SerializeProperty": "结束日期" - } - } - }, - { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "时间差天数", - "ParameterValue": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=DATEDIF(新增报工!开始日期,新增报工!结束日期,\"d\")" - }, - "ID": "55fd97778e7248d28af7a84b8dd02418" - }, - { - "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", - "ConditionAndCommandPairList": [ - { - "Condition": { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", - "cellLocations": [ - { - "SerializeProperty": "=新增报工!当前值" - } - ] - }, - "value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=新增报工!时间差天数*24" - }, - "compareType": 2 - }, - "CommandList": [ - { - "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", - "ErrorCode": "400", - "Message": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=\"最大报工时长不能超过\"&新增报工!时间差天数*24&\"小时\"" - } - } - ], - "ID": "24bb3fde-d98d-4c7a-b24d-8338dd925dc1" - }, - { - "CommandList": [ - { - "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", - "ErrorCode": "0" - } - ], - "ID": "99c666ad-4377-4c60-81ea-e19fcc09b14a" - } - ] - } - ] + "NumberType": 7, + "FirstParamValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增报工!B12<=新增报工!O27*24" + }, + "ShowInputMessageWhenCellIsSelected": false, + "ErrorMessage": "工时数超过所选日期范围允许的最大小时数", + "ErrorTo": 1, + "ErrorToTargetCell": { + "SerializeProperty": "=新增报工!W10" + } } }, "15,1": { @@ -548,45 +519,6 @@ "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ - { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "成员是否存在", - "TableValue": { - "TableName": "任务成员表", - "TableValueType": 3, - "SqlCondition": { - "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", - "SubConditions": [ - { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "任务成员表", - "ColumnName": "任务ID", - "GUID": "c350559c-7b23-47d9-ad05-a1e5b373b4f4" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=新增报工!任务ID" - } - }, - { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "任务成员表", - "ColumnName": "参与人", - "GUID": "3b409e62-a534-42c1-93fa-635a22babaf7" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=新增报工!B4" - } - } - ] - }, - "NullFormulaValueQueryPolicy": 0 - }, - "ID": "9a7bc64402df47908183e25054b07dc5" - }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", "ConditionAndCommandPairList": [ @@ -594,27 +526,55 @@ "Condition": { "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", "param": { - "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", - "cellLocations": [ - { - "SerializeProperty": "=成员是否存在" - } - ] + "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon", + "tableData": { + "TableName": "任务表", + "ColumnName": "参与人数", + "GUID": "7f270bce-2f3b-4c1a-bf68-176fa4240638" + } }, - "value": "0" + "value": "0", + "compareType": 2 }, "CommandList": [ { - "$type": "ElementUI.Commands.ShowMessageBox, ElementUI", - "Title": "标题", - "Message": "此操作会自动将该成员设置为任务参与人，是否继续？", - "Type": "info", - "ConfirmButtonText": "确定", - "ShowCancelButton": true, - "CancelButtonText": "取消", - "ShowClose": false, - "DialogResult": "是否继续", - "AdvancedSettings": {} + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "成员是否存在", + "TableValue": { + "TableName": "任务成员表", + "TableValueType": 3, + "SqlCondition": { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务成员表", + "ColumnName": "任务ID", + "GUID": "c350559c-7b23-47d9-ad05-a1e5b373b4f4" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增报工!任务ID" + } + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务成员表", + "ColumnName": "参与人", + "GUID": "3b409e62-a534-42c1-93fa-635a22babaf7" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增报工!B4" + } + } + ] + }, + "NullFormulaValueQueryPolicy": 0 + }, + "ID": "a3a049d5d46e472492dd0d7b2f73c243" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -626,127 +586,46 @@ "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", "cellLocations": [ { - "SerializeProperty": "=是否继续" + "SerializeProperty": "=成员是否存在" } ] }, - "value": "confirm" + "value": "0" }, "CommandList": [ { - "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", - "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": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", - "Title": "加载中", - "VBalidate": true - }, - { - "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", - "TargetPageElement": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=新增报工!B8" - }, - "TargetType": "ElementUI.DatePickerCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", - "MethodName": "GetSelectedRange", - "RetrunParamNames": { - "StartValue": { - "SerializeProperty": "开始日期" - }, - "EndValue": { - "SerializeProperty": "结束日期" - } - } - }, - { - "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", - "ServerCommandName": "上报实际工时", - "Parameters": [ - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "任务ID", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=新增报工!任务ID" - } - }, - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "开始日期", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=新增报工!开始日期" - } - }, - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "结束日期", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=新增报工!结束日期" - } - }, - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "执行人", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=新增报工!B4" - } - }, - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "工时数", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=新增报工!B12" - } - }, - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "进展内容", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=新增报工!B20" - } - }, - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "指定时薪单价" - } - ], - "ResultErrorCodeTo": { - "SerializeProperty": "code" - }, - "ResultMessageTo": { - "SerializeProperty": "msg" - }, - "RefreshAfterFinish": true, - "CheckDataValidation": true - }, - { - "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", - "FunctionName": "remove", - "Title": "加载中" - }, + "$type": "ElementUI.Commands.ShowMessageBox, ElementUI", + "Title": "标题", + "Message": "此操作会自动将该成员设置为任务参与人，是否继续？", + "Type": "info", + "ConfirmButtonText": "确定", + "ShowCancelButton": true, + "CancelButtonText": "取消", + "ShowClose": false, + "DialogResult": "是否继续", + "AdvancedSettings": {} + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=是否继续" + } + ] + }, + "value": "confirm" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", + "ClosePopupCallbackCommand": { + "Commands": [ { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", "ConditionAndCommandPairList": [ @@ -757,254 +636,379 @@ "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", "cellLocations": [ { - "SerializeProperty": "=新增报工!code" + "SerializeProperty": "=是否为确定" } ] }, - "value": "0" + "value": "1" }, "CommandList": [ { - "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", - "Message": { + "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", + "Title": "加载中", + "VBalidate": true + }, + { + "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", + "TargetPageElement": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=新增报工!msg" + "SerializeProperty": "=新增报工!B8" + }, + "TargetType": "ElementUI.DatePickerCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", + "MethodName": "GetSelectedRange", + "RetrunParamNames": { + "StartValue": { + "SerializeProperty": "开始日期" + }, + "EndValue": { + "SerializeProperty": "结束日期" + } } }, { - "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon", - "ReloadData": true + "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", + "ServerCommandName": "上报实际工时", + "Parameters": [ + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "任务ID", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增报工!任务ID" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "开始日期", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增报工!开始日期" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "结束日期", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增报工!结束日期" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "执行人", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增报工!B4" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "工时数", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增报工!B12" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "进展内容", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增报工!B20" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "指定时薪单价" + } + ], + "ResultErrorCodeTo": { + "SerializeProperty": "code" + }, + "ResultMessageTo": { + "SerializeProperty": "msg" + }, + "RefreshAfterFinish": true, + "CheckDataValidation": true + }, + { + "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", + "FunctionName": "remove", + "Title": "加载中" + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=新增报工!code" + } + ] + }, + "value": "0" + }, + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增报工!msg" + } + }, + { + "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon", + "ReloadData": true + } + ], + "ID": "0e1c2f19-c270-44a9-8ed9-d082007a2c3b" + }, + { + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Report_Command, Notiflix_Forguncy", + "FunctionName": "warning", + "Title": "温馨提示", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增报工!msg" + }, + "BtnText": "知道了" + } + ], + "ID": "7db11ce5-0dd7-4f3d-88ee-2c3da93845e7" + } + ] } ], - "ID": "3372f2a0-03ef-45af-915b-cdfc2dabaca2" + "ID": "9602cc31-1749-45ef-8ec8-54b7ffb1d4f7" }, { "CommandList": [ { - "$type": "Notiflix_Forguncy.Report_Command, Notiflix_Forguncy", - "FunctionName": "warning", - "Title": "温馨提示", - "Message": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=新增报工!msg" - }, - "BtnText": "知道了" + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "FourStandardStyle": "info", + "Message": "用户已取消" } ], - "ID": "e67fc91c-2139-4740-87ff-064ca5283a41" + "ID": "72c55c32-f690-4815-8394-5062d0d3ae76" } ] } ], - "ID": "e32c1451-4722-4af9-ac37-f90f8a4bf1c6" + "ParamProperties": { + "IsOK": "是否为确定", + "成员ID": "成员ID" + } }, - { - "CommandList": [ - { - "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", - "FourStandardStyle": "info", - "Message": "用户已取消" + "PageName": "任务成员详情", + "PassValues": [ + { + "Source": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增报工!项目ID" + }, + "TargetCell": { + "SerializeProperty": "=任务成员详情!项目ID" } - ], - "ID": "7204d418-b1f7-4f8e-9b47-c4c35d4d2946" - } - ] - } - ], - "ParamProperties": { - "IsOK": "是否为确定", - "成员ID": "成员ID" + }, + { + "Source": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增报工!任务ID" + }, + "TargetCell": { + "SerializeProperty": "=任务成员详情!任务ID" + } + }, + { + "Source": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增报工!B4" + }, + "TargetCell": { + "SerializeProperty": "=任务成员详情!B3" + } + } + ], + "LoadBindingDataOption": 2 + } + ], + "ID": "cb69075a-2c98-41f3-bec4-2d4eecc415d9" } + ] + } + ], + "ID": "d016930e-c9b7-4ead-901f-6ca59162701f" + }, + { + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", + "Title": "加载中", + "VBalidate": true + }, + { + "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", + "TargetPageElement": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增报工!B8" }, - "PageName": "任务成员详情", - "PassValues": [ - { - "Source": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=新增报工!项目ID" - }, - "TargetCell": { - "SerializeProperty": "=任务成员详情!项目ID" - } + "TargetType": "ElementUI.DatePickerCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", + "MethodName": "GetSelectedRange", + "RetrunParamNames": { + "StartValue": { + "SerializeProperty": "开始日期" }, + "EndValue": { + "SerializeProperty": "结束日期" + } + } + }, + { + "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", + "ServerCommandName": "上报实际工时", + "Parameters": [ { - "Source": { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "任务ID", + "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=新增报工!任务ID" - }, - "TargetCell": { - "SerializeProperty": "=任务成员详情!任务ID" } }, { - "Source": { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "开始日期", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增报工!开始日期" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "结束日期", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增报工!结束日期" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "执行人", + "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=新增报工!B4" - }, - "TargetCell": { - "SerializeProperty": "=任务成员详情!B3" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "工时数", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增报工!B12" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "进展内容", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增报工!B20" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "指定时薪单价", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增报工!B16" } } ], - "LoadBindingDataOption": 2 + "ResultErrorCodeTo": { + "SerializeProperty": "code" + }, + "ResultMessageTo": { + "SerializeProperty": "msg" + }, + "RefreshAfterFinish": true, + "CheckDataValidation": true + }, + { + "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", + "FunctionName": "remove", + "Title": "加载中" + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=新增报工!code" + } + ] + }, + "value": "0" + }, + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增报工!msg" + } + }, + { + "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon", + "ReloadData": true + } + ], + "ID": "dd329d50-7ea5-41c9-bec3-98fca6fc6403" + }, + { + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Report_Command, Notiflix_Forguncy", + "FunctionName": "warning", + "Title": "温馨提示", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增报工!msg" + }, + "BtnText": "知道了" + } + ], + "ID": "5944ca6d-686e-475d-986d-1d46115a0100" + } + ] } ], - "ID": "df017818-4e2b-44af-869f-2f603dfbe264" + "ID": "a91e4008-c2a7-454e-aee1-5302a49edd33" } ] } ], - "ID": "14d7369e-d091-45e4-a2f9-85475457e914" + "ID": "6d475b79-0ba3-4a20-a4de-321e187f846c" }, { "CommandList": [ { - "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", - "Title": "加载中", - "VBalidate": true - }, - { - "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", - "TargetPageElement": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=新增报工!B8" - }, - "TargetType": "ElementUI.DatePickerCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", - "MethodName": "GetSelectedRange", - "RetrunParamNames": { - "StartValue": { - "SerializeProperty": "开始日期" - }, - "EndValue": { - "SerializeProperty": "结束日期" - } - } - }, - { - "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", - "ServerCommandName": "上报实际工时", - "Parameters": [ - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "任务ID", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=新增报工!任务ID" - } - }, - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "开始日期", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=新增报工!开始日期" - } - }, - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "结束日期", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=新增报工!结束日期" - } - }, - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "执行人", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=新增报工!B4" - } - }, - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "工时数", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=新增报工!B12" - } - }, - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "进展内容", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=新增报工!B20" - } - }, - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "指定时薪单价", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=新增报工!B16" - } - } - ], - "ResultErrorCodeTo": { - "SerializeProperty": "code" - }, - "ResultMessageTo": { - "SerializeProperty": "msg" - }, - "RefreshAfterFinish": true, - "CheckDataValidation": true - }, - { - "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", - "FunctionName": "remove", - "Title": "加载中" - }, - { - "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", - "ConditionAndCommandPairList": [ - { - "Condition": { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", - "cellLocations": [ - { - "SerializeProperty": "=新增报工!code" - } - ] - }, - "value": "0" - }, - "CommandList": [ - { - "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", - "Message": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=新增报工!msg" - } - }, - { - "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon", - "ReloadData": true - } - ], - "ID": "88f49001-683c-4d11-89e5-c49847839a34" - }, - { - "CommandList": [ - { - "$type": "Notiflix_Forguncy.Report_Command, Notiflix_Forguncy", - "FunctionName": "warning", - "Title": "温馨提示", - "Message": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=新增报工!msg" - }, - "BtnText": "知道了" - } - ], - "ID": "4f17dcad-1315-48fb-99cb-0f2c1ffd3877" - } - ] + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "FourStandardStyle": "warning", + "Message": "请添加参与人后进行操作" } ], - "ID": "6b1fedf7-90fb-4ec8-bc3b-7fa2e60e1755" + "ID": "fd0eefc5-fb25-401d-b925-6a94e29a297c" } ] } @@ -1041,6 +1045,11 @@ "Foreground": 0, "Formatter": 2 }, + { + "FontSize": 12.0, + "Foreground": 3, + "HorizontalAlignment": 4 + }, { "BorderBottom": 0 }, @@ -1050,7 +1059,7 @@ "Formatter": 2 }, { - "Background": 4, + "Background": 6, "FontFamily": 1, "FontSize": 13.333333333333332, "BorderBottom": 1, @@ -1065,6 +1074,12 @@ "BorderBottom": 1, "BorderTop": 1, "BorderRight": 1 + }, + { + "FontSize": -1.0 + }, + { + "Background": 6 } ], "Types": { @@ -1072,16 +1087,18 @@ "Background 1 -50", "Body", "[AUTO]General", + "#FFFF0000", + "Right", "Background 2 -10", "#FFFFFF00", "black" ], "Borders": [ { - "Color": 3 + "Color": 5 }, { - "Color": 5 + "Color": 7 } ] }, @@ -1176,6 +1193,7 @@ "7,1": 2, "7,23": 2, "9,1": 1, + "9,22": 4, "11,1": 2, "12,0": 2, "12,1": 2, @@ -1370,38 +1388,39 @@ "21,20": 2, "21,21": 2, "21,22": 2, - "22,1": 4, - "22,2": 4, - "22,3": 4, - "22,4": 4, - "22,5": 4, - "22,6": 4, - "22,7": 4, - "22,8": 4, - "22,9": 4, - "22,10": 4, - "22,11": 4, - "22,12": 4, - "22,13": 4, - "22,14": 4, - "22,15": 4, - "22,16": 4, - "22,17": 4, - "22,18": 4, - "22,19": 4, - "22,20": 4, - "22,21": 4, - "22,22": 4, - "24,1": 5, + "22,1": 5, + "22,2": 5, + "22,3": 5, + "22,4": 5, + "22,5": 5, + "22,6": 5, + "22,7": 5, + "22,8": 5, + "22,9": 5, + "22,10": 5, + "22,11": 5, + "22,12": 5, + "22,13": 5, + "22,14": 5, + "22,15": 5, + "22,16": 5, + "22,17": 5, + "22,18": 5, + "22,19": 5, + "22,20": 5, + "22,21": 5, + "22,22": 5, + "24,1": 6, "24,2": 2, "24,3": 2, - "26,1": 6, - "26,2": 7, - "26,3": 7, - "26,4": 7, - "26,5": 8, + "26,1": 7, + "26,2": 8, + "26,3": 8, + "26,4": 8, + "26,5": 9, "26,6": 2, - "26,7": 2 + "26,10": 10, + "26,14": 11 }, "SheetStyle": { "FontFamily": 1, @@ -1416,7 +1435,10 @@ "7,1,1,22", "26,1,1,5", "15,1,1,22", - "3,1,1,22" + "3,1,1,22", + "26,6,1,4", + "26,10,1,4", + "26,14,1,4" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -1451,7 +1473,7 @@ ] } ], - "ID": "c962039a-e471-43de-a3e3-9d6807428b7e" + "ID": "1c7745cc-31e6-484d-bd00-fc2dc88da497" }, { "CommandList": [ @@ -1468,7 +1490,7 @@ ] } ], - "ID": "2421e3ee-91f3-4369-b2bf-11d3cc3b7d7a" + "ID": "4376f577-73af-464e-9e8e-162937f91315" } ] } @@ -1505,4 +1527,4 @@ "Formula": "新增报工!$L$4" } ] -}//01Zshh9XmHFQObAxTFewrAtirsBamnUXSUR9YwZCMuuftuAjNd6tOjQ0YShVgPf1TRNowp9A+Y/Gmg96JGKKxhFD/8Cjzn+0h4P3KHHKD0MKi5IzfukKO6shjnCPAfAHTZr7RmutImYpQ+vxrGuBa1H8H5bnP742ueR9/tdJ6lvBZGsuWo9BWTnxnSpp1yRSASBGwVdwV62gUE73jmK0fky8jkMIiQn9l4jPCehmybvfL3z3a7eWGkc8y8sP6yRLH0t28iTadlyJwv4kJw4tCT7ffoqmggj1wes8o76lLHGiy6XKrf9780spEd0b77K3yQv0bkw9siJQK/KSEPMWni8GkzoZcwTCKof7p843rqWMyAxakhZ6g2wIkqY9AoAOz5KrgebFCbXAjZSY2xmHIZxdCzcACnxlMWJnz/uCXtAZF/oWnJ4kPer7+TrT361agv2iz9O4PvwNWagLjDVn8JlR5PO4r6eb1vbwl3d3JOrT+5DOOZ1+6qp+twq+n7vrpmCDpvmekDBq0stMVN/fewKQ8/fbQmuGoi5H/2bctdVFCsTXVT/NkozvSoqtzKRGRZ7+3Z7GST2C/zQEvuWBD/g3UUiQ9RNZk2IEYIwj1m4LICCw7bK5SpYINm+h2BQPgJJQZo+nSkqRd8AkjbrGztseeawDxWwST4Dc69ZMIY6v6Tlmz8w0tmQLqIn5s//sYnfmwuAhKxpxp9Ph1T3ET2TqmLwaOwtD+v3jh+ZD6a1/SMzSSntbBKaOuUu1ZanVjc5tKGFYe6Lg9kZNZO4EmT8wnqv9eVNhscqhvfMkHfn6Wzlsg7IEv9m5v46FtAMfcE2PHPQpkpGDEfMgLzhYWubPr97lngbLiPgY9pcf1qFTRyqLD6k+oaSBL0OP+J9uacLcPHM/i4Pk8FboAfn21g==|920 \ No newline at end of file +}//wDiauKYgggUBevkTkMoRLrf6dSfHGaTCgXaCYwywrD5AVV50hXI8Py5Byay2I6WFcr4XFQt019Qc4hYFLfajj3ejl00ts5d0AuFaKYYKQz8bmw55dVQvi7KdnrSPXMVY2zrUUdD+FahWmqwtDO64jZwW9AIkMYmDzo7JSIi+MUxR58/r8Eb+p37R+wFIgX+SzTJMXCtK/nOEB+nBQnmnSgDM3YwUCBETL5awfKyrn8O7MhxG2fZKs32DEv4TrH5K/81q0971nBs+QVABBnJAxQLs+vkIglzhQmn/kiKFFa/qYIDZrPigZoLJhQtn3Jiw8wyv8qQd6dbA4dBWKdiIfosu/mc8Jn7P6yLmifezO8ro2tA6RCfobvmfJui+1fisQXJcqoaILhQ00isp/z69SxlDzM88GevnKNtwIlErD6xL7UjDNnjHqhAmoh08COcmaJnDRM0cS96KQ5siedZjmZAoNvH/DZE8TwgT4h10s+g4fy8QEJbQutFgNq8IJz7Sg46WMMYqtQYfj5scxHh0T8glA5yICvKCwh5Gj6jgDy3F+1tM4KEo3g+7Un7z4lEdmpmIeCQUU34P1Ja+c3CisfK+muz08Quu4HDsi7cmGNKEElqe/j+uLpToJdJhZBALeZOTgqYv7/LXHNIHLdHTjWAnSFja4UtFGKP5830GVI0Banu4KMZll+1IuDxe0xWDIVw1SZ7rE+3AbfCTqCGiYms3unlDsn6hdpaZlcKVt8Tf9t17rTyRrNjOTKwxF/ZiVKesZmFvbkizm5vJ1I8Js1tVEUSKBjwPvMKHJ6FHv1ocAVXgegZFL2apWQZ2DXRIcuGacbcCoxg+G5BhLYqW0RDDSg802pFyjRzd/5kNRsQGXtzpj0w7LUfp41l7/XoHTqU87tr7BX8TGJ+wnB6SsQ==|920 \ No newline at end of file diff --git a/Pages/任务/工时/新增报工.rd b/Pages/任务/工时/新增报工.rd index 6df86694..d5fcdef8 100644 --- a/Pages/任务/工时/新增报工.rd +++ b/Pages/任务/工时/新增报工.rd @@ -3,7 +3,8 @@ "ColumnCount": 24, "RowCount": 28, "Formulas": { - "7,1": "TODAY()&\",\"&TODAY()" + "7,1": "TODAY()&\",\"&TODAY()", + "26,14": "DATEDIF(G27,K27,\"d\")+1" }, "CustomNames": [ { diff --git a/Pages/任务/工时详情.json b/Pages/任务/工时详情.json index c0f09db8..a624e908 100644 --- a/Pages/任务/工时详情.json +++ b/Pages/任务/工时详情.json @@ -223,13 +223,14 @@ "3,7": "计划工时", "3,12": "实际工时", "3,18": "完成比例", - "6,1": "明细进展", + "6,1": "工时明细", "7,1": "工时详情-列头", "10,9": "分配工时", "10,14": "工时上报" }, "Formulas": { - "3,20": "O4/D4*100" + "3,20": "O4/D4*100", + "6,4": "\"当前项目采用的工时分配方式是【\"&工时分配方式&\"】\"" }, "AttachInfos": { "3,3": { @@ -322,10 +323,9 @@ "ColumnName": "总实际工时" }, { - "BindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "工时完成比例", - "GUID": "d710b31b-c612-4de9-b6be-1f60bc47ef01" + "Formula": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=ROUND(工时详情!总实际工时/工时详情!总计划工时,2)*100" }, "ColumnName": "完成比例" } @@ -360,6 +360,7 @@ } ], "Text": "分配工时", + "IsDisabled": true, "TemplateKey": "圆角浮动", "Icon": { "Name": "Application/005_add_5.svg", @@ -412,6 +413,23 @@ "DisplayColumn": "工时分配方式" } } + }, + "12,10": { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "项目ID", + "GUID": "0c819315-d35b-4050-8b21-26eee2f00f98", + "RelationBinding": { + "RelatedTable": "项目表", + "RelatedColumn": "ID", + "DisplayColumn": "工时分配方式", + "NextRelationBinding": { + "RelatedTable": "工时分配方式", + "RelatedColumn": "ID", + "DisplayColumn": "分配方式" + } + } + } } }, "StyleDatas": { @@ -450,6 +468,11 @@ "FontFamily": 4, "Formatter": 6 }, + { + "FontFamily": 4, + "FontSize": 12.0, + "Foreground": 0 + }, { "FontFamily": 4, "FontSize": 13.333333333333332, @@ -569,7 +592,7 @@ "6,1": 6, "6,2": 3, "6,3": 3, - "6,4": 3, + "6,4": 7, "6,5": 3, "6,6": 3, "6,7": 3, @@ -596,7 +619,7 @@ "7,1": 3, "7,26": 3, "8,0": 3, - "8,1": 7, + "8,1": 8, "8,26": 3, "10,9": 3, "10,10": 3, @@ -607,9 +630,9 @@ "10,15": 3, "10,16": 3, "10,17": 3, - "12,4": 8, - "12,5": 9, - "12,6": 10 + "12,4": 9, + "12,5": 10, + "12,6": 11 }, "SheetStyle": { "FontFamily": 4 @@ -630,7 +653,8 @@ "3,9,1,2", "3,18,1,2", "3,20,1,6", - "12,7,1,3" + "12,7,1,3", + "12,10,1,4" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -665,16 +689,16 @@ "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon", "Formula": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=工时详情!$H$13=3" + "SerializeProperty": "=OR(工时详情!$H$13=1,工时详情!$H$13=2)" }, "GUID": "a8e409dd-908f-46da-9e04-493e23e6f6ff", "StyleInfo": { "Underline": null, "Strikethrough": null }, - "IsDisabled": true, + "IsDisabled": false, "IsInvisible": false, - "IsReadOnly": true + "IsReadOnly": false } ] } @@ -691,6 +715,10 @@ { "Name": "执行人", "Formula": "工时详情!$E$13" + }, + { + "Name": "工时分配方式", + "Formula": "工时详情!$K$13" } ] -}//XBiWrd0avZYou4JlEVczK+UtKEttD1Uh9JWTOX+W6lfXD+pzjm8cy4Qxnn562ACWTw0EtvbxRpslgqsI0HV8wjxDzImNkxgGdWtvFzyo0Vk2CQcWIM6Qvo+AMbdVr0lmrmMQFdGlrnj7K7mc4oddIjILYTtUQPdpZQGE0rzLMruvvjzvLG1z1ioYMXXq6P9YV8OozPN0ZOm95rUqoFMC9L43KtkcrWMwPe3hBrTI39QFwE2THHgTk/kFH7vbslxnW1IWOj+D+lNMv9G1eDR4A++gJIoVyIpdtQT92LD3LW2nqhGiG8134fBzZFiNQewkyYDF/4BL1Byu12uY4rxB1o+1hj8RHg3lwknaCtbZGmHXHq+fl6yo1RqtzUZjF344eLIYP+6gMmzHzvDCoKJTBxG3KxOsZdQdNJfgrAhxo0Dh6kBVkTyLc7uxOT8nbcvrjOV8m39IPW4eaoA8WVr+59WVbc8YXUEJI/Lrz8kscJiEqVFCs5idYDhFMAX7+K2BGycH0YiBVFLy6EpptjDm9IThU7mE6Z/oHoaeGSQRyKmmkV46JNxpV0VqFlUl3b8qse2ytbY9UMUHIg1seRx/l6iYksM/o3HojRWitBhWYgiXdaEM59WAdEODHXb3PUJE3Xk7o34NzABU1g1hfkZdlGLca36AYUb1V5u5nPVlrV5sIWNpAfzic+OVuyG3IwZAcpWpnPjIJe3rTalTvOG0Se4mXkx2vHzA8H3wFfyHsxsjRammEd58CMKXcktX7LTvO0R91pgBGyd091XNnTTkg9wZb8mBcGbgysDSoU+dQUmcHqOC2iZKkpBmIoOtpMsnVVk4fgTehy9sS+reXpGrDCHK6SFHBRh6jo7+svLAMfkYDsGM1p370Pfscys0C9uLsDVX/D1YnSRka4X7Obgmjw==|920 \ No newline at end of file +}//UG+jp7mk+V2RZieI0KJS9QwjbsI8lNSwF2cmnTetCz7MJSxK5ZhmKbi5KXDYrRLy3E1ET3umMzmFNt+ipBmwuWaVnqXMwc5u1h81AhTR7Ko3yWepfEprpidMScMzmMnDBKROpyus+A/7WAmhK7kdad90CNBb8jwjk5J/5kr3HTpALLK4fIWbiOWZuV6w+Gxi4rgurILUgVKNJSmP+XDWi2AYGuefwpo+ARMmAwcpJEEvp3pXHmJM6yoe73M6zlUd/euB/fGoi1tLYiqxZTeTVumV0wvWXpXH1qP1c1Acj2uMuQ2u/teTCOfAngUySRk2p3/BxkkASawvbc9D8hItLP6CAZLLI/tmdLS1MbVwbVGdQVGRoQJWMAhcWmymb2CwkbBX+YxhVVTfhEgUP/fZ1z6jwhH3BdDLgT7wENl0bjWobdVOTYYZF0i2tGywanG7lpb3M6QneJYInwEeLrvY9afquWh9xrJQ26H6OIuT2XsTujavWByOszd5J1j1nwvzqce2HpJ/qWYbp8lGu3liTR4Ph+iuVLk+FB9excd4f4UffG5gn0Kh+LuqZfkDZ1Zxs5Fpa1lpKEjCd9/1CzHUGwqmuz05hDsTFIKk4tvqm6tGkkgxH618jy/6uj5W7AvOXOznGJR3Poo4HRo4MWqJKYKPRN2+SWXDhcC3X2U5yXTF6lD+7ooikaVPhmL/JxPCkSpk/A5MIWOoYJLP5s7MCrUOBoe+pNkXSNygOM9RQKTE7KRujVo6YQfFITCff5tDkLTuhoVymzlrqP7a46ZkHge5raichsjvoX99bvdpTuvnEq6AHchMPxOtXOmrVJGUrQA4kRydT42ZrtmZCa36CERMZwvBFSwds4FwSL7FctcAnFaKWAx/KD4nn/3j1+AclQTpyVku5NKMeZTvnjis/A==|920 \ No newline at end of file diff --git a/Pages/任务/工时详情.rd b/Pages/任务/工时详情.rd index 843371c4..b97e23ad 100644 --- a/Pages/任务/工时详情.rd +++ b/Pages/任务/工时详情.rd @@ -3,7 +3,8 @@ "ColumnCount": 27, "RowCount": 14, "Formulas": { - "3,20": "O4/D4*100" + "3,20": "O4/D4*100", + "6,4": "\"当前项目采用的工时分配方式是【\"&工时分配方式&\"】\"" }, "CustomNames": [ { @@ -13,6 +14,10 @@ { "Name": "执行人", "Formula": "工时详情!$E$13" + }, + { + "Name": "工时分配方式", + "Formula": "工时详情!$K$13" } ] } \ No newline at end of file diff --git a/Pages/任务/新增任务.json b/Pages/任务/新增任务.json index 4dc1f6cc..de8b9bee 100644 --- a/Pages/任务/新增任务.json +++ b/Pages/任务/新增任务.json @@ -456,7 +456,7 @@ "MethodName": "ReloadBindingItems" } ], - "ID": "3bbea208-c5b4-412c-9ade-45bb11eeb870" + "ID": "1011e1be-02ff-43e7-9802-b5528ab1935e" } ] } @@ -715,7 +715,7 @@ "MethodName": "ReloadBindingItems" } ], - "ID": "a6a83419-2199-4ca1-97f4-dd7ae7e49cfb" + "ID": "a49d2539-d030-4983-9d01-877fa1a571a9" } ] } @@ -1103,14 +1103,17 @@ "CommandList": [ { "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", - "Message": "提交成功" + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增任务!msg" + } }, { "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon", "ReloadData": true } ], - "ID": "f4ba23ba-395c-4711-bbb6-363072bb26f0" + "ID": "65312ea8-0bc1-4202-b561-e3789bf4ce48" }, { "CommandList": [ @@ -1125,7 +1128,7 @@ "BtnText": "知道了" } ], - "ID": "ad072de5-d4fc-447d-a622-2633d4167dab" + "ID": "c778b3ad-23fc-4ab2-8712-8d28a084585c" } ] } @@ -1662,7 +1665,7 @@ "MethodName": "Focus" } ], - "ID": "b08f1b8d-a1c6-4394-93d6-fd9bbddf39c8" + "ID": "cd8d4c6c-54c5-4e0b-9529-413d6bb84032" } ] } @@ -1703,4 +1706,4 @@ "Formula": "新增任务!$E$24" } ] -}//HgF7du6RbcsQtB/a4MRvstEjUJX7Yyj70QVYOa7dR4eapLS+f9k0oCklispsLDXekk0J9A6KMAA5UwlOs0OwqL7c6MOAG+MIBRV+CefYzaiR/r/+QY8CZRq0zMA+nVuTC3cvQsIUOEPpDoE4BWCJrsks8pwEbhwkUmTV+KW+3ofk6UFxJK736Kz6PIiClwoni07fBF04K5uthOgC/2sKz5hDPOiksCYb8BMTe5g+K8l+/spKxsMahhcJdMOBy5OoG7hyTcO/T3FFzJUAeyfBxr+nN6RP/xldmkpAfp6AW4t+U+vdW86gdjmfb1B+s58JLQ0WeVpDnEOudo187CnD160H5Qvtoc4xAfKbIoPBToz3J8MGA+lEQBJchpG0BOBPFUXw+o6qm+vYrmvLnmglWB5QrVABmGydXeuOLkTL6eSoIjNuFGUsw92tii0VMOJ8XofQbesxFC3UmAvAzQa6WvoIQh8L7tYO3+wsKdTn9rIVMDZJ+QOlc59kfMdFpQpfnT7dTbykWJkqLOb9Hl0qnwspXMUuhCn4PTOYYMn/G57DvDsVFDn2OGpWnR7yRWrrg64tSJZ6YgWBC7yf/RnolScSN4ClqPDb9Ohk4rd7+1UJectsb0rxvzS/4A1Yru7yIP90Odam8tTOaDu60S2s639W/CsN6EQi3JA/FVnBD7Fp5Vr9u2dI41Dp+F23/jB/JtxX8M9n8NpCjbvZHqVNYWNjS4uaUoouw4xtZ6dTo198stqe2ektAHTR/4AwYwHz73ERjmNo5r2Wd2OXvaGUll5NuaaVMbo7buHI3rCIjSAxt/8hSS3XIJ7hFIYSlX3g3HUXcs3Oowrig1xe0VPA6wBItRPGedvKCAGcOXR/t5Hz9FIYpVN3C10niEeSULIsGRLMuOtxe0bLDABKjw8jfQ==|920 \ No newline at end of file +}//woeDsnt2dVGHZzR3ZlY2t7SzFnhqs8k0ckdRN0E0auRL6E2BtjlW37EBcWno++ayvFcv+MWEqsSF12NHRxs/FNQ96uwddtNPdeCM3HxsjVPukjj4dimIk/NyGwCIVy721ff+/DXkyTvuZ/jnqOTSKKbgCsaiIlfqXZeRHWTrEhhO4bgh3v+CjxiMJ3vMLpKA2in3GL0OAZ7LvZTXAAMmB4V6DeRF/6h/t8VBnM5aaIw2yZ9MyxS2jNSYTFOfolMssjISvBqul8vl/2YN8RoMDm6DXNUTopsqKSMpELs4R7gcXfKkV6LYwvEOt5BD96mxQtVdHT9TZt2VT3jDTMMllrTlqUR7GIkDLmjWQtA9FGCsWNI8XIPDdw618i3DGjTb/CYMhlhFev1Z5NWK8Bnqm3vL2GIYrmqfvYpTSJFUmkeGC4ymuz+LCJd5EWg/ZL+0JtTYSU9PB6d4orRyBIFLjnDQM6EqeW6zmTDg4PmTJrfWJISjNz83Z67Uyxji6qVcK7j7YTVFgNIbFphQ1xeiUAFS35uWBMsEEr9kpR1WArt4YsTDV6CKY/X2GWndPZRrai0WMiN1Mik1dSTJ85TezEP0XXCgFtzcynEn3ChCXUE9Wt/POsA8ELTsH0gwDX8gcZ2ev0nOl7CtXmflNZ8WGQdAkhBGOhWKXMl74lImtQ8k9MD2ViwUfKRsg1UsF6sM5af9T2pT1GDQcEtbiL+G1JvIgYP17Q4RalZMFe1Urgd5jzUZGEQuSpe24yr/olfWR62v9AeUmZ6PKQCw/4IzhPJeMvjtfAp6cR+t5zMG43VmiZ6pYFjmCoSdFfF+j3ksbDRXxoFhRlGsMEpFtNKQf4yXiQ1jBf+4ohnwGTKHvG4AbzIVngWIWTkbunS8YCJ9y7psy9x95gDiGtCEyRad9g==|920 \ No newline at end of file diff --git a/Pages/共用/项目菜单.json b/Pages/共用/项目菜单.json index 2ca54bb8..44c9107d 100644 --- a/Pages/共用/项目菜单.json +++ b/Pages/共用/项目菜单.json @@ -26,11 +26,6 @@ "DesignLengthInPixel": 38.0 } }, - "5": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 38.0 - } - }, "6": { "GridRowColumnDefinition": { "DesignLengthInPixel": 38.0 @@ -48,19 +43,25 @@ }, "9": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 10.0 + "DesignLengthInPixel": 38.0 } }, "10": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 37.0 + "DesignLengthInPixel": 10.0 + } + }, + "11": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 37.0, + "IsHidden": true } } }, "InLogicalVisibleIndexes": [ - 10 + 11 ], - "Count": 11, + "Count": 12, "DefaultSize": 38.0 }, "Cols": { @@ -84,10 +85,11 @@ "2,1": "项目岗位", "3,1": "预算申请", "4,1": "邀请反馈", - "5,1": "归档项目", - "6,1": "退出项目", - "7,1": "移到回收站", - "8,1": "更多设置" + "5,1": "新增分组", + "6,1": "归档项目", + "7,1": "退出项目", + "8,1": "移到回收站", + "9,1": "更多设置" }, "AttachInfos": { "1,1": { @@ -215,10 +217,10 @@ ] } ], - "Text": "归档项目", + "Text": "新增分组", "TemplateKey": "链接样式", "Icon": { - "Name": "项目文件.svg", + "Name": "增加.svg", "Color": "Accent 1", "UseCellTypeForeColor": true }, @@ -242,10 +244,10 @@ ] } ], - "Text": "退出项目", + "Text": "归档项目", "TemplateKey": "链接样式", "Icon": { - "Name": "退出.svg", + "Name": "项目文件.svg", "Color": "Accent 1", "UseCellTypeForeColor": true }, @@ -269,10 +271,10 @@ ] } ], - "Text": "移到回收站", + "Text": "退出项目", "TemplateKey": "链接样式", "Icon": { - "Name": "回收站.svg", + "Name": "退出.svg", "Color": "Accent 1", "UseCellTypeForeColor": true }, @@ -296,6 +298,33 @@ ] } ], + "Text": "移到回收站", + "TemplateKey": "链接样式", + "Icon": { + "Name": "回收站.svg", + "Color": "Accent 1", + "UseCellTypeForeColor": true + }, + "IconSize": 14.0 + } + }, + "9,1": { + "CellType": { + "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon", + "ClosePopupReturnValues": [ + { + "Name": "选择项", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目菜单!B10" + } + } + ] + } + ], "Text": "更多设置", "TemplateKey": "链接样式", "Icon": { @@ -348,11 +377,13 @@ "6,0": 1, "6,1": 0, "7,0": 1, - "7,1": 2, + "7,1": 0, "8,0": 1, - "8,1": 0, + "8,1": 2, "9,0": 1, - "9,1": 0 + "9,1": 0, + "10,0": 1, + "10,1": 0 }, "SheetStyle": { "FontFamily": 0 @@ -384,7 +415,7 @@ "CustomNames": [ { "Name": "点击按钮", - "Formula": "项目菜单!$B$11" + "Formula": "项目菜单!$B$12" } ] -}//ABWvI1vvJ1JHlLX23dnu8SV34wq8Qe+3wH9dSxs8T9mkc7pqS4Wv3pUisKipxg6+tvDRrLi48KyD0rHWu4qqJ4bxrNX2/BZwGRq7my95oXMWai6B7jeg1a5Af4sp67motF/8zeVmvtcD8zXg1XJFlLLgKZQuJDMfFIc+GubU7RyF2IUbN91q3Lka0cmjxxXSpJA/0mmdhz8o3//IdAAWeuVG6bYPEEY7j5od7vGS2KPRxlI6L+MQ7VibYjR449epn5KZC/bEkHfwXA0sBFKCmTM+yUahbo1oT1zrV6RhohRsmr9Z6cTME/5sDMSIpVpMgAwAS2tVmH832XQA6ocY0d447syvjMdJRq1BWpvMLT6QLIK3wiBIxd6L97D0iu/KwlcaQvhEk+IpZNUbLk9nLd08bIJ5msC5A0brO+hy8aPva55Vx9cQKW8O8Qf6QAiPjSJVtnqqYP+ZEZLUpebGry04UPN0S1rbL0bc/N5VuAR4ryTr3jbV/8unaPS94s/kuk4R5+If8gA+ld2halpzdpXPxpftPP6RwMyFfavH40Quq7llBD0UgVoT0r3+Tye9e0LFjbxudkKIjxkOfkfOYlvYU/Jh7XYvdYO+mr2pQUHq3JeKhvPO517CMb6U7NonW3mY/f1NqMDPcuU3Cs6jka5uNETTFSlMYUl60MF+h9eFrLHOO9YRLtXXW2Vff3mpj+14cysqMbRY4GkyKWjbn5OcUI3a8vvreieqahECc6cquJn41gyMqJI4KTNBIa3d/uB4Z9Ysablr0csTJnuvvkTKj8LuU5E6ts8FU9BCQtplj4REwmID7cJ80Es8K5hZ/Vv+eewzkpHQCIfGBWrsrFIOb1NLHQ0y5r8m0tt5me4662exhDAQv7s6Pta9FNIZehxRE28MklYayYRzFaZWAg==|920 \ No newline at end of file +}//yBKo33AK8QS3UC94x48knhhlclcwVORzLqJXLza9fdT/5XOpuFbKpuEjUSTyL41Wqxy8iGbw05+J0APgJrA7grFBU6Ver/5wF5u9pNyJ0d1464RoIUbf/dEa9g7SPWJlUP8wXJJ5T3Hmc72LHGCHCOjCAkFPw34rIRESu+vxLcoWfWFHSL7JfZV2Pxckt3hwX/PJ70whxgxX7UcQNs8PMth9K/GVlxKxnhkPCPJctAIiMxBGCWErXnXIGG9k0TrQJb+d8vEA6iZI+iiF9XxdcE6XzSaPj92a1uMPZMb86wo/HSmjHBYQXM0ANdeuS7ibgC3H4/8A85p16L48ABalXjIjsCnbqPv+aPjjM/tZ59mO0lCYb/DREPsaa6ZdMPBS+LzeFeEZsYcEGYXZxMiSA4nAD9fMrh6nnJ3k0fdXf/m0OpBvJVofCgLdo8I5vGcdPoEKoNJ9CUls5HfA7s1xdvMd+E41UZel5jV+GMkmdTG6mX4yUPsl8ot6tJ3CKg2NdJyj69I8HWxYbJP0zLoxZYADGvMiDG+WFkJOI66UjvsqS0VgRp8rs3iB2VxKTn0p6lpEw2VEjS/qx+sGT5QlvSQ6J3XILmMRrsHWXefFdYW8BYpPFVeXmhSkrOcIaKE4sPUHhhuVXjZ+l7OO/mEoRRBZurAlNRF9Cwk1AEzKlqx1uGqnnjdV2nSkvP7l5zaL9HXIcb5NGFJ3ZJ9jiKGTKKEYWGeMXnmafRDel6IdNS9jsh6PYlLAAza0VMz/Nr1iZ+r0C9FSkreBZ6EzPADlkTQSc7AA4NcCks5OXWrbNZng+Fw0SJBzqDdpgQH9V0woUw+IOfXwnouYRehplEDf9BptrLljDU3susZHkU08DQULuzlJrQQ21DyPqnzIAdalCNAhrl1NU9RYt0i70owkvg==|920 \ No newline at end of file diff --git a/Pages/共用/项目菜单.rd b/Pages/共用/项目菜单.rd index 3770b558..e488fc45 100644 --- a/Pages/共用/项目菜单.rd +++ b/Pages/共用/项目菜单.rd @@ -1,11 +1,11 @@ { "PageType": 0, "ColumnCount": 2, - "RowCount": 11, + "RowCount": 12, "CustomNames": [ { "Name": "点击按钮", - "Formula": "项目菜单!$B$11" + "Formula": "项目菜单!$B$12" } ] } \ No newline at end of file diff --git a/Pages/项目/项目任务分组详情.json b/Pages/项目/项目任务分组详情.json index 4f93e598..1f276883 100644 --- a/Pages/项目/项目任务分组详情.json +++ b/Pages/项目/项目任务分组详情.json @@ -26,15 +26,16 @@ "DesignLengthInPixel": 35.0 } }, - "6": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, "5": { "GridRowColumnDefinition": { "DesignLengthInPixel": 35.0 } + }, + "6": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0, + "IsHidden": true + } } }, "InLogicalVisibleIndexes": [ @@ -170,7 +171,7 @@ "ShowConfirm": false } ], - "ID": "d742ac66-1ee6-4f07-b46a-9a117611db10" + "ID": "a0633d61-888c-45cc-bb08-553b92640b28" }, { "CommandList": [ @@ -180,7 +181,7 @@ "ShowConfirm": false } ], - "ID": "b095435b-fcb2-4cc5-bd7e-c3c5764557e0" + "ID": "b28edafb-939c-4905-ab77-3dc508f00ef3" } ] }, @@ -246,4 +247,4 @@ "Formula": "项目任务分组详情!$B$7" } ] -}//bUngLY8XugEqnlxzAi7QGbNIXL0hAScntteg7vMAs8Oevq4VZe3efmpnk9nQ/kx9hLrIuAA4EDvD+XjW3bpWHwuNLcjhrNU0j2NZHuvYm+Dvs1mKzY4hI6lCrdNNakU0/XwpEgiuaZCbdYgFgQpSmwfKo6gLQ8Vibtlw/m9INtdWBRbrRVci7lAalFJ/gotCdl4kVGQ+w1EEDZ0ZBnoft+p6H12s3YVyjLNc8B40UAsKhLBVETcYDr0fZ/nxhHwBa0qeyJdKLqXSqzLgzM6ljREvDQb07JmXVchGr6kPIB0ZIsPeyqWIBhR/Td7QgrxDOyzhDckjN35gtzGxEMj9Zz+0kLKnHp7Rar1gQjjnKvcz7UHe5QgliX7CeoEKKeZse9u74pfdYRRS5kwaaBf2M3DcEO0xqtKH+9jMBVxisRQwYFhwCVJ6mlZKB0mDhe9XtyNEdnV/PhwrDndsh3bSNinCetfIZqMmJL9JDZiZpLhrEgxAqgwDftq/NIR1sZnYuMz4bQKaVpmLvnnkgqRrGQWJLyZvC89DTSMiFHp9oXGmPDOMLkiFzctRKEXXvgm3mHKkrsawdJEslA2uuUIzjXyUhIXGX3P6tU8qiBEaSy20L7fpRldOTHhl0ZLOFxp1tJ/wxf3fVzbhFhIKJ3qulApAsaUZSHLhvTsbPzPvdfK8yeJy+L/S80JOviygjx8YtNhpkUhPjAjxtamGUuIJylI7HLy+7ZARqBgKBpVxrPC4AaCuHFdPQACJhpgcI1+l/hms2GieaWsCRLEU/KFt3Mnim+CYuci/rRoiIv8RpkFF94eF7PMdWjX16s9/cLqPdCnJFtIsengfFLMn9efi7NdXkvcCwgUpOk4mk3zR4Zb8V/eaUGfgQI70+vsVMO9u/yBT4xKmb9WdTq+cb0x3cw==|920 \ No newline at end of file +}//KLoZq3devVHUYKxNiC+Iy9qLWgplrwnEye2I6wDDqPNaIporErmbXo1skChQZH4Xvqc4bNhDGFpV/TO9sycpwglUtxNTXAkGGeE5XDyqjURw5L6+zvgbtQXXzLhrfmdbb0dBN/9xienC4UgaUEJak7+7vps+v32C1wW2A/g7fQdHzguFA9Vt65sE/AvoH70qXunC8l3ymzR39CLQLI15LWwf0q5bfEdLMN+1TCC6hzEBdLbqMCmdE3Wwd6nq3Tu2yri8FtLPP7mJwLLT71bx9klVjrfkR8hiDezg9V8fPgHd/BZOwwjeHhkpPtk5weeEbhqBru4aHY3HJXeoRGog4pZmIy4R/uYx3iKESow3vQunFO5qKdM3oCPCTIydork71srIw7H0KrDEWQuNWQ+IySTSPfEfZJAf97E7OgXmXRgVPlLKDoy+fuguzti9Xmp3n01x3jQl4g9maZH6iTh8rBHyR+7p3E8ydkLUT+FuSnUCEOlPqXDtqtO7H/Tifl/zHq+2YBCf3xeBrh54MM22X+REv0pjIfP8Ogm6ruEvLuX4h+3zSGCDFvepu1d8gUP8X5PReak0LUWnsBNL7+E1OcBVb27V9yZTh/IIKqAdUlglaa+FGyJzAl4W+Ef13hPtpfTgNnKibfwkSSEuUhdZec8ShsNA3jVm2GoAW0RKXaLZxBdx6ufa76t1mx2iMJ4koFvpbhAKCaR+KRDmG3kiaas2OyGGBGo7oAaRS0Jzmi5nA5lH5DOj7pn4VFA/EVNw8zbwxAUD/FPQUE5Yf4hdLeU02e7YMMKAOr0EujuFpI4CPe3qwI/Hs7cLrwNdebFiihxQdtddLhh1n9hTrKSqvvNd++hcpDKlmN52F1ehQOjpQ4N0Phhb5VA3uYJceCbfVm5yYs3CpGcDZxT8Ut1ciw==|920 \ No newline at end of file diff --git a/Pages/项目/项目分组详情.json b/Pages/项目/项目分组详情.json index 24c85db5..e9fb1443 100644 --- a/Pages/项目/项目分组详情.json +++ b/Pages/项目/项目分组详情.json @@ -162,7 +162,7 @@ "ShowConfirm": false } ], - "ID": "71dcd365-9fec-4422-9cb0-0ba762a7b261" + "ID": "13333b9e-afa1-4fd0-b1a4-19ad9f24e039" }, { "CommandList": [ @@ -172,7 +172,7 @@ "ShowConfirm": false } ], - "ID": "07704cda-f7cf-40da-b2de-5c72bdbc5f7a" + "ID": "b86dae95-869d-4c98-8a01-a8b75938f1dc" } ] }, @@ -223,5 +223,11 @@ "PrintInfo": { "PaperSize": {}, "Margin": {} - } -}//PYeNX0DhyQgnKjj7WaMk8j8zfqnDMG0NZpV5lKEfKq+h2MCr1/bJeGj4hdli/by5RIcUuW5oOpmfIkvJiSNFENM52bnPBxpqLz7ol4KPPwrJ06eW023wgscR5qETDJASIGys/wwdKoekyACTAl4kav/T4x04KgBf89ks7fnJr2s5NBl0NpmsVBO47TjegtmpO4cEOOkpgLIEYGboEQUASCqLy1oW4Q8qTpPowM7NDzZ47LkQOxyn//VxXTBZnyACppVf7yD+EtNGICsgjeK6+Oh5PrCTjcYOuLZvb0YkY0iiNYxVd9vlFbYGyS/uVhOa+7yUTWifiT8c714inl/wdJwJfdbOfqy+KP+PKmsXY5RpqdZXQ3yP7jFlz/fptTzJZ0NTZnId787fGLltMQDGp+ZHylMQPPddsGIDgHKekITZh5ZK/suVGKgO+84YtbaS0o5k4lZvX1v+EMiyT+XURIi5K1w0tk3G4kju2PQTzigAOpsx7lFhVzNYdrIByb4iNIQICdEMe/ZoRsTi2x1I1Mh7yKPuY1Mg6JyjY9Rv18rImkoEnt/YgmycqOUKNVZFbmrROEgRzLtkIYKlLQ3odVejh4B7L13eNO4XGxqc0sMnleAPRQBu+Er9xdJetG5TV8jc1w2yo7FAaic94/6Wnt9iJ3s53FQw3dg5904u0O31rQshnugrJUwZFtAKbvVwriffyOibjsVRephGlmvwWOZSsS7BqG/UQYfJirgV0XvZJO+/t+C5zEe+EQI0/e0lxVbIUM6iwzXgADLYX9YC3aUz52+z4QNnN6wNZRUhUfdbgT4FBPXAEKekmX+3sqzIC61q2QyMcJ6PJrSFfuGfjyRDmJBq7B9s1nJ3h+VoaqA4EkjzhxQvL1dUvyOxRt5hJS2MC89KwZjsTDvHsrCUZA==|920 \ No newline at end of file + }, + "CustomNames": [ + { + "Name": "项目ID", + "Formula": "#REF!" + } + ] +}//CfMuxy/85i1CPh54/l3HYHU61oBGTbNt7uTvk5k7ddahgNAAqBIzhVShhlVktKLFxEparyBnE6DCu9kVLkyuX3UcnP/3e2cN91cVw19Bd4h6A36RzJGX6ThkEzkv42+q7OOHYTlD9xkt1OcKDHWoq9DRBMnaLZVnlaIi7FJTZ/gbHGWSwPZTtWfMwLTxEQY/xyT1Pjek3NuQY1IPIeBiTBeT3jOvB/qXG/C2dt6MprGRit4UbM7dRNH7t9HWS+R4z5wqDNQJPnb74VdBR8BNsr/v14fnbSXI837fmsvDGBG1L5cQLU5ymAR0KzOagIOGAc1F7+Aryxp00YitL4zEsWoOChPiPETR5Hze4M/NVJtyBMK6g6tFvHww0m33bM2+rE+LBxIxnDSlgUf/9V0Eeh/Qu7Viqo21dwOfRYU3m2H7/fgZMO6V7x66ybWmxj55DdhhhZc+QfH5D6IDub+kgiC9sVwIw7YNXW+ej1IG8BUh288NpciQVkXplSfUEBYgoWfmWkze+oNZT/0OOo1IB+GpKIU6u1xmQfwexvOaOOOrTAIOpJT0a9XxJCV+g6YSvnt8jCFEBg+9RkkeH+yHR9EPwi3lgrca4azReRIpUSrF1WFqRqLWKpYInBszocvVzzneEex7drykbJ0ysjTD2yburdoCxejD1lbX5BcvSVjWlMck+jTHIi58bScfo2muuOLeomIldmgVDejgo3nOXoML0bQjBPgzRQUk+SdiYge0qaqOYmq7WNpZXmZMNehHqC/cHLbST7jmdfIprSVq/tCg1p9G8lzdBn0OgGJoOPI0gJZna6LFdO0kiIyv9ycHjN/vrkHFMbXakd3LUH8QJqMmD44egC7PrxUu2B3l9L02kCovWewP//3KQk2O+clhKaDZ9uKAdcFspe+g5DICmw==|920 \ No newline at end of file diff --git a/Pages/项目/项目分组详情.rd b/Pages/项目/项目分组详情.rd index c66f627f..0b561cbc 100644 --- a/Pages/项目/项目分组详情.rd +++ b/Pages/项目/项目分组详情.rd @@ -1,5 +1,11 @@ { "PageType": 0, "ColumnCount": 11, - "RowCount": 6 + "RowCount": 6, + "CustomNames": [ + { + "Name": "项目ID", + "Formula": "#REF!" + } + ] } \ No newline at end of file diff --git a/Pages/项目/项目首页/项目标题.json b/Pages/项目/项目首页/项目标题.json index ca06abf2..e10ec2ac 100644 --- a/Pages/项目/项目首页/项目标题.json +++ b/Pages/项目/项目首页/项目标题.json @@ -252,7 +252,7 @@ "$type": "LoadingCommand.EndLoadingCommand, LoadingCommand" } ], - "ID": "2ef65931-dd56-4311-a94a-e9256cb5551b" + "ID": "3d97d111-918a-4d50-abd3-ca2e03eb216f" } ] } @@ -370,7 +370,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "c3a6e9d9-29ee-4d43-adb6-26a1a9d9fdec" + "ID": "25a41e2d-86c5-4f63-b948-91ad83d63d80" }, { "Condition": { @@ -391,7 +391,7 @@ "PageName": "项目配置首页" } ], - "ID": "ddcca2fc-dac7-4878-96e2-28d0d06bfe3e" + "ID": "b921668f-3133-403c-81e3-6618f3dc8e36" }, { "Condition": { @@ -441,7 +441,7 @@ "Disabled": true } ], - "ID": "27ebf676-aaef-41e0-bf00-021c4eb5b1e8" + "ID": "36e68a3f-ce93-446e-8c13-3c865799eb76" }, { "Condition": { @@ -477,7 +477,7 @@ "Message": "操作完成" } ], - "ID": "3962f1b2-539c-46cd-8451-26eeda7becc5" + "ID": "e3bf443c-8841-4726-b133-9b4af149c042" }, { "Condition": { @@ -493,43 +493,6 @@ "value": "邀请反馈" }, "CommandList": [ - { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "生成网址", - "ID": "979bdaa2e57246bab3ad8f2e8591d05d" - }, - { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "项目ID", - "ParameterValue": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目标题!项目ID" - }, - "ID": "abcaf3a4e6514f4681d525347681e101" - }, - { - "$type": "Forguncy.Model.RunJavaScriptCommand, ServerDesignerCommon", - "JavaScript": "var baseurl = location.origin;\r\nvar appName = Forguncy.Helper.SpecialPath.getBaseUrl();\r\nvar pageurl = \"反馈与建议?ID=\";\r\nvar pid = Forguncy.CommandHelper.getVariableValue(\"项目ID\");\r\nForguncy.CommandHelper.setVariableValue(\"生成网址\", baseurl + appName + pageurl + pid);\r\n", - "ID": "6e457e0fa93b4192aefdd829a02cc754" - }, - { - "$type": "复制到剪贴板.复制到剪贴板, 复制到剪贴板", - "ObjectiveCell": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目标题!生成网址" - }, - "IsAlert": false, - "AlertData": "复制成功！" - }, - { - "$type": "Notiflix_Forguncy.Confirm_Command, Notiflix_Forguncy", - "Title": "复制成功", - "Message": "是否立即为您打开分享页面？", - "Answer": "我已确认", - "OklButton": "确认", - "CancelButton": "取消", - "Result": "按钮结果" - }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", "ConditionAndCommandPairList": [ @@ -537,36 +500,137 @@ "Condition": { "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", "param": { - "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", - "cellLocations": [ - { - "SerializeProperty": "=按钮结果" - } - ] + "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon", + "tableData": { + "TableName": "项目表", + "ColumnName": "开启反馈收集", + "GUID": "7634e8e7-6e77-4d76-98f1-e9820ec8ba9b" + } }, - "value": "确认" + "value": "1" }, "CommandList": [ { - "$type": "Forguncy.Model.NavigateCommand, ServerDesignerCommon", - "ValueFormula": { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "生成网址", + "ID": "405a0f5293814b5892913383e11482ee" + }, + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "项目ID", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目标题!项目ID" + }, + "ID": "fee4a179089844ba8d954a5d10c4522e" + }, + { + "$type": "Forguncy.Model.RunJavaScriptCommand, ServerDesignerCommon", + "ID": "6e457e0fa93b4192aefdd829a02cc754" + }, + { + "$type": "复制到剪贴板.复制到剪贴板, 复制到剪贴板", + "ObjectiveCell": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=项目标题!生成网址" }, - "IsOpenInNewTab": true + "IsAlert": false, + "AlertData": "复制成功！" + }, + { + "$type": "Notiflix_Forguncy.Confirm_Command, Notiflix_Forguncy", + "Title": "复制成功", + "Message": "是否立即为您打开分享页面？", + "Answer": "我已确认", + "OklButton": "确认", + "CancelButton": "取消", + "Result": "按钮结果" + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=按钮结果" + } + ] + }, + "value": "确认" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.NavigateCommand, ServerDesignerCommon", + "ValueFormula": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目标题!生成网址" + }, + "IsOpenInNewTab": true + } + ], + "ID": "8f4fe0df-f903-4b45-a55a-513a5367f91b" + } + ] } ], - "ID": "4e97f0d2-2f57-4006-9b39-b75f3c7d9314" + "ID": "69877d00-93d8-4503-9404-ca831967e653" + }, + { + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "FourStandardStyle": "info", + "Message": "当前项目未开启收集需求功能，请开启后分享！" + } + ], + "ID": "2b7674f4-d0bc-40d8-bf55-1442c8ecfb0f" } ] } ], - "ID": "24b0f8ef-abce-40ee-b540-cfa217224ba1" + "ID": "0d357fe2-609c-4f18-a2d6-022e343fc95f" + }, + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=选择项" + } + ] + }, + "value": "新增分组" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", + "PageName": "项目任务分组详情", + "PassValues": [ + { + "Source": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目标题!项目ID" + }, + "TargetCell": { + "SerializeProperty": "=项目任务分组详情!项目ID" + } + } + ], + "LoadBindingDataOption": 2 + } + ], + "ID": "11474e91-5379-400a-aff5-d4ca1bd4c717" } ] } ], - "ID": "0159b8ad-d3ff-41a6-b2d5-c89f8cdbd3ad" + "ID": "4a20f579-0d72-4464-834c-7f21570b6fb5" } ] } @@ -640,7 +704,7 @@ ] } ], - "ID": "41234dd1-76bd-4777-9bf9-9b5446f3c7c5" + "ID": "72d078b9-dfc2-4ba1-b372-224277736f14" } ] } @@ -865,4 +929,4 @@ "PaperSize": {}, "Margin": {} } -}//lQ9jGqTS04JqhlfgyHgFJI0rKejdbRRJ0pDfE8yyZnIzjvW9ixFFfgYwiESmEnZFF5tQL/2pnNROcOozNgHSnkVJCb7RxYOjS5cjOW/0Q3X4VDSn6qBnnYM7laN6tzHuwIMwPaViIKEYmzrK8mRxyVpyDChQVw9mp3ZDvDuIoNFLC5mCPXmhALUVmaa/3ICzzGO30QG9/AoBtb3+di3U/ZYGcAnRqJdGQfYHxkLJTzJZxFq7YXrXQjOgFsvQVSb7gSVw5v0oC6wJZVbgEJyjWgVcvSn9TA1evE3Jl3qRGN7nYQWJkwKNs0+7cyVhGwt/5M6taZjkt/lKaZBB45cH96FF6G/8eP/qSRxKmKRG9YQknNNAFBgmosKAECbbWWefm91VcuBUX3HnDI75DLUT2ONkFEgiQL4U/IJGH1AAEvFI93JkZ3Ckd045pRfc8H+DA92Xsh/5UYkF1LmxJXHhlbHbb8zdggK3AJoIswhKllmK5T1pYNiV+bKhwNrmUO0Yuq3k/XuubV/2N3B5mi+5WkRMS3DbvjmNmO08dAAzxz69dnmhI737nUeT7RA/fSMVsVoBc9ZjlShlmGIAD6WHQKmg6ais70MRq9nQc9lZqAmOk1UsgRc2flmu7wvbL1CaaF7TjtYLJQ84bSYOYpScwwr6/WkRz0w5kGSS4RKXt+/vBYUBaD3HzO341+OcvFFyKCb3Ds6ji4YkOYMSXW+shQpU8zqEQ22zGO9fCnL9Pf6wM7X+6xfDhs4n9/s+76sQZOa3emo6U2IDX1SR5lWXy6g+oupna1nHT2XTP78lrVjnOG2Xj808uYjCRrHIlyI1yuqLTt9DEm9qaf4huBQiB7V5dXbItJWk4yHcRuBHNBgeNk6ag+r6LpurMcqqnRn1tuKges6AnE92SeTrwa5tXg==|920 \ No newline at end of file +}//rxspLwI04FcZY5Fo2HWgDfZZoeo+6ct2Yg8+uXSIQQxw7HgcC0GI17ZdNh7J+hx3vdQtjQqbytCleCCBvqp7P8cmS1lMPofq+rdf1hP2/KbeiilaOvMx6XA1mwbWMuTXeDHNp9bZNx/ElMC4AB6Z/RFktHDmE7iXf1a+FGtl3ZpOSRfiPzv02Z8wbKaAgTIpycrsIwQhT7EalppPL5410jMLGA3KlEGC3nRuwqFjaIZ/EW9Ndztn3mWaUQoDeobFxdn/sDz34s/ELBOAlrFGb8xi2D2ThbEciA8JLwQxFAH4CA2LCEVymToLZg1JAA2rkrR/5hZhloSEIsqcC0F3Torh2pOKycLJunhImIv48MKZGePgOT0wrvKtPf5+NmJaPeuZFYG8lV/2y7a8V82UandbOzf8WK4bic/N6rTjM4GkFpa+rbwEuj7BOtRBCtioH8Z6SHx8ptpWGsHzU3O80TDy+2tpBScrlI8FOBoLYEZ5UU6yfyj/kLPGChKglN+pxoDz8eHv+3n9iCdTnSpT23MSQ5AXBysIt9QaGDReSstVOIbG0tp0tWAPHjinIbkX8W+D8nvOOXz7nhuD6XWX/D30zxWqImgfl05Yvv+rXNbtoljddOop2VcUtbcpTphOCMxmdvcuCgPW0m3MyB1lg7dBWGHztqXVtGQKRDuGCZI2EgAy8UpBtksQ7p7GznKosd9K9Kh4lGNI24FA5tzZkkwlfTX6rSBHcitWmKqJsteDXx/vaM5/l6RtqlqyxAhjQycy3OGMZn/V4+GaGuQODHS0lBpMB1G03mjegXX0DvA2biTdArSjIezvlek6Tl+kT+IE0NxUR/uVou66SsL077rXVju9Wtay17MSBRkU83PkH1GV8htBtUr+EP3SWqVuW7aCBEU+zHHnHO9zNmdvDg==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目配置/项目信息.json b/Pages/项目/项目首页/项目配置/项目信息.json index b851f72d..1c4adcd4 100644 --- a/Pages/项目/项目首页/项目配置/项目信息.json +++ b/Pages/项目/项目首页/项目配置/项目信息.json @@ -297,6 +297,7 @@ "23,1": "项目方案", "26,1": "预算方案", "29,1": "网络资源", + "33,1": 1, "33,18": "提交" }, "Formulas": { @@ -573,7 +574,7 @@ "MethodName": "ReloadBindingItems" } ], - "ID": "edce37e7-2779-4df6-a788-6d7d70c0ed5b" + "ID": "810a3938-a676-4fcc-b469-062ca0af09d2" } ] } @@ -772,7 +773,7 @@ ] } ], - "ID": "d2bebdb7-df06-42d8-94f6-52f70fcf0664" + "ID": "5f1bd914-1d5f-47cd-9fe7-da5b3405f60f" } ] } @@ -1443,7 +1444,6 @@ }, "CellType": { "$type": "Forguncy.CheckBoxCellType, ServerDesignerCommon", - "CellDefaultValue": true, "Caption": "打开客户反馈通道", "Style": 1 } @@ -1672,7 +1672,7 @@ "ReloadData": true } ], - "ID": "1d27edc8-a426-40d8-818f-9cac7bee8805" + "ID": "e0fe0ceb-e9d8-404f-87d7-101c9929afa5" }, { "CommandList": [ @@ -1687,7 +1687,7 @@ "BtnText": "知道了" } ], - "ID": "504f7b38-11f1-4659-bd1e-74aebec4af89" + "ID": "56517abc-9c1f-46dd-b716-cfc594fcc73c" } ] } @@ -2357,4 +2357,4 @@ "Formula": "项目信息!$B$36" } ] -}//DvJGshGCtxjYJ17+L0V++O393stFEkIgSYVpQyRGibDoqLVGTq+vRpbJnLVsfWYtEzuX5tYL6ZXi1L7qBaPp6Bs7odK4I3ti9ic1/sdj0VEXzjV++7hiy5ahEWLmALrNyIhEZdGNlJW3q4rDL8R6ps0Y0DjCfWikqEtuuipyX5Y6ntVizSXgzEpC5D9YKNjWogglq/vLbkYrvs6NmAGj0xq1e0bQXCQKRD+t1TGNHFMmmaLHEnqCQdU5RbA1DSQqUJ0+h/+ijgpY3GSRvm0nHSLFH4Bbz5oJDyDrBuHnH4v3eZjTNRVs/JHM09NS4Gh3SgvX803aUe0kwzEBdPzoDhBx6paqFbPmnRbJC+hExJNyE4kbNhmGg/KE2m7cTDeSGFScXBXc7rYCn0+Rcz5KEYZ4CQPtrd34gu0Cre3LCQkXqTFbXODNlQG2H5iSZk18i/I4qRwUaa1CngTgjhmTu1zf6XAbZ/6GuixdTzAQmEm526QAzhX1ipyyeGVOEiYipIeLTiU4iXycObiUzuiNNvfeT16w/iC4WuytrbpZdjZcLl3L4F9/rjfjURnkge63JltmT0TSI/LsDTR3tY6A0mcE0eho+CKxkmKf9HvCGDNzoTvpvzmFSZof8KuI+tGTfIUZTPsYzmrXJpgc6deRkd1xraLzMrm6mrPP47l21A/234/X7qiYkAOS+GuTEBBOiAa/eFz43Soz/oH0Eqd1Rnu3GuxGqZ4gGckWUHvKvHfchyxZ9JHgyhrXfZTZbqyobLisC9zl5l2ZyK0bKqcTwfy44jKrKmPE8XYyQEFwk4OLre/nhOXQgff+af+aVJwQ4yZ/o5jw3YT4ZIT6bXy4NEukyAmp4u8bzBgJDQC3f8aiBqgikiNYkLKD50JR6bJCNDfqey6EgblpUMiE8RcQpQ==|920 \ No newline at end of file +}//hCAGbBGua+lxHBxjriS0au+CCQLUu1YrR4n/4D+3O2CoO2KHtny0ThPNa0fV8eFJOFWQoGIbk9J8kJ2S75EiFWopLlzZyfMzlH1tIxol62OcBqzbLw4lbuMux4/QoIeZGsLmv/LPdPEurhtyB1QdaqwE2laeNtW5CJBhx1npm3RzOqhXaC8gKJeUVpkoBf3YHr5xFsG5lYwPa6CAtLy8TtfdYAMg3N9BV/PpF4SjSEXyc+Nh9Fa9y5m3hBwz+VahyByPV1qAsTaBgtXRe4dHr6l/f/sNA6Z1f36H2l4AG82FOeU1jw+TFQBs9W808Ok3SFF1XVqkoiR2Bg/yl9rI7IlXMEIMCs7DRLd77JCERnEocHyQ+Pmua3jxgCPM0DsG1gCoz90YyWQpB97/ctzutVL25OT6n3vFnrMRCgYJ2Om6jQ/OEIgDKkWyznz3dmEEhbI0DWh+2ro8nroRpdTYmfL/iGeZeXxUPYg/N1IXuqYIZHDswx+rdnbnNdurGDIRnwDKQKsYsw4clciK0tN/WFzDC+vb7FAi6M7qC/VYZ8Gv/gypbzwKEGvSr/P1tcv34QZ7DUr5mw5GMNiPg6wJwHlKin9ESTQxQVOtA9wJNb9gxV9dF0bY/vuD+Js4B3vkbBTfL8lHyRI76K/oTwznLkB4fd5vX+h/xocDtxP1/9OKjp/mkI69Py5a7MkzSkzrATVcQAsrYc2964NUj7Ze3s/nooaEIkhMd5AhP4PhGSCxDyIbg3cOn4IetJqxVZB9/WuJ6at53aDmt7wq7WlgRl/NmgleVqxlrOPwqHitZzshlc/l21+DnFk/0YGKDEU33m70a/YJ2BzIOdRQamUarwTZBE/OkIUDMKcyrIdJwnc2l0fjryIh9Y8m29PeNjt6t1fFBXutG58LFVuXOmTpSg==|920 \ No newline at end of file diff --git a/ServerCommands/任务/同步任务参与人字段.json b/ServerCommands/任务/同步任务参与人字段.json index 73736586..3242d3a1 100644 --- a/ServerCommands/任务/同步任务参与人字段.json +++ b/ServerCommands/任务/同步任务参与人字段.json @@ -41,7 +41,7 @@ { "BindingInfo": { "TableName": "任务表", - "ColumnName": "参与人统计", + "ColumnName": "参与人列表", "GUID": "cb217fea-4529-4dff-b55a-554b24ba113f" }, "ColumnName": "参与人" diff --git a/ServerCommands/任务/新增任务.json b/ServerCommands/任务/新增任务.json index 341b613a..f406f575 100644 --- a/ServerCommands/任务/新增任务.json +++ b/ServerCommands/任务/新增任务.json @@ -205,7 +205,7 @@ "Message": "任务预算工时超标，请修改或申请新的预算。" } ], - "ID": "5517a21e-7228-4e5f-896a-a542b8c129cc" + "ID": "c34452bd-96e1-4411-be79-24f1fdab9459" }, { "CommandList": [ @@ -232,7 +232,7 @@ "ID": "b16d29a07b0c438fbbb99f78efd15b82" } ], - "ID": "377033eb-332e-4540-a0bc-b042aa13f333" + "ID": "cdd0d56f-8d1c-47da-9f46-0dc7557e3e4d" }, { "CommandList": [ @@ -278,7 +278,7 @@ "ID": "94dddad10a1647e3906a84c6cf0793dc" } ], - "ID": "fc3e8287-2251-4548-88e3-a0a386ee3ee6" + "ID": "b1ec1f65-b9b5-409f-981b-514b838ecbec" } ] }, @@ -488,16 +488,16 @@ { "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", "ErrorCode": "0", - "Message": "新增成功" + "Message": "新增任务成功，请添加参与人和设置人员岗位、薪资等信息！" } ], - "ID": "03d8cc7c-f249-4a98-8ab2-710e790a14e7" + "ID": "bfea1c53-d963-4a65-9bf7-f3f7d4bcbe2c" } ], "Comments": "如果任务设置了预算工时，则检测是否超标" } ], - "ID": "d425d772-9caf-46ff-9c71-28be02bb8cea" + "ID": "5d3bd8b4-c692-4b38-ad2d-cfa994a0e420" }, { "CommandList": [ @@ -507,7 +507,7 @@ "Message": "项目不存在" } ], - "ID": "97eadd57-d889-46b2-8b15-632c0ec827e9" + "ID": "00cae617-053f-407e-9436-464e88870862" } ] } diff --git a/ServerCommands/任务/更新任务参与人.json b/ServerCommands/任务/更新任务参与人.json index 77ff45d5..4d11e28f 100644 --- a/ServerCommands/任务/更新任务参与人.json +++ b/ServerCommands/任务/更新任务参与人.json @@ -106,7 +106,7 @@ }, "TopCount": "1" }, - "ID": "76933ca611fb4944bb7102a7660b69ef" + "ID": "d62edb82b552422ea7c2cc38b7247dc3" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -393,7 +393,7 @@ "Message": "操作完成" } ], - "ID": "46bc7a1e-4ad5-4669-98d3-c4342a9812ce" + "ID": "938285c7-b260-46dc-9369-d8b78265d4e7" }, { "CommandList": [ @@ -403,7 +403,7 @@ "Message": "任务不存在" } ], - "ID": "815b08ca-4670-455d-9e78-415d89d019fd" + "ID": "96a24cfe-caef-45aa-aee6-773c70df934b" } ] } diff --git a/ServerCommands/工时/上报实际工时.json b/ServerCommands/工时/上报实际工时.json index 623712c3..e110b655 100644 --- a/ServerCommands/工时/上报实际工时.json +++ b/ServerCommands/工时/上报实际工时.json @@ -76,6 +76,157 @@ "$type": "Forguncy.Model.CatchExceptionCommand, ServerDesignerCommon", "TryCommandPart": { "CommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "任务信息", + "TableValue": { + "TableName": "任务表", + "TableValueType": 1, + "BindingInfos": [ + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "项目ID", + "GUID": "1b1dfe53-8569-419b-9ac7-4bb4e54e5cb3" + }, + "ColumnName": "项目ID" + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "任务名称", + "GUID": "2f0ff2cf-b0cf-49ba-99c2-9b8636152c54" + }, + "ColumnName": "任务名称" + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "任务预算工时", + "GUID": "503e9dd2-fc8c-4426-a37f-c7d582c9577a" + }, + "ColumnName": "任务预算工时" + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "任务状态", + "GUID": "93ff9848-29c1-4cf6-a3cd-d33eb1d033c4" + }, + "ColumnName": "任务状态" + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "任务状态", + "GUID": "da675aa2-3619-422b-817f-eed8c7c118c7", + "RelationBinding": { + "RelatedTable": "任务状态", + "RelatedColumn": "状态码", + "DisplayColumn": "任务状态" + } + }, + "ColumnName": "任务状态文本" + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "项目ID", + "GUID": "038a41fb-93fa-46f8-b259-87eb94cc28ad", + "RelationBinding": { + "RelatedTable": "项目表", + "RelatedColumn": "ID", + "DisplayColumn": "严格模式" + } + }, + "ColumnName": "严格模式" + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "项目ID", + "GUID": "f4212e88-f2aa-4d8f-8ba8-b7c518505bb7", + "RelationBinding": { + "RelatedTable": "项目表", + "RelatedColumn": "ID", + "DisplayColumn": "项目预算工时" + } + }, + "ColumnName": "项目预算工时" + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "项目ID", + "GUID": "31040160-fc88-459c-b67b-8621acbc0920", + "RelationBinding": { + "RelatedTable": "项目表", + "RelatedColumn": "ID", + "DisplayColumn": "项目预算费用" + } + }, + "ColumnName": "项目预算费用" + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "任务类型", + "GUID": "f6fb60c7-0ba6-450b-9cda-28eb2412e296", + "RelationBinding": { + "RelatedTable": "任务类型", + "RelatedColumn": "ID", + "DisplayColumn": "提成系数" + } + }, + "ColumnName": "提成系数" + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "总计划工时", + "GUID": "4bdf7858-40b1-495e-be0d-109aaaf4f69f" + }, + "ColumnName": "总计划工时" + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "总实际工时", + "GUID": "8505a216-3aee-4056-affe-6c760e35c844" + }, + "ColumnName": "总实际工时" + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "项目ID", + "GUID": "b5020b4b-8e2e-4b31-a2ac-53ca31b14b8e", + "RelationBinding": { + "RelatedTable": "项目表", + "RelatedColumn": "ID", + "DisplayColumn": "工时分配方式" + } + }, + "ColumnName": "工时分配方式" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务表", + "ColumnName": "ID", + "GUID": "6ffb7caa-1cd8-4373-b2bf-8a03556c1866" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务ID" + } + }, + "NullFormulaValueQueryPolicy": 0, + "TopCount": "1" + }, + "ID": "6883e7e943054fcb952797447c8e0ec0" + }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", "ParameterName": "任务成员", @@ -122,7 +273,7 @@ "ColumnName": "任务时薪", "GUID": "93b2f1d8-fd53-468a-9211-87f51b6a5494" }, - "ColumnName": "任务成员时薪" + "ColumnName": "任务默认时薪" }, { "BindingInfo": { @@ -183,70 +334,7 @@ "NullFormulaValueQueryPolicy": 0, "TopCount": "1" }, - "ID": "9a67d1972a8741d2af5edb5a82988945" - }, - { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "项目成员", - "TableValue": { - "TableName": "项目成员表", - "TableValueType": 1, - "BindingInfos": [ - { - "BindingInfo": { - "TableName": "项目成员表", - "ColumnName": "岗位ID", - "GUID": "e72fecb8-c4b6-4ef0-a802-f18cb6d6ba24", - "RelationBinding": { - "RelatedTable": "项目岗位", - "RelatedColumn": "ID", - "DisplayColumn": "默认时薪" - } - }, - "ColumnName": "项目岗位时薪" - }, - { - "BindingInfo": { - "TableName": "项目成员表", - "ColumnName": "默认时薪", - "GUID": "90991267-4d34-4537-8be3-0ef990118f3e" - }, - "ColumnName": "项目成员时薪" - } - ], - "SqlCondition": { - "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", - "SubConditions": [ - { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "项目成员表", - "ColumnName": "项目ID", - "GUID": "25c7933c-8b27-4163-ad03-a22d7efe88fb" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务信息.项目ID" - } - }, - { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "项目成员表", - "ColumnName": "项目成员", - "GUID": "02b01205-9bbb-4e4f-8534-f52ea963c907" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=执行人" - } - } - ] - }, - "NullFormulaValueQueryPolicy": 0, - "TopCount": "1" - }, - "ID": "1d2f8e887f994e8582168d092f010ec9" + "ID": "5d336b93a4df4cd08bf82c0216fd637b" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -267,154 +355,66 @@ "CommandList": [ { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "任务信息", + "ParameterName": "项目成员", "TableValue": { - "TableName": "任务表", + "TableName": "项目成员表", "TableValueType": 1, "BindingInfos": [ { "BindingInfo": { - "TableName": "任务表", - "ColumnName": "项目ID", - "GUID": "1b1dfe53-8569-419b-9ac7-4bb4e54e5cb3" - }, - "ColumnName": "项目ID" - }, - { - "BindingInfo": { - "TableName": "任务表", - "ColumnName": "任务名称", - "GUID": "2f0ff2cf-b0cf-49ba-99c2-9b8636152c54" - }, - "ColumnName": "任务名称" - }, - { - "BindingInfo": { - "TableName": "任务表", - "ColumnName": "任务预算工时", - "GUID": "503e9dd2-fc8c-4426-a37f-c7d582c9577a" - }, - "ColumnName": "任务预算工时" - }, - { - "BindingInfo": { - "TableName": "任务表", - "ColumnName": "任务状态", - "GUID": "93ff9848-29c1-4cf6-a3cd-d33eb1d033c4" - }, - "ColumnName": "任务状态" - }, - { - "BindingInfo": { - "TableName": "任务表", - "ColumnName": "任务状态", - "GUID": "da675aa2-3619-422b-817f-eed8c7c118c7", + "TableName": "项目成员表", + "ColumnName": "岗位ID", + "GUID": "e72fecb8-c4b6-4ef0-a802-f18cb6d6ba24", "RelationBinding": { - "RelatedTable": "任务状态", - "RelatedColumn": "状态码", - "DisplayColumn": "任务状态" - } - }, - "ColumnName": "任务状态文本" - }, - { - "BindingInfo": { - "TableName": "任务表", - "ColumnName": "项目ID", - "GUID": "038a41fb-93fa-46f8-b259-87eb94cc28ad", - "RelationBinding": { - "RelatedTable": "项目表", + "RelatedTable": "项目岗位", "RelatedColumn": "ID", - "DisplayColumn": "严格模式" + "DisplayColumn": "默认时薪" } }, - "ColumnName": "严格模式" + "ColumnName": "项目岗位时薪" }, { "BindingInfo": { - "TableName": "任务表", - "ColumnName": "项目ID", - "GUID": "f4212e88-f2aa-4d8f-8ba8-b7c518505bb7", - "RelationBinding": { - "RelatedTable": "项目表", - "RelatedColumn": "ID", - "DisplayColumn": "项目预算工时" - } + "TableName": "项目成员表", + "ColumnName": "默认时薪", + "GUID": "90991267-4d34-4537-8be3-0ef990118f3e" }, - "ColumnName": "项目预算工时" - }, - { - "BindingInfo": { - "TableName": "任务表", - "ColumnName": "项目ID", - "GUID": "31040160-fc88-459c-b67b-8621acbc0920", - "RelationBinding": { - "RelatedTable": "项目表", - "RelatedColumn": "ID", - "DisplayColumn": "项目预算费用" - } - }, - "ColumnName": "项目预算费用" - }, - { - "BindingInfo": { - "TableName": "任务表", - "ColumnName": "任务类型", - "GUID": "f6fb60c7-0ba6-450b-9cda-28eb2412e296", - "RelationBinding": { - "RelatedTable": "任务类型", - "RelatedColumn": "ID", - "DisplayColumn": "提成系数" - } - }, - "ColumnName": "提成系数" - }, - { - "BindingInfo": { - "TableName": "任务表", - "ColumnName": "总计划工时", - "GUID": "4bdf7858-40b1-495e-be0d-109aaaf4f69f" - }, - "ColumnName": "总计划工时" - }, - { - "BindingInfo": { - "TableName": "任务表", - "ColumnName": "总实际工时", - "GUID": "8505a216-3aee-4056-affe-6c760e35c844" - }, - "ColumnName": "总实际工时" - }, - { - "BindingInfo": { - "TableName": "任务表", - "ColumnName": "项目ID", - "GUID": "b5020b4b-8e2e-4b31-a2ac-53ca31b14b8e", - "RelationBinding": { - "RelatedTable": "项目表", - "RelatedColumn": "ID", - "DisplayColumn": "工时分配方式" - } - }, - "ColumnName": "工时分配方式" + "ColumnName": "项目成员时薪" } ], "SqlCondition": { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "任务表", - "ColumnName": "ID", - "GUID": "6ffb7caa-1cd8-4373-b2bf-8a03556c1866" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务ID" - } + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "项目成员表", + "ColumnName": "项目ID", + "GUID": "25c7933c-8b27-4163-ad03-a22d7efe88fb" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务信息.项目ID" + } + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "项目成员表", + "ColumnName": "项目成员", + "GUID": "02b01205-9bbb-4e4f-8534-f52ea963c907" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=执行人" + } + } + ] }, "NullFormulaValueQueryPolicy": 0, "TopCount": "1" }, - "ID": "a5c0934784614060ab0287e29ae7729e" + "ID": "c24060577e0143fdb16f1f374c7c895a" }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", @@ -485,7 +485,7 @@ "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", "ParamObject": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务成员.任务成员时薪" + "SerializeProperty": "=任务成员.任务默认时薪" } }, "value": "%Null%", @@ -499,16 +499,16 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=任务成员.任务默认时薪" }, - "ID": "068f4611d05f4d0f8c97425c44bea1f0" + "ID": "e313b6627e4d4f5c812c5385f1117e65" }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", "ParameterName": "时薪计算来源", - "ParameterValue": "任务成员时薪", - "ID": "59b966a6d5e042b79fba6d9e1f659758" + "ParameterValue": "任务默认时薪", + "ID": "76e6b1beb86d4cffa86d99da1b1b8d56" } ], - "ID": "f97f13ff-6a13-4208-b983-5766f336b3a9" + "ID": "4fa65951-a296-4051-9a8b-32358ea17112" }, { "Condition": { @@ -529,18 +529,18 @@ "ParameterName": "计算时薪", "ParameterValue": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务成员.岗位默认时薪" + "SerializeProperty": "=任务成员.任务岗位时薪" }, - "ID": "9cae0ca147fd4f36bf12d59e368f2c57" + "ID": "196d48e7e7104eb89b1b40a31d20d3d9" }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", "ParameterName": "时薪计算来源", "ParameterValue": "任务岗位时薪", - "ID": "05df8d3ef9fa454b8ec03882ddda515f" + "ID": "14e4ee83f2994475987fffe9fb3f8315" } ], - "ID": "1740b6da-689c-450d-a44f-7805ff8786c0" + "ID": "d0469d09-b007-490c-b22e-1dc9ed953d0d" }, { "Condition": { @@ -580,16 +580,16 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=项目成员.项目成员时薪" }, - "ID": "8cf0a96476814aa489e3e46860a6e39d" + "ID": "76cd36c904b74af7b79a09aded9e6834" }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", "ParameterName": "时薪计算来源", "ParameterValue": "项目成员时薪", - "ID": "25ff3a82fd57430b94e16b296b77c513" + "ID": "6c7b7dc64b644d0cadaa3e58ae25fb27" } ], - "ID": "3f0b1e5c-c269-479e-9110-d339ded64bfb" + "ID": "9b6f052d-57be-459a-9cfe-6024f3804c31" }, { "Condition": { @@ -629,16 +629,16 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=项目成员.项目岗位时薪" }, - "ID": "7656d9a836d942e092139516a992880e" + "ID": "51752bfde1d24e229b44fe75bc41264a" }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", "ParameterName": "时薪计算来源", "ParameterValue": "项目岗位时薪", - "ID": "22bb1104b90b4467b078e638f3f4aa51" + "ID": "3ea9bb1ee1c34288bc51654ef1abf496" } ], - "ID": "04dad84c-4448-4917-87ec-3b3025a571b4" + "ID": "36341f45-c565-45b2-8eea-7425d38cb4c1" }, { "CommandList": [ @@ -649,22 +649,22 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=任务成员.参与人默认时薪" }, - "ID": "b5dd3212338449fc8f5aed3c3b6b3993" + "ID": "1ae2836c5830462a84c4aacaa677c0ee" }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", "ParameterName": "时薪计算来源", "ParameterValue": "用户默认时薪", - "ID": "fd64e93a07ae4ca2820422202ad6e7a4" + "ID": "2aef2dc2638a4d93b234647dbb3708be" } ], - "ID": "cb9be520-40ba-453a-87c7-fea9b6daa2b9" + "ID": "cb216769-5e98-4130-a383-5630ee8b5756" } ] } ], "Comments": "优先使用手动指定的提成金额", - "ID": "8055487d-ee54-41a6-8011-5f2fa2eef00f" + "ID": "c2cdacc3-0614-4a16-a0eb-d486d11a01d4" }, { "CommandList": [ @@ -675,29 +675,20 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=指定时薪单价" }, - "ID": "ca05817f6d1e4396b90dbdf80186e656" + "ID": "0cf4fd422ad24dab99b51a2dd7f131d9" }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", "ParameterName": "时薪计算来源", "ParameterValue": "特殊指定", - "ID": "3045dcff1e074a13b95874e71352f376" + "ID": "c4fead524128456483f3f5a034ef3aac" } ], - "ID": "1d7788e7-96c2-4eb4-b356-46c2d434b5ba" + "ID": "fb135ab1-2aac-43f2-9282-f34f0a34dc21" } ], "Comments": "计算成员的时薪" }, - { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "预测本次产生成本", - "ParameterValue": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目统计信息.总成本+(计算时薪*工时数*任务信息.提成系数)" - }, - "ID": "289edaf29203403ea65bf88c15bca148" - }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", "ConditionAndCommandPairList": [ @@ -832,13 +823,13 @@ } ], "Comments": "先检查个人工时余额够不够，如果不够，直接提成为0", - "ID": "cda125ef-9140-41c4-9aad-8cbbe3bb3d52" + "ID": "ab6e8070-011c-46cf-b195-7596fcf2998d" } ] } ], "Comments": "如果分配到人头，则判断该人总计划工时还够不够", - "ID": "fb1fa452-d1d8-4a9b-8c61-14239af27f14" + "ID": "096dcda9-2b0e-4306-98f9-ed7c1aee6088" }, { "Condition": { @@ -938,13 +929,13 @@ } ], "Comments": "先检查个人工时余额够不够，如果不够，直接提成为0", - "ID": "7a102b49-db98-4156-a744-4e4aea8b971f" + "ID": "d922d6c5-7e61-422c-a1e5-4b254fc30707" } ] } ], "Comments": "如果是共用任务工时，则查看任务计划工时够不够", - "ID": "ca4d8224-7882-4e2d-b645-084f5949030b" + "ID": "81b3873d-5aab-4656-a210-27103bc25954" } ] }, @@ -986,9 +977,18 @@ }, "TopCount": "1" }, - "ID": "7cde1a8047784dc9baf46af0faf267e4", + "ID": "b7abf874642d441799e38adc4a83c517", "Comments": "从视图统计项目的信息" }, + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "预测本次产生成本", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目统计信息.总成本+(计算时薪*工时数*任务信息.提成系数)" + }, + "ID": "cff80ff8e246491abd5d9bfe2b4cb20f" + }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", "ConditionAndCommandPairList": [ @@ -1015,13 +1015,13 @@ "Message": "该项目预算费用不足，为确保项目成本可控，请联系项目经理增加项目预算后再提交。" } ], - "ID": "e6771403-a545-43b0-8ccd-5227dc0a8ed4" + "ID": "449853d5-df3d-47c8-bd5d-4d5576ea30b8" } ] } ], "Comments": "如果提交的工时类型等于项目工时的核定方式且开启严格模式就校验本次有没有超标", - "ID": "a0ccf6a2-fd8c-4eed-83c2-0814e7e576c9" + "ID": "80f2fd34-243c-4dad-8ba8-3c2501911440" } ] }, @@ -1032,7 +1032,7 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=核定工时" }, - "ID": "fe5f3d119ffd464f899933b9abacf133" + "ID": "44bf01bc4c6e4d15a68aa01810cc3a27" }, { "$type": "Forguncy.Model.ServerTransactionCommand, ServerDesignerCommon", @@ -1132,7 +1132,7 @@ ] } }, - "ID": "fd2415ab5b7e452b9424170a55e03291" + "ID": "1742b464cefc45548e4051a84a1b4d26" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -1164,7 +1164,7 @@ "ID": "0a6bb6880fa44256b05d2356d87df007" } ], - "ID": "38fadbd8-525f-479d-87f1-ac9251ecbe73" + "ID": "a205ba40-f3e8-40e3-84ee-69fadd53b39b" }, { "CommandList": [ @@ -1178,7 +1178,7 @@ "ID": "d298d7ee2bed4e108a7671a1a6475966" } ], - "ID": "22c3fe61-6e49-4ee9-a3a0-c2658a02e818" + "ID": "21e85c17-929e-4c55-b312-e208965027b6" } ] }, @@ -1226,7 +1226,7 @@ } ], "Comments": "如果是按天分配，则需要检测这一天的实际工时是否超出，", - "ID": "b47b01f0-e619-473e-a308-ebc89c646d61" + "ID": "3a1f2c61-8a35-4394-adbe-7502a81a8999" }, { "CommandList": [ @@ -1240,7 +1240,7 @@ "ID": "b54545f6b13d4b8697add0630e495a6b" } ], - "ID": "75b1e386-6f2b-4d2a-b346-9f11068c3b65" + "ID": "4bc8ac5e-efae-48b2-8768-fdab0f34ef8f" } ] }, @@ -1380,7 +1380,7 @@ "ID": "5d5c7f7462d24dc2aac507bf580830d5" } ], - "ID": "3fa002ee-b670-475a-8ebd-93dfe6a57d62" + "ID": "2518bb0b-a019-448d-8a4c-a0d160317347" }, { "CommandList": [ @@ -1393,7 +1393,7 @@ } } ], - "ID": "c7de13f5-8062-4b8a-9f80-b437fce05752" + "ID": "eed828f6-8f26-4a77-8e83-eb71586e1d44" } ] } @@ -1445,7 +1445,7 @@ "Message": "报工成功" } ], - "ID": "0f0cb243-0a2c-4fd1-ab16-53c11c164436" + "ID": "d1fdad64-b486-47b5-82fb-f02a215bbccb" }, { "CommandList": [ @@ -1458,12 +1458,12 @@ } } ], - "ID": "6acae6ce-82b5-4169-bd37-97831bbf7181" + "ID": "4d25467c-a496-40ef-b621-fbb6586924bb" } ] } ], - "ID": "232e4735-fad5-4b76-b661-ecf88e53d42f" + "ID": "e7271fbf-3edb-4ebe-b4df-40c63c757ee5" }, { "CommandList": [ @@ -1473,7 +1473,7 @@ "Message": "成员不在任务内，无法报工！" } ], - "ID": "b508359d-9347-4850-b447-d561bcf08eec" + "ID": "8ac54198-db2f-4d23-a42c-ed7d9435c2ef" } ] } diff --git a/ServerCommands/工时/分配任务工时.json b/ServerCommands/工时/分配任务工时.json index c55ed2ec..ff02577c 100644 --- a/ServerCommands/工时/分配任务工时.json +++ b/ServerCommands/工时/分配任务工时.json @@ -70,67 +70,239 @@ "CommandList": [ { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "任务成员", + "ParameterName": "任务信息", "TableValue": { - "TableName": "任务成员表", + "TableName": "任务表", "TableValueType": 1, "BindingInfos": [ { "BindingInfo": { - "TableName": "任务成员表", - "ColumnName": "参与人", - "GUID": "20d5971e-0ac3-4236-9e5f-0e67e2034b35" + "TableName": "任务表", + "ColumnName": "项目ID", + "GUID": "1b1dfe53-8569-419b-9ac7-4bb4e54e5cb3" }, - "ColumnName": "参与人" + "ColumnName": "项目ID" }, { "BindingInfo": { - "TableName": "任务成员表", - "ColumnName": "参与人", - "GUID": "b0fb9e47-ca43-45d0-bb54-cf7ac8edce15", - "AttachType": { - "$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess", - "UserColumnAttachType": 5, - "AttachTypeTag": "负荷" - } + "TableName": "任务表", + "ColumnName": "任务名称", + "GUID": "2f0ff2cf-b0cf-49ba-99c2-9b8636152c54" }, - "ColumnName": "参与人负荷" + "ColumnName": "任务名称" }, { "BindingInfo": { - "TableName": "任务成员表", - "ColumnName": "任务时薪", - "GUID": "93b2f1d8-fd53-468a-9211-87f51b6a5494" + "TableName": "任务表", + "ColumnName": "任务预算工时", + "GUID": "503e9dd2-fc8c-4426-a37f-c7d582c9577a" }, - "ColumnName": "任务成员时薪" + "ColumnName": "任务预算工时" }, { "BindingInfo": { - "TableName": "任务成员表", - "ColumnName": "岗位ID", - "GUID": "299a3d18-2733-483d-bcd6-09e057c343ef", + "TableName": "任务表", + "ColumnName": "任务状态", + "GUID": "93ff9848-29c1-4cf6-a3cd-d33eb1d033c4" + }, + "ColumnName": "任务状态" + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "任务状态", + "GUID": "da675aa2-3619-422b-817f-eed8c7c118c7", "RelationBinding": { - "RelatedTable": "项目岗位", - "RelatedColumn": "ID", - "DisplayColumn": "默认时薪" + "RelatedTable": "任务状态", + "RelatedColumn": "状态码", + "DisplayColumn": "任务状态" } }, - "ColumnName": "任务岗位时薪" + "ColumnName": "任务状态文本" }, { "BindingInfo": { - "TableName": "任务成员表", - "ColumnName": "参与人", - "GUID": "599afbfc-245b-40b1-b078-adb9ca71abef", - "AttachType": { - "$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess", - "UserColumnAttachType": 5, - "AttachTypeTag": "默认时薪" + "TableName": "任务表", + "ColumnName": "项目ID", + "GUID": "038a41fb-93fa-46f8-b259-87eb94cc28ad", + "RelationBinding": { + "RelatedTable": "项目表", + "RelatedColumn": "ID", + "DisplayColumn": "严格模式" } }, - "ColumnName": "参与人默认时薪" + "ColumnName": "严格模式" + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "项目ID", + "GUID": "f4212e88-f2aa-4d8f-8ba8-b7c518505bb7", + "RelationBinding": { + "RelatedTable": "项目表", + "RelatedColumn": "ID", + "DisplayColumn": "项目预算工时" + } + }, + "ColumnName": "项目预算工时" + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "项目ID", + "GUID": "31040160-fc88-459c-b67b-8621acbc0920", + "RelationBinding": { + "RelatedTable": "项目表", + "RelatedColumn": "ID", + "DisplayColumn": "项目预算费用" + } + }, + "ColumnName": "项目预算费用" + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "任务类型", + "GUID": "f6fb60c7-0ba6-450b-9cda-28eb2412e296", + "RelationBinding": { + "RelatedTable": "任务类型", + "RelatedColumn": "ID", + "DisplayColumn": "提成系数" + } + }, + "ColumnName": "提成系数" + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "项目ID", + "GUID": "b5020b4b-8e2e-4b31-a2ac-53ca31b14b8e", + "RelationBinding": { + "RelatedTable": "项目表", + "RelatedColumn": "ID", + "DisplayColumn": "工时分配方式" + } + }, + "ColumnName": "工时分配方式" + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "开始时间", + "GUID": "0c228fe1-2060-41dc-b283-9e6de6475ddd" + }, + "ColumnName": "开始时间" + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "执行者", + "GUID": "040c1732-e12c-49b9-8709-0d72a08f5a14" + }, + "ColumnName": "执行者" + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "总计划工时", + "GUID": "4bdf7858-40b1-495e-be0d-109aaaf4f69f" + }, + "ColumnName": "总计划工时" + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "总实际工时", + "GUID": "8505a216-3aee-4056-affe-6c760e35c844" + }, + "ColumnName": "总实际工时" } ], + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务表", + "ColumnName": "ID", + "GUID": "6ffb7caa-1cd8-4373-b2bf-8a03556c1866" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务ID" + } + }, + "NullFormulaValueQueryPolicy": 0, + "TopCount": "1" + }, + "ID": "08ba0d305755433f81f15b918daac21f" + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=工时数" + } + }, + "value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务信息.任务预算工时" + }, + "compareType": 2, + "LeftBracket": 1 + }, + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=工时数" + } + }, + "value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务信息.任务预算工时-任务信息.总计划工时" + }, + "compareType": 2, + "RightBracket": 1 + } + ], + "RelationType": 1 + }, + "CommandList": [ + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "400", + "Message": "您提交的工时超过任务预算工时，请修改后重新提交" + } + ], + "ID": "f53e4e9d-f702-43f4-a8c9-0d02094f1872" + } + ] + }, + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "提成系数", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务信息.提成系数" + }, + "ID": "70b06ec88b114688b792107dc2485ad5" + }, + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "任务成员是否存在", + "TableValue": { + "TableName": "任务成员表", + "TableValueType": 3, "SqlCondition": { "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", "SubConditions": [ @@ -139,7 +311,7 @@ "ColumnBindingInfo": { "TableName": "任务成员表", "ColumnName": "任务ID", - "GUID": "7d139430-ab2a-40df-98d0-38bc039435e2" + "GUID": "4bd42e77-fc2b-4668-a448-40b311b80e17" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -151,7 +323,7 @@ "ColumnBindingInfo": { "TableName": "任务成员表", "ColumnName": "参与人", - "GUID": "2b46a973-8db3-40e7-b10b-93ddb666b812" + "GUID": "91f4891f-c0ad-41ea-ac71-4d94b0547050" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -160,73 +332,9 @@ } ] }, - "NullFormulaValueQueryPolicy": 0, - "TopCount": "1" + "NullFormulaValueQueryPolicy": 0 }, - "ID": "fe64dadb1be3428ab4f183f0b503042b" - }, - { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "项目成员", - "TableValue": { - "TableName": "项目成员表", - "TableValueType": 1, - "BindingInfos": [ - { - "BindingInfo": { - "TableName": "项目成员表", - "ColumnName": "岗位ID", - "GUID": "e72fecb8-c4b6-4ef0-a802-f18cb6d6ba24", - "RelationBinding": { - "RelatedTable": "项目岗位", - "RelatedColumn": "ID", - "DisplayColumn": "默认时薪" - } - }, - "ColumnName": "项目岗位时薪" - }, - { - "BindingInfo": { - "TableName": "项目成员表", - "ColumnName": "默认时薪", - "GUID": "90991267-4d34-4537-8be3-0ef990118f3e" - }, - "ColumnName": "项目成员时薪" - } - ], - "SqlCondition": { - "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", - "SubConditions": [ - { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "项目成员表", - "ColumnName": "项目ID", - "GUID": "25c7933c-8b27-4163-ad03-a22d7efe88fb" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务信息.项目ID" - } - }, - { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "项目成员表", - "ColumnName": "项目成员", - "GUID": "02b01205-9bbb-4e4f-8534-f52ea963c907" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=执行人" - } - } - ] - }, - "NullFormulaValueQueryPolicy": 0, - "TopCount": "1" - }, - "ID": "fdf9d30dd83044e5b9505d5554d2f6b8" + "ID": "bdb15a15165944ae91c5fad82af71a85" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -238,181 +346,347 @@ "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", "ParamObject": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务成员" + "SerializeProperty": "=任务成员是否存在" } }, - "value": "%Null%", - "compareType": 1 + "value": "0" }, "CommandList": [ { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "任务信息", + "ParameterName": "执行人信息", "TableValue": { - "TableName": "任务表", + "TableName": "用户信息视图", "TableValueType": 1, "BindingInfos": [ { "BindingInfo": { - "TableName": "任务表", - "ColumnName": "项目ID", - "GUID": "1b1dfe53-8569-419b-9ac7-4bb4e54e5cb3" + "TableName": "用户信息视图", + "ColumnName": "用户名", + "GUID": "271e5853-9cda-4463-8dfe-1b33bfd8fda6" }, - "ColumnName": "项目ID" + "ColumnName": "参与人" }, { "BindingInfo": { - "TableName": "任务表", - "ColumnName": "任务名称", - "GUID": "2f0ff2cf-b0cf-49ba-99c2-9b8636152c54" + "TableName": "用户信息视图", + "ColumnName": "负荷", + "GUID": "10a057b7-21fb-43d0-acb6-9008a1f5a5a1" }, - "ColumnName": "任务名称" + "ColumnName": "参与人负荷" }, { "BindingInfo": { - "TableName": "任务表", - "ColumnName": "任务预算工时", - "GUID": "503e9dd2-fc8c-4426-a37f-c7d582c9577a" + "TableName": "用户信息视图", + "ColumnName": "默认时薪", + "GUID": "87ade2d3-6636-4deb-8f42-aec6edd9fb99" }, - "ColumnName": "任务预算工时" - }, - { - "BindingInfo": { - "TableName": "任务表", - "ColumnName": "任务状态", - "GUID": "93ff9848-29c1-4cf6-a3cd-d33eb1d033c4" - }, - "ColumnName": "任务状态" - }, - { - "BindingInfo": { - "TableName": "任务表", - "ColumnName": "任务状态", - "GUID": "da675aa2-3619-422b-817f-eed8c7c118c7", - "RelationBinding": { - "RelatedTable": "任务状态", - "RelatedColumn": "状态码", - "DisplayColumn": "任务状态" - } - }, - "ColumnName": "任务状态文本" - }, - { - "BindingInfo": { - "TableName": "任务表", - "ColumnName": "项目ID", - "GUID": "038a41fb-93fa-46f8-b259-87eb94cc28ad", - "RelationBinding": { - "RelatedTable": "项目表", - "RelatedColumn": "ID", - "DisplayColumn": "严格模式" - } - }, - "ColumnName": "严格模式" - }, - { - "BindingInfo": { - "TableName": "任务表", - "ColumnName": "项目ID", - "GUID": "f4212e88-f2aa-4d8f-8ba8-b7c518505bb7", - "RelationBinding": { - "RelatedTable": "项目表", - "RelatedColumn": "ID", - "DisplayColumn": "项目预算工时" - } - }, - "ColumnName": "项目预算工时" - }, - { - "BindingInfo": { - "TableName": "任务表", - "ColumnName": "项目ID", - "GUID": "31040160-fc88-459c-b67b-8621acbc0920", - "RelationBinding": { - "RelatedTable": "项目表", - "RelatedColumn": "ID", - "DisplayColumn": "项目预算费用" - } - }, - "ColumnName": "项目预算费用" - }, - { - "BindingInfo": { - "TableName": "任务表", - "ColumnName": "任务类型", - "GUID": "f6fb60c7-0ba6-450b-9cda-28eb2412e296", - "RelationBinding": { - "RelatedTable": "任务类型", - "RelatedColumn": "ID", - "DisplayColumn": "提成系数" - } - }, - "ColumnName": "提成系数" - }, - { - "BindingInfo": { - "TableName": "任务表", - "ColumnName": "总计划工时", - "GUID": "4bdf7858-40b1-495e-be0d-109aaaf4f69f" - }, - "ColumnName": "总计划工时" - }, - { - "BindingInfo": { - "TableName": "任务表", - "ColumnName": "总实际工时", - "GUID": "8505a216-3aee-4056-affe-6c760e35c844" - }, - "ColumnName": "总实际工时" - }, - { - "BindingInfo": { - "TableName": "任务表", - "ColumnName": "项目ID", - "GUID": "b5020b4b-8e2e-4b31-a2ac-53ca31b14b8e", - "RelationBinding": { - "RelatedTable": "项目表", - "RelatedColumn": "ID", - "DisplayColumn": "工时分配方式" - } - }, - "ColumnName": "工时分配方式" - }, - { - "BindingInfo": { - "TableName": "任务表", - "ColumnName": "开始时间", - "GUID": "0c228fe1-2060-41dc-b283-9e6de6475ddd" - }, - "ColumnName": "开始时间" + "ColumnName": "参与人默认时薪" } ], "SqlCondition": { "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", "ColumnBindingInfo": { - "TableName": "任务表", - "ColumnName": "ID", - "GUID": "6ffb7caa-1cd8-4373-b2bf-8a03556c1866" + "TableName": "用户信息视图", + "ColumnName": "用户名", + "GUID": "0d2da097-d311-474b-a06e-427cbbc8c190" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=执行人" + } + }, + "TopCount": "1" + }, + "ID": "4669a5d364ff47ec94f28a346c90e943" + }, + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "任务成员表", + "UpdateType": "add", + "ShowConfirm": false, + "UpdateBindingValues": [ + { + "BindingInfo": { + "TableName": "任务成员表", + "ColumnName": "项目ID", + "GUID": "90d7e552-fd40-4025-b508-93f851bc74c8" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务信息.项目ID" + } + }, + { + "BindingInfo": { + "TableName": "任务成员表", + "ColumnName": "任务ID", + "GUID": "e7cde8d9-032b-4ce2-8397-f789dc115560" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=任务ID" } }, + { + "BindingInfo": { + "TableName": "任务成员表", + "ColumnName": "参与人", + "GUID": "29985641-80fd-40ba-8af4-a361ea6450f3" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=执行人信息.参与人" + } + }, + { + "BindingInfo": { + "TableName": "任务成员表", + "ColumnName": "岗位ID", + "GUID": "03bf486a-57ad-4493-a62b-abe821a88733" + } + }, + { + "BindingInfo": { + "TableName": "任务成员表", + "ColumnName": "任务时薪", + "GUID": "ad5ca547-de28-4fc3-9009-d3fd5e9b4142" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=执行人信息.参与人默认时薪" + } + } + ], + "ParamNameToSaveNewRowValue": "任务成员" + }, + { + "$type": "CollectionOperationKit.ServerSideObjectOp, CollectionOperationKit", + "OperationParamaterPairs": [ + { + "Name": "参与人", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=执行人信息.参与人" + } + }, + { + "Name": "参与人负荷", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=执行人信息.参与人负荷" + } + }, + { + "Name": "任务成员时薪", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=执行人信息.参与人默认时薪" + } + }, + { + "Name": "任务岗位时薪", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=执行人信息.参与人默认时薪" + } + }, + { + "Name": "参与人默认时薪", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=执行人信息.参与人默认时薪" + } + } + ], + "OutParamaterName": "任务成员" + } + ], + "ID": "85b2f553-8edb-4051-9060-9c0a7eae4ce1" + }, + { + "CommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "任务成员表", + "TableValue": { + "TableName": "任务成员表", + "TableValueType": 1, + "BindingInfos": [ + { + "BindingInfo": { + "TableName": "任务成员表", + "ColumnName": "参与人", + "GUID": "086ca838-1a33-4427-9d4d-a605d3d29e81" + }, + "ColumnName": "参与人" + }, + { + "BindingInfo": { + "TableName": "任务成员表", + "ColumnName": "参与人", + "GUID": "928c7bbd-6b5c-46fa-8107-abeb1ef0a11f", + "AttachType": { + "$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess", + "UserColumnAttachType": 5, + "AttachTypeTag": "负荷" + } + }, + "ColumnName": "参与人负荷" + }, + { + "BindingInfo": { + "TableName": "任务成员表", + "ColumnName": "任务时薪", + "GUID": "f61f3131-17dc-46da-b1d3-2b847228e37d" + }, + "ColumnName": "任务成员时薪" + }, + { + "BindingInfo": { + "TableName": "任务成员表", + "ColumnName": "岗位ID", + "GUID": "7e4263a8-bf69-42e3-8966-bc3153c5f366", + "RelationBinding": { + "RelatedTable": "项目岗位", + "RelatedColumn": "ID", + "DisplayColumn": "默认时薪" + } + }, + "ColumnName": "任务岗位时薪" + }, + { + "BindingInfo": { + "TableName": "任务成员表", + "ColumnName": "参与人", + "GUID": "71760b60-0bec-4476-9413-120ecdfc13ff", + "AttachType": { + "$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess", + "UserColumnAttachType": 5, + "AttachTypeTag": "默认时薪" + } + }, + "ColumnName": "参与人默认时薪" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务成员表", + "ColumnName": "任务ID", + "GUID": "19c7b08f-02c9-48b6-a0af-474b6ee196e9" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务ID" + } + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务成员表", + "ColumnName": "参与人", + "GUID": "a5ec9ca9-fbcd-406f-90cb-0d63f2654ac1" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=执行人" + } + } + ] + }, "NullFormulaValueQueryPolicy": 0, "TopCount": "1" }, - "ID": "f2984c5c9e9a4a10bee27af288725464" + "ID": "de1c83d81ab545db8f42eeead4c14fa7" }, { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "提成系数", - "ParameterValue": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务信息.提成系数" + "$type": "CollectionOperationKit.ServerSideObjectOp, CollectionOperationKit", + "OperationParamaterPairs": [ + { + "Name": "参与人", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务成员表.参与人" + } + }, + { + "Name": "参与人负荷", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务成员表.参与人负荷" + } + }, + { + "Name": "任务成员时薪", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务成员表.任务成员时薪" + } + }, + { + "Name": "任务岗位时薪", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务成员表.任务岗位时薪" + } + }, + { + "Name": "参与人默认时薪", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务成员表.参与人默认时薪" + } + } + ], + "OutParamaterName": "任务成员" + } + ], + "ID": "3931e6aa-048d-470a-96dc-f0b0cc46f6ef" + } + ], + "Comments": "如果任务成员中没有，则自动加一个" + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务成员" + } + }, + "value": "%Null%", + "compareType": 1 }, - "ID": "197d3beb51834211a7661c4a22538a0c" - }, + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=执行人" + } + }, + "value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务信息.执行者" + } + } + ], + "RelationType": 1 + }, + "CommandList": [ { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", "ConditionAndCommandPairList": [ @@ -426,9 +700,73 @@ "SerializeProperty": "=任务信息.任务状态" } }, - "value": "1" + "value": "2", + "compareType": 4 }, "CommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "项目成员", + "TableValue": { + "TableName": "项目成员表", + "TableValueType": 1, + "BindingInfos": [ + { + "BindingInfo": { + "TableName": "项目成员表", + "ColumnName": "岗位ID", + "GUID": "e72fecb8-c4b6-4ef0-a802-f18cb6d6ba24", + "RelationBinding": { + "RelatedTable": "项目岗位", + "RelatedColumn": "ID", + "DisplayColumn": "默认时薪" + } + }, + "ColumnName": "项目岗位时薪" + }, + { + "BindingInfo": { + "TableName": "项目成员表", + "ColumnName": "默认时薪", + "GUID": "90991267-4d34-4537-8be3-0ef990118f3e" + }, + "ColumnName": "项目成员时薪" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "项目成员表", + "ColumnName": "项目ID", + "GUID": "25c7933c-8b27-4163-ad03-a22d7efe88fb" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务信息.项目ID" + } + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "项目成员表", + "ColumnName": "项目成员", + "GUID": "02b01205-9bbb-4e4f-8534-f52ea963c907" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=执行人" + } + } + ] + }, + "NullFormulaValueQueryPolicy": 0, + "TopCount": "1" + }, + "ID": "f30d14e09500487587c23927734f561f" + }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", "ConditionAndCommandPairList": [ @@ -464,7 +802,7 @@ "ID": "b1431565396c4a7abf8f011059c54aa3" } ], - "ID": "6d5e7ebc-44a3-4f24-a210-56a281f66e28" + "ID": "0a7dff8a-7999-452b-b429-9b3cb6a092c0" }, { "Condition": { @@ -495,10 +833,10 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=结束日期" }, - "ID": "767cf02261d74aff90a14395ab8f3a46" + "ID": "727f49edcb914303adf91ed9a40e4355" } ], - "ID": "bd9bfb69-c2d8-4f39-b2d2-f893f40b1dd7" + "ID": "66cf34f4-5281-44ac-b3ee-3be786b49578" } ], "Comments": "如果是按人分配，则把计划工时分到一天中" @@ -510,7 +848,7 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=工时数" }, - "ID": "1c01ddd54c884bee8542a5c24cd642aa" + "ID": "ebcf3170eb6840a0a5f23dd5ba149707" }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", @@ -519,7 +857,7 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=DATEDIF(开始日期,结束日期,\"d\")+1" }, - "ID": "6ff7f866d9084a39bc4887782929a0f6" + "ID": "7fc94125c0ab4f739daa205140fbb359" }, { "$type": "Forguncy.Model.ServerTransactionCommand, ServerDesignerCommon", @@ -543,7 +881,7 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=开始日期+(index-1)" }, - "ID": "113f3feeed2644ea9d71bb4251b369dc" + "ID": "c5f81b4998d3441eb85053dc19f88f36" }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", @@ -595,16 +933,13 @@ "ColumnName": "工时类型", "GUID": "6fae6e04-e2b8-4d6c-b594-3bd02c5883d2" }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=工时类型" - } + "Value": "计划" } ] }, "NullFormulaValueQueryPolicy": 0 }, - "ID": "e5920fb80ee54a229a1b3557570b5197" + "ID": "e1b0a3ae53a34d0387e4da8960df35ec" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -633,10 +968,10 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=ROUNDUP(工时数/分配天数,1)" }, - "ID": "1bb37c7f9198484282278058543826f5" + "ID": "87a778c4199b49c5b3d181a13ea8c0bd" } ], - "ID": "bd7cb077-6261-463c-8535-f1db196652ff" + "ID": "ae725486-6105-4f74-b062-c8c676b9d522" }, { "CommandList": [ @@ -647,10 +982,10 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=ROUNDUP(待分配工时,1)" }, - "ID": "2169bebf8c1f4daf9d6d6943491d4ca1" + "ID": "e12dd8844f9f4222b36011f52a60ef4d" } ], - "ID": "2f81afb0-39cc-4abb-9471-b75db5eed1ce" + "ID": "c7664382-186e-4332-9307-3e363c7b4f6d" } ] }, @@ -670,7 +1005,7 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=IF(OR(任务成员.参与人负荷=\"\",任务成员.参与人负荷=0,任务成员.参与人负荷>24),24,任务成员.参与人负荷)" }, - "ID": "05e5b7aa03ed47b4bffe4bf389e1e50f" + "ID": "9fdca512f1f54406973300b65e7f2ac8" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -688,8 +1023,7 @@ "SerializeProperty": "=任务信息.工时分配方式" } }, - "value": "1", - "compareType": 1 + "value": "1" }, { "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", @@ -706,7 +1040,8 @@ }, "compareType": 5 } - ] + ], + "RelationType": 1 }, "CommandList": [ { @@ -716,7 +1051,7 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=ROUNDUP(待分配工时-计算本次分配工时,1)" }, - "ID": "062bbee6354d48f2b9c0d05785441eae" + "ID": "c4ce66d71050448cb7da553f7668fcca" }, { "$type": "Forguncy.Model.ServerTransactionCommand, ServerDesignerCommon", @@ -731,7 +1066,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "项目ID", - "GUID": "39948eb0-326f-4f19-835f-5244d1f29a4f" + "GUID": "a87ad8ce-a21c-46e9-a653-24c2f3328382" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -742,7 +1077,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "任务ID", - "GUID": "c8cdad4c-6a42-4f4c-91ea-c51cb564403f" + "GUID": "fe93f190-64cc-4082-8535-432521ea1dac" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -753,7 +1088,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "工时日期", - "GUID": "88da28f6-08bc-4dc6-ba52-6266f24589e5" + "GUID": "772d02d0-25a3-49a4-8ec2-9006ffe564a6" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -764,7 +1099,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "工时类型", - "GUID": "78a7cb7e-d1d7-4c76-b141-7a58aaf1348a" + "GUID": "c392599a-a1ca-4059-b220-0cdd75a69e0a" }, "Value": "计划" }, @@ -772,7 +1107,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "执行人", - "GUID": "7208425d-8e4f-4d21-bddf-9b85aa632882" + "GUID": "4618771e-2637-41b0-a12b-936473790464" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -783,7 +1118,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "执行内容", - "GUID": "b90d47f5-5645-42ad-ab32-cd6d267598a3" + "GUID": "333ef3be-c28b-4db4-b23c-d1dc18f72262" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -794,7 +1129,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "工时", - "GUID": "c901e3f9-f6ff-4115-a87d-6b705388a736" + "GUID": "139f3d93-08a6-4071-9485-3cd581194761" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -805,7 +1140,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "时薪单价", - "GUID": "6f83c647-8a39-4a69-bd15-fb2ee7abc201" + "GUID": "4dd806d9-d343-490e-9665-819bc8bcc825" }, "Value": "0" }, @@ -813,7 +1148,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "提成系数", - "GUID": "6c29ade7-14bd-448f-9eb8-4bb9826a6b44" + "GUID": "f9354daa-b940-4ae1-b140-912e972240b1" }, "Value": "0" }, @@ -821,7 +1156,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "时薪来源", - "GUID": "2abfa4de-4f49-4be7-a6fd-3efc4e1ca55c" + "GUID": "d03ccd10-55a9-4dff-875b-9c90a0663efa" } } ] @@ -836,7 +1171,7 @@ "BindingInfo": { "TableName": "项目动态", "ColumnName": "项目ID", - "GUID": "97b1d3aa-0af8-4b47-9ef4-b128d5de0604" + "GUID": "bd4358a0-3b38-45f1-ac32-11a020b9e0e7" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -847,18 +1182,18 @@ "BindingInfo": { "TableName": "项目动态", "ColumnName": "项目动态", - "GUID": "130c339e-cc6d-4062-a9a8-dc2e387552b4" + "GUID": "244864a3-fa45-4c38-a25c-530cda4b0dc5" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=\"任务[\"&任务信息.任务名称&\"]增加\"&工时类型&\"工时\"&工时数&\"小时\"" + "SerializeProperty": "=\"任务[\"&任务信息.任务名称&\"]增加计划工时\"&工时数&\"小时\"" } }, { "BindingInfo": { "TableName": "项目动态", "ColumnName": "执行人", - "GUID": "89e68f3f-8ffd-4a32-b934-be3de60a9a4c" + "GUID": "39d5f22f-5984-4107-85e0-b6e9e1b2320e" }, "Value": "%CurrentUser%" } @@ -868,7 +1203,7 @@ } ], "Comments": "如果不是按人分配，且分配后的工时超过负荷，则报错", - "ID": "a2f9b612-4318-4e5f-9064-e806fbdd7a56" + "ID": "617f38d4-b53e-4063-8276-779076b2467c" }, { "CommandList": [ @@ -881,7 +1216,7 @@ } } ], - "ID": "a252c2c6-212f-4a39-a6f5-c887d2c40415" + "ID": "7186e5a0-619f-4b3b-a871-dcd8848f274d" } ] } @@ -895,7 +1230,7 @@ "Message": "分配计划工时成功" } ], - "ID": "7302940f-8046-46a5-96b2-d39f63672f22" + "ID": "71bc9425-f434-4241-8d84-620011126144" }, { "CommandList": [ @@ -908,12 +1243,12 @@ } } ], - "ID": "ae535e01-499d-4eae-acae-37a71809c9bc" + "ID": "61369ab2-4db7-4c13-a1fd-8457d16bf5c6" } ] } ], - "ID": "c664665d-727f-44c4-b169-d07ffee1c42c" + "ID": "ce9e0fce-443f-4fce-ab14-cc9449f86f26" }, { "CommandList": [ @@ -923,7 +1258,7 @@ "Message": "成员不在任务内，无法报工！" } ], - "ID": "8cdec499-9aa2-47ab-a40e-99d69b8070c0" + "ID": "16150f10-7cc4-4118-8d02-6e72cf2aae41" } ] } diff --git a/ServerCommands/项目/新增或修改项目.json b/ServerCommands/项目/新增或修改项目.json index a9600eee..cdd86440 100644 --- a/ServerCommands/项目/新增或修改项目.json +++ b/ServerCommands/项目/新增或修改项目.json @@ -431,10 +431,10 @@ { "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", "ErrorCode": "0", - "Message": "项目创建成功，请等待审批" + "Message": "项目创建成功，正在审批，别忘了在菜单里设置项目岗位和薪资哦！" } ], - "ID": "49ed6c64-1112-47d2-bcbc-47e27f2ef524" + "ID": "d4db5b4e-16f1-44d8-b0ae-d59b3c1af93e" }, { "CommandList": [ @@ -444,12 +444,12 @@ "Message": "项目已创建，但未能发起审批，请手动发起审批流程！" } ], - "ID": "c4329203-86d0-438c-b468-1a26545ab624" + "ID": "62c77793-4ab7-46dc-bb67-4180c2327945" } ] } ], - "ID": "e9adf008-7e6a-4191-aebd-d67551dbb979" + "ID": "b21ee447-0431-455d-8ab2-bc13039d2728" }, { "CommandList": [ @@ -587,7 +587,7 @@ } } ], - "ID": "45f529a1-ae40-4c71-9edc-cf82461ed8a5" + "ID": "c36b29c9-9957-42df-9690-9f208641bdbd" }, { "Condition": { @@ -615,13 +615,13 @@ } } ], - "ID": "8930474c-90cf-4971-8a68-4a743aeaf87c" + "ID": "5426b27b-6ef9-4f1b-8da5-c19ae061359b" } ] } ], "Comments": "如果是更新项目，且改变了工时核定方式、严格模式，那么就要校验。超标就不允许切换", - "ID": "f4d5cf42-0963-4623-a925-9c7fedd76756" + "ID": "efd0d865-3277-431b-897a-1ff2245522bc" } ] }, @@ -822,7 +822,7 @@ ] } ], - "ID": "3d3a04f5-27d1-442d-8a17-2aca3bc633d5" + "ID": "2e094e9c-e390-4588-9a0e-c119915e5d64" } ] } diff --git a/Tables/任务/任务表.json b/Tables/任务/任务表.json index fea35435..2cd87626 100644 --- a/Tables/任务/任务表.json +++ b/Tables/任务/任务表.json @@ -178,7 +178,6 @@ "前置任务": 5, "参与人": 5, "参与人数": 5, - "参与人统计": 5, "备注": 5, "层级": 5, "工期": 5, @@ -197,7 +196,8 @@ "项目ID": 5, "功能名称": 5, "收集反馈": 5, - "功能描述": 5 + "功能描述": 5, + "参与人列表": 5 }, "subTableOperations": { "View_任务工时统计": 5, @@ -206,7 +206,8 @@ "任务表": 5, "任务进展": 5, "任务评论表": 5, - "需求反馈登记表": 5 + "需求反馈登记表": 5, + "汇报子表": 5 }, "dataFilter": { "$type": "Forguncy.RbacPermission.Core.Impl.Data.FieldFilter, Forguncy.RbacPermission.Core" @@ -233,7 +234,6 @@ "前置任务": 5, "参与人": 5, "参与人数": 5, - "参与人统计": 5, "备注": 5, "层级": 5, "工期": 5, @@ -252,7 +252,8 @@ "项目ID": 5, "功能名称": 5, "收集反馈": 5, - "功能描述": 5 + "功能描述": 5, + "参与人列表": 5 }, "subTableOperations": { "View_任务工时统计": 5, @@ -261,7 +262,8 @@ "任务表": 5, "任务进展": 5, "任务评论表": 5, - "需求反馈登记表": 5 + "需求反馈登记表": 5, + "汇报子表": 5 }, "dataFilter": { "$type": "Forguncy.RbacPermission.Core.Impl.Data.FieldFilter, Forguncy.RbacPermission.Core" @@ -288,7 +290,6 @@ "前置任务": 5, "参与人": 5, "参与人数": 5, - "参与人统计": 5, "备注": 5, "层级": 5, "工期": 5, @@ -307,7 +308,8 @@ "项目ID": 5, "功能名称": 5, "收集反馈": 5, - "功能描述": 5 + "功能描述": 5, + "参与人列表": 5 }, "subTableOperations": { "View_任务工时统计": 5, @@ -316,7 +318,8 @@ "任务表": 5, "任务进展": 5, "任务评论表": 5, - "需求反馈登记表": 5 + "需求反馈登记表": 5, + "汇报子表": 5 }, "dataFilter": { "$type": "Forguncy.RbacPermission.Core.Impl.Data.FieldFilter, Forguncy.RbacPermission.Core" @@ -538,12 +541,12 @@ "BindingInfo": { "TableName": "任务成员表", "ColumnName": "参与人", - "GUID": "4f582b43-e552-4d4a-b192-53f63cd2fb3a" + "GUID": "09882fda-2048-401f-a59f-4ed437a2a959" }, "AggregateFunction": 5, "DataColumnName": "参与人", "DetailTableName": "任务成员表", - "Name": "参与人统计", + "Name": "参与人列表", "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, { diff --git a/Tables/字典表/工时核定方式.json b/Tables/字典表/工时核定方式.json deleted file mode 100644 index 230673fa..00000000 --- a/Tables/字典表/工时核定方式.json +++ /dev/null @@ -1,54 +0,0 @@ -{ - "Name": "工时核定方式", - "Columns": [ - { - "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", - "Required": true, - "Unique": true, - "AutoIncrement": 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": "nvarchar", - "MaxLength": -1, - "Name": "核定方式", - "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" - }, - { - "$type": "Forguncy.SaveLoad.UserExtraBingingColumnSaveData, ServerDesignerCommon", - "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e", - "Name": "FGC_Creator" - }, - { - "$type": "Forguncy.SaveLoad.DateExtraBingingColumnSaveData, ServerDesignerCommon", - "ColumnType": "System.DateTime, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e", - "Name": "FGC_CreateDate" - }, - { - "$type": "Forguncy.SaveLoad.UserExtraBingingColumnSaveData, ServerDesignerCommon", - "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e", - "Name": "FGC_LastModifier" - }, - { - "$type": "Forguncy.SaveLoad.DateExtraBingingColumnSaveData, ServerDesignerCommon", - "ColumnType": "System.DateTime, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e", - "Name": "FGC_LastModifyDate" - } - ], - "ExternalDatabaseInfo": { - "DataBaseType": "6db454c0-531c-4395-9122-921a18942902", - "AllowModifySchema": true, - "ConnectionId": "业务表", - "SourceTableName": "工时核定方式", - "SourceTableSchema": "dbo" - }, - "PrimaryKey": [ - "ID" - ], - "Relations": [], - "Indexes": [] -} \ No newline at end of file diff --git a/UserServiceDB.sqlite3 b/UserServiceDB.sqlite3 index 59b9b4a4ea6e193e32f4cec124fdafd1b3ff4ff8..7c15752c67c4d6e685ee6098f8ed4c2314042e80 100644 GIT binary patch delta 1637 zcmb7ET}&KR6rM8!J7;J12h^hN_GinsS`AzNEN!F3-BM`5K#)QcL15W3g)QCg0)-k3 zX1hRJ*0w?#IcY@YL1R*?!L;$l2UGE{NtJZv$rwX?GBGhxU+_h%XJ$*4#x!x0d$af6 z`Of{$cfNBIGx>>`{0UEPu_Q_3JXU_ilLe(v{6XlHdrcefooVFhbPZ2qL7ujkjV!y* zEW1H0yJc5G@#zw&6LKZ!S2ugFYGp+}Invn|i~CO+;dn=v(eIBM(Xi3y@9&Pp{UFP52*5}JXn!F;f6ZNml*Rm9!wnXZTTy9V49r`YPjkd&*Cp5~P zm9LbRC=vL7;eF!cS$Y2!B?o>XH7&Pjj^E+Dr`?BR8)&``ee~;obe@?`%RCewSv<0N z*u->NHDVj=UrM?Zko0*RR?D*&vo0!ma7hZd-gVY#2QF^T$ybtx%IQJ{`YE(1JLy&n zBBd+vNptC?;Y$1z_J}|g4uPnz#yOkDDkkqGKuq9(k{k?DZYvgNBE4UWcG}&J4&e@> z53~_&r+P1rNy?2t=PIy}W&-FGvAwtv=*NAy-Av3ywaussrt=U?)nl7%OHgqGZp)G+ zc*p#=+e)97BKQQw4Rq671FomJI2O?PgXpBtb9f7CL{S624P-Ro4(k@W(u)qd-h(z; zm;^i3^rP2A+GyfC*-d}F!eYEJ32yo+j%`y-XwdQ@hMG#7S3U5bsC0zs{*ab)Xd%u- zR^f5K>glh*(O&Wn;luyBYNnP!?ZfwDV||h{fSXo@>?C_LmSwVG&5*iB!9gM3n>vSH z@nJJMz*11Kf&qYi;zA21fyUdgB!fy+-6;=oc}h(biB?>My_phnvUyhZtYgY)$KO2q zR!NgCOM1kfK)3D9Y`-!s>#ms7C0%AGwPopBVUpZo7T*=cB1HCH#PRsYlHX& zJWqcNa0gh?J~@rq^zd46pjY z%u#TT>wui&xGhs@_gTD6ffO&TR0dM4lcmn*DSS^!7PX6DiajDjR2=Wc2)`{Q-KwXz z6vv)5AH@eLT8(Q>>{+!SRNY@&6{Pq9Y@t96rYKQ?4*SurRY{m{4>3)hIEh_WGnBoG GH~$8{f(zsT delta 1384 zcmaJa* z^_=sZ)PyfJ;T!R|L6W2sEDH~E{tAE(BF9`y+xTC$nbq-HRs%s+Yb!IeuI#J}#H>qp zrWBuEPU?uf<-;QHFPh~6pB$jvq`X3ePRkc8>~)hmAy=!X^ltrG-OW*7X!PT|@}#(U zPTpFqxTSVdugbf`rCK}**_+cci^5`IDPXaRo71X0x|&<-(npe0I1bzG+LSG%er(-r z`B@o~%lY@hvwaCW>0CYf$A-~CLv`4!q&$l9q>-Bgq&^z^5DmeUcfNF6jfJx9YOE#;Xcm)nPC>O>hG&hWA!7H8&Vpbgs zVR*E(&@aQ=RMv=9X1$psXcwP!<2Fz-zFJY*h;ISbsGdVlV}G2yNxYBVZ$vANT$5e& z*AO~sGLClQ3@c6Lz(zHP(0gad8hSGaF8Zwp!(+|ZLEkmu`o(7dpZZ=8-kJIaMZT3C z)OPf44X@T<5nXS@drUaDy6%&ut#oo1uFG#&eBFWpplr)69D%I89nf~cM!N(K?*g-t!8e_hhK3oOMY|>>(tG4Ot z57tbvr5mA4aAV!`{f2mo~hHSN;Yw0Jv%Z