diff --git a/.collaboration b/.collaboration index 8bb4f077..676464f8 100644 --- a/.collaboration +++ b/.collaboration @@ -5,16 +5,7 @@ }, { "ModuleName": "Table/任务成员表", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T10:56:04.02975+08:00", - "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\任务\\任务成员表.json" - ] + "ModuleType": 7 }, { "ModuleName": "Table/任务状态", @@ -22,16 +13,7 @@ }, { "ModuleName": "Table/任务表", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T10:55:00.5317989+08:00", - "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\任务\\任务表.json" - ] + "ModuleType": 7 }, { "ModuleName": "Table/任务进展", @@ -79,16 +61,7 @@ }, { "ModuleName": "TableView/View_任务工时统计", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T11:43:23.8730886+08:00", - "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\工时\\View_任务工时统计.json" - ] + "ModuleType": 23 }, { "ModuleName": "TableView/人员工时统计视图", @@ -96,16 +69,7 @@ }, { "ModuleName": "Table/任务工时表", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T10:38:07.3810815+08:00", - "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\工时\\任务工时表.json" - ] + "ModuleType": 7 }, { "ModuleName": "Tables/流程表文件夹", @@ -137,257 +101,81 @@ }, { "ModuleName": "TableView/用户信息视图", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T10:22:38.2423703+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\用户信息视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/用户组织关系视图", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T10:22:38.2423726+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\用户组织关系视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/用户角色关系视图", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T10:22:38.2423738+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\用户角色关系视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/组织信息视图", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T10:22:38.242375+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\组织信息视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/组织级别视图", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T10:22:38.2423764+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\组织级别视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/角色信息视图", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T10:22:38.2423785+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\角色信息视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/角色分类关系视图", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T10:22:38.2423797+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\角色分类关系视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/角色拥有权限视图", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T10:22:38.2423809+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\角色拥有权限视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/角色组织关系视图", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T10:22:38.2423821+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\角色组织关系视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, - { - "ModuleName": "Tables/项目任务", - "State": 2, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T10:36:13.0778472+08:00", - "ModuleType": 22, - "ToRemoveFiles": [ - "Tables\\项目任务" - ] - }, { "ModuleName": "TableView/View_项目统计信息", - "State": 4, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T10:36:13.0778621+08:00", - "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\项目任务\\View_项目统计信息.json" - ] + "ModuleType": 23 }, { "ModuleName": "Table/项目任务分组", - "State": 4, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T10:36:13.0778572+08:00", - "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\项目任务\\项目任务分组.json" - ] + "ModuleType": 7 }, { "ModuleName": "Table/项目分组", - "State": 4, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T10:36:13.0778581+08:00", "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\项目任务\\项目分组.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "Table/项目动态", - "State": 4, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T10:36:13.0778596+08:00", - "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\项目任务\\项目动态.json" - ] + "ModuleType": 7 }, { "ModuleName": "Table/项目岗位", - "State": 4, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T10:36:13.0778604+08:00", - "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\项目任务\\项目岗位.json" - ] + "ModuleType": 7 }, { "ModuleName": "Table/项目版本", - "State": 4, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T10:36:13.0778612+08:00", - "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\项目任务\\项目版本.json" - ] + "ModuleType": 7 }, { "ModuleName": "Table/项目表", - "State": 4, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T10:36:13.0778552+08:00", - "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\项目任务\\项目表.json" - ] + "ModuleType": 7 }, { "ModuleName": "Table/项目预算变动表", - "State": 4, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T10:36:13.077863+08:00", - "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\项目任务\\项目预算变动表.json" - ] + "ModuleType": 7 }, { "ModuleName": "Pages/任务", @@ -403,17 +191,7 @@ }, { "ModuleName": "PCPage/新增报工", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T11:09:22.0839419+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\工时\\新增报工.json", - "Pages\\任务\\工时\\新增报工.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务-任务信息", @@ -429,17 +207,7 @@ }, { "ModuleName": "PCPage/任务-基本信息", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T11:58:33.1526761+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\任务-基本信息.json", - "Pages\\任务\\任务-基本信息.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务-子任务列表", @@ -471,17 +239,7 @@ }, { "ModuleName": "PCPage/新增任务", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T11:30:58.0207601+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\新增任务.json", - "Pages\\任务\\新增任务.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/新增进展", @@ -581,17 +339,7 @@ }, { "ModuleName": "PCPage/FGC_修改用户信息", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T13:05:27.2770218+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\内建页面\\FGC_修改用户信息.json", - "Pages\\内建页面\\FGC_修改用户信息.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/FGC_忘记密码", @@ -651,17 +399,7 @@ }, { "ModuleName": "PCPage/FGC_我的待办", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T13:28:55.7892312+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\流程页面文件夹\\FGC_我的待办.json", - "Pages\\流程页面文件夹\\FGC_我的待办.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/FGC_我的待阅", @@ -719,273 +457,65 @@ "ModuleName": "MobilePage/FGC_流程追踪_手机版", "ModuleType": 2 }, - { - "ModuleName": "Pages/项目首页", - "State": 2, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T10:16:21.4111541+08:00", - "ModuleType": 6, - "ToRemoveFiles": [ - "Pages\\项目首页" - ] - }, - { - "ModuleName": "Pages/项目首页/项目配置", - "State": 2, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T10:16:21.4091554+08:00", - "ModuleType": 6, - "ToRemoveFiles": [ - "Pages\\项目首页\\项目配置" - ] - }, { "ModuleName": "PCPage/项目岗位配置", - "State": 4, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T10:16:21.4090339+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目首页\\项目配置\\项目岗位配置.json", - "Pages\\项目首页\\项目配置\\项目岗位配置.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目配置首页", - "State": 4, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T10:16:21.4091503+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目首页\\项目配置\\项目配置首页.json", - "Pages\\项目首页\\项目配置\\项目配置首页.rd" - ] - }, - { - "ModuleName": "Pages/项目首页/项目首页子页面", - "State": 2, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T10:16:21.4103339+08:00", - "ModuleType": 6, - "ToRemoveFiles": [ - "Pages\\项目首页\\项目首页子页面" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务列表", - "State": 4, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T10:17:06.7292812+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目首页\\项目首页子页面\\任务列表.json", - "Pages\\项目首页\\项目首页子页面\\任务列表.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目工时", - "State": 4, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T10:17:06.7294423+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目首页\\项目首页子页面\\项目工时.json", - "Pages\\项目首页\\项目首页子页面\\项目工时.rd", - "Pages\\57e644c056074f9d885f24a5bd7b4ae.json", - "Pages\\57e644c056074f9d885f24a5bd7b4ae.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目成员统计", - "State": 4, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T10:17:06.7294786+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目首页\\项目首页子页面\\项目成员统计.json", - "Pages\\项目首页\\项目首页子页面\\项目成员统计.rd", - "Pages\\5f448cc5e408484e9837a0183cf1365.json", - "Pages\\5f448cc5e408484e9837a0183cf1365.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目概况-关键数据", - "State": 4, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T10:17:06.729545+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目首页\\项目首页子页面\\项目概况-关键数据.json", - "Pages\\项目首页\\项目首页子页面\\项目概况-关键数据.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目概况", - "State": 4, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T10:17:06.7295758+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目首页\\项目首页子页面\\项目概况.json", - "Pages\\项目首页\\项目首页子页面\\项目概况.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目甘特图", - "State": 4, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T10:17:06.7296044+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目首页\\项目首页子页面\\项目甘特图.json", - "Pages\\项目首页\\项目首页子页面\\项目甘特图.rd" - ] - }, - { - "ModuleName": "Pages/项目首页/预算申请", - "State": 2, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T10:16:21.4104417+08:00", - "ModuleType": 6, - "ToRemoveFiles": [ - "Pages\\项目首页\\预算申请" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/预算申请", - "State": 4, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T10:16:21.4104288+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目首页\\预算申请\\预算申请.json", - "Pages\\项目首页\\预算申请\\预算申请.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/预算申请审批", - "State": 4, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T10:16:21.4104403+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目首页\\预算申请\\预算申请审批.json", - "Pages\\项目首页\\预算申请\\预算申请审批.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目信息", - "State": 4, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T10:16:21.4108309+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目首页\\项目信息.json", - "Pages\\项目首页\\项目信息.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目列表", - "State": 4, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T10:16:21.4109742+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目首页\\项目列表.json", - "Pages\\项目首页\\项目列表.rd", - "Pages\\b90932e038f94707b54e571ff7cd84d.json", - "Pages\\b90932e038f94707b54e571ff7cd84d.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目审批", - "State": 4, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T10:16:21.4110544+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目首页\\项目审批.json", - "Pages\\项目首页\\项目审批.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目标题", - "State": 4, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T10:16:21.4111514+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目首页\\项目标题.json", - "Pages\\项目首页\\项目标题.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目首页", - "State": 4, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T10:16:21.4089171+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目首页\\项目首页.json", - "Pages\\项目首页\\项目首页.rd" - ] + "ModuleType": 1 }, { "ModuleName": "MasterPages/流程母版页面文件夹", @@ -1001,17 +531,7 @@ }, { "ModuleName": "MasterPCPage/FGC_母版页", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T13:03:51.0069615+08:00", - "ModuleType": 3, - "ToRemoveFiles": [ - "MasterPages\\FGC_母版页.json", - "MasterPages\\FGC_母版页.rd" - ] + "ModuleType": 3 }, { "ModuleName": "UserControlPage/工时记录列表", @@ -1027,29 +547,11 @@ }, { "ModuleName": "ServerCommand/新增任务", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T11:28:04.3553147+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\任务\\新增任务.json" - ] + "ModuleType": 15 }, { "ModuleName": "ServerCommand/移除任务成员", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T11:01:35.3993179+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\任务\\移除任务成员.json" - ] + "ModuleType": 15 }, { "ModuleName": "ServerCommands/工时", @@ -1057,16 +559,7 @@ }, { "ModuleName": "ServerCommand/修改工时", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T11:09:22.0839629+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\工时\\修改工时.json" - ] + "ModuleType": 15 }, { "ModuleName": "ServerCommand/删除任务成员所有工时", @@ -1074,16 +567,7 @@ }, { "ModuleName": "ServerCommand/新增工时", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T11:09:22.0836605+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\工时\\新增工时.json" - ] + "ModuleType": 15 }, { "ModuleName": "ServerCommands/项目", @@ -1311,19 +795,7 @@ }, { "ModuleName": "Upload", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T10:22:38.2427779+08:00", - "ModuleType": 26, - "ToRemoveFiles": [ - "Upload\\485a297c-1ba3-42a6-afe8-c2409d9f01fe_app-logo2.png", - "Upload\\485a297c-1ba3-42a6-afe8-c2409d9f01fe_app-logo2.small.png", - "Upload\\a78dd055-76a1-433b-b6a1-70cff99fd6fb_app-logo2.png", - "Upload\\a78dd055-76a1-433b-b6a1-70cff99fd6fb_app-logo2.small.png" - ] + "ModuleType": 26 }, { "ModuleName": "PublishConfiguration", @@ -1331,26 +803,7 @@ }, { "ModuleName": "Plugin", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T13:30:17.6818074+08:00", - "ModuleType": 40, - "ToRemoveFiles": [ - "Plugin\\Editormd-6_0_102_0.zip", - "Plugin\\Microsoft SQL Server-10_0_0_0.zip", - "Plugin\\Notiflix-9_0_103_0.zip", - "Plugin\\PC组件包-ElementPlus-10_0_0_0.zip", - "Plugin\\加载动画-10_0_0_0.zip", - "Plugin\\增强关闭页面-9_0_6.zip", - "Plugin\\富文本编辑器-10_0_0_0.zip", - "Plugin\\支持预览的附件上传-10_0_0_0.zip", - "Plugin\\甘特图-10_0_0_0.zip", - "Plugin\\自定义菜单类型和树类型-10_0_0_0.zip", - "Plugin\\设置当前行命令-10_0_0_0.zip" - ] + "ModuleType": 40 }, { "ModuleName": "PublishSetting", @@ -1370,196 +823,74 @@ }, { "ModuleName": "Table/项目成员表", - "State": 4, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T10:36:13.0778563+08:00", - "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\项目任务\\项目成员表.json" - ] + "ModuleType": 7 }, { "ModuleName": "ServerCommand/同步项目成员", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T10:35:24.504575+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\项目\\同步项目成员.json" - ] + "ModuleType": 15 }, { "ModuleName": "PCPage/项目成员", - "State": 4, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T10:17:06.7296892+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目首页\\项目首页子页面\\项目成员.json", - "Pages\\项目首页\\项目首页子页面\\项目成员.rd", - "Pages\\6899a8cead694b3ba00307b6756dbd7.json", - "Pages\\6899a8cead694b3ba00307b6756dbd7.rd", - "Pages\\007ea4aa4c7440478a9a092179dace8.json", - "Pages\\007ea4aa4c7440478a9a092179dace8.rd" - ] + "ModuleType": 1 }, { "ModuleName": "Pages/项目", - "State": 3, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T10:16:13.0515721+08:00", "ModuleType": 6 }, { "ModuleName": "Pages/项目/项目首页/项目配置", - "State": 3, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T10:16:21.4091577+08:00", "ModuleType": 6 }, { "ModuleName": "Pages/项目/项目首页/项目首页-容器页面", - "State": 3, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T10:17:06.7290326+08:00", "ModuleType": 6 }, { "ModuleName": "Pages/项目/项目首页/预算申请", - "State": 3, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T10:16:21.4104427+08:00", "ModuleType": 6 }, { "ModuleName": "Pages/项目/项目首页", - "State": 3, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T10:16:21.4111554+08:00", "ModuleType": 6 }, { "ModuleName": "Tables/项目", - "State": 3, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T10:36:13.0778489+08:00", "ModuleType": 22 }, { "ModuleName": "ServerCommand/移除项目成员", - "State": 3, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T10:54:06.8571086+08:00", "ModuleType": 15 }, { "ModuleName": "PCPage/任务成员详情", - "State": 3, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T11:11:07.0588136+08:00", "ModuleType": 1 }, { "ModuleName": "ServerCommand/修改任务预算工时", - "State": 3, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T11:54:54.1017673+08:00", "ModuleType": 15 }, { "ModuleName": "PCPage/项目成员详情", - "State": 3, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T12:07:51.0575309+08:00", "ModuleType": 1 }, { "ModuleName": "PCPage/项目岗位详情", - "State": 3, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T12:24:10.5320953+08:00", "ModuleType": 1 }, { "ModuleName": "ServerCommands/用户", - "State": 3, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T13:20:35.4360926+08:00", "ModuleType": 20 }, { "ModuleName": "ServerCommand/更新用户配置", - "State": 3, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T13:20:58.7553271+08:00", "ModuleType": 15 }, { "ModuleName": "Pages/个人中心", - "State": 3, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T13:25:50.8142657+08:00", "ModuleType": 6 }, { "ModuleName": "PCPage/个人中心", - "State": 3, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T13:26:54.6505208+08:00", "ModuleType": 1 } ] \ No newline at end of file diff --git a/ForguncyDB.sqlite3 b/ForguncyDB.sqlite3 index 6202008c..93bec72f 100644 Binary files a/ForguncyDB.sqlite3 and b/ForguncyDB.sqlite3 differ diff --git a/MasterPages/FGC_母版页.json b/MasterPages/FGC_母版页.json index 8f3ff57c..271081ac 100644 --- a/MasterPages/FGC_母版页.json +++ b/MasterPages/FGC_母版页.json @@ -123,7 +123,8 @@ "DefaultSize": 230.0 }, "Values": { - "1,0": "TeamAction" + "1,0": "TeamAction", + "5,0": "%CurrentUser.UserName%" }, "AttachInfos": { "1,0": { @@ -200,6 +201,41 @@ "CanVisitRoleList": [ "FGC_Anonymous" ] + }, + { + "Value": "菜单1", + "Text": "待办", + "SelectedIconColor": "Background 1", + "SelectedIconColorUseItemColor": true, + "IconColorUseItemColor": true, + "IsOldMenuPath": false, + "CommandList": [ + { + "$type": "Forguncy.Model.NavigateCommand, ServerDesignerCommon", + "PageName": "FGC_我的待办" + } + ], + "CanVisitRoleList": [ + "FGC_Anonymous" + ], + "Notification": "1" + }, + { + "Value": "菜单1", + "Text": "我的", + "SelectedIconColor": "Background 1", + "SelectedIconColorUseItemColor": true, + "IconColorUseItemColor": true, + "IsOldMenuPath": false, + "CommandList": [ + { + "$type": "Forguncy.Model.NavigateCommand, ServerDesignerCommon", + "PageName": "个人中心" + } + ], + "CanVisitRoleList": [ + "FGC_Anonymous" + ] } ], "Orientation": 0, @@ -738,5 +774,11 @@ "Size": "1318,46", "BoxShadowString": "0 2 0 5 #175D7183" } + ], + "CustomNames": [ + { + "Name": "母版_当前用户", + "Formula": "FGC_母版页!$A$6" + } ] -}//usZid/V0A7ZKbhUgBTW5LXGaXaaB4ckKj/APc2PLjMtQZYqWxT2CbXhcQO1udPVlmRBakLePFKTkY9tgnoPsJbktpSOFZ8ZUVfZvroKoR5LAKX1VIxm7QfZRkdDrKojmH7RsbSzipKsQDsR15Wvz3/9VZts+093xlLFLMr76ThiRC4FXojD3iS+Pr3k8oHxyYYwnI01gFpefHqO+Q6MaxayH/eJO/PpW7IqzlLt3GudmD5of/JvZ84eL9cshrOrH3Ajxtbkfqhv9i5k5F//ofyWlCJ1pXJKgJPgEs2lqfyL2kJbvzxGVMbXhpsWRah7aYfqFUwRLi1Rzv9tbIWwGgJ9NmD+Btk1ApnypoDkBYbytokt5gFir74nu14JDYy2tXi+ABUa/vdHaS9WaS5BQf5mafyye/BETI8TTeNKP8y7nHsm1EtL1rWCpjZo/VWu4JEiarWxOnldEgBF4Xg8Ac4/G+zpTri2QKm6cBulwtcJJ3UFoo+wCRguxk+42TccKCNxgM/VYHMsYDzy7+twpQkMj/apzIwaBdRhnz95g4+hX/2QbbWtZKyJPMadeVpFnFJytdbiW0j/XvQW1aW1TeInE28YaemPC1DHQ4uBAAYS9SbfZQq9CYOkQGCm1D362iJbPkHREyYs3XTK/QQuDzFZIH5VhtMlwy1rFFbdC6Ekc4zTRYLekrYkA5szoNCfwpSwftYwlIW0S9voJf+Qz/IEijEBovBAipK9ZPM6fq8iNNXEFXR/mGfKSZgVOGckV8P3Y2uQDlpzt9dbcEOOqmXpj4NIoS9ACEnoIwCH9M3ashABNAhdrpV8AmKAjvFoJ9S7D9M8eyIx8ARNwYZxnzXrCpfylntQeFghsQgqPZ4+kIgURLAN7PsQYh3m7jv6mO4lKyH4pq7LU18MFEM/2Uw==|920 \ No newline at end of file +}//M4oVo1QlGm1yE/GwIS1ZmSBawwNroqeJyUqRQopvB0sdgKu9if4le/bhAD/kTlH7OCPsrbDm0UPO1Il7yKv/SMeS7KSrpnSSTqJfz4/3JDC5dxp9mQUlkAMO80o8AtVpxkmVQkIaB3aso58t7Rq8pOzPz8ogytC5mT8ljjfHR4X91gTcv2mYQIkgAIBBsiCK1fey/sZjUKQHgh94iI9Tyxp+JRNPVLY2QuFWifbiwkuza3B2cIueenTERuNOrh94iI6jQSwj99dynvKmrZWZl8/CB8003+wNx5BzMLp8biM2DRP/npZoeLizvQ6OEQsUU3gHRYoJqRMm86Bql2ZORjZowICnG6m4maV3ebfl7AMOppKuyB/1jn2fR9uWc3tHFfpTC63ZzA0TMpXgXjBWActNFUazlytAZTU2WX16QHLJu94U1MiMBdZC1KFecEZfgT9YX4U7RNgTUfInB2AACyvvXvkQg4lpEDi0WsrGCnKhg4993RtIwjedpczwQqxsJgyCr+Htj0hbe4GhepVXfMYtfew2QxBnlOcf/0yiUlBEZicz0yLby8Gd7vOB+YozNxz11T01tCwZGS4OmXEcAIfv5ilJ2zIpzWLeLXjb2zv+3na/MTQ2lO80s/jtDliETSQhvQ76oRhfg3nGeh/e9+XAOmdGeYS16WWO56/GtWNOf5gbnU44lv36zPVhZOvCdVAQSC8DGo9xvGuT79/5YmtdCNZyBkjgc+BC3FQisgEf8iYo8Q3aZpEnLne6yHuJ0Nb0DZBRnJvvv4m4QzDbgu3P1rchKO3nVzwbSIyqXaoac/3kiPH25Fzt81HxSOaDZQZiKSj01MYipzFuz/YikNtEFTSZbYxRmAIWdPextUwre7dtAfCiK9s9EuZFwO934vVr52WlGB8f2qIRFgJNPg==|920 \ No newline at end of file diff --git a/MasterPages/FGC_母版页.rd b/MasterPages/FGC_母版页.rd index c386a267..20f8b203 100644 --- a/MasterPages/FGC_母版页.rd +++ b/MasterPages/FGC_母版页.rd @@ -1,5 +1,11 @@ { "PageType": 1, "ColumnCount": 7, - "RowCount": 7 + "RowCount": 7, + "CustomNames": [ + { + "Name": "母版_当前用户", + "Formula": "FGC_母版页!$A$6" + } + ] } \ No newline at end of file diff --git a/Pages/007ea4aa4c7440478a9a092179dace8.json b/Pages/007ea4aa4c7440478a9a092179dace8.json index 50586e2f..a5e56b4f 100644 --- a/Pages/007ea4aa4c7440478a9a092179dace8.json +++ b/Pages/007ea4aa4c7440478a9a092179dace8.json @@ -12,23 +12,18 @@ } } }, - "InLogicalVisibleIndexes": [ - 7 - ], "Count": 8 }, "Cols": { "RowColumnAttachedInfos": { "1": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 1 + "DesignLengthInPixel": 20.0 } }, "5": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 1 + "DesignLengthInPixel": 20.0 } } }, @@ -36,7 +31,7 @@ }, "Values": { "5,1": "姓名", - "7,1": "岗位名称" + "6,1": "岗位名称" }, "AttachInfos": { "1,2": { @@ -47,17 +42,14 @@ "$type": "GrapeCity.Forguncy.Plugin.ImageValue, GrapeCity.Forguncy.Plugin", "Name": "默认头像 .png" }, - "badge": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='007ea4aa4c7440478a9a092179dace8'!B8" - } + "showSystemAvatar": true }, "TemplateCellSource": "项目成员" }, "5,1": { "TemplateCellSource": "项目成员_全名" }, - "7,1": { + "6,1": { "TemplateCellSource": "岗位名称" } }, @@ -68,19 +60,29 @@ "HorizontalAlignment": 0 }, { - "FontSize": 13.333333333333332, + "FontFamily": 1, + "FontSize": 12.0, + "Foreground": 2, "HorizontalAlignment": 0 + }, + { + "FontFamily": 1 } ], "Types": { "Strs": [ "Center", - "Body" + "Body", + "Text 1 50" ] }, "CellStyles": { "5,1": 0, - "7,1": 1 + "6,1": 1, + "6,2": 2, + "6,3": 2, + "6,4": 2, + "6,5": 2 }, "SheetStyle": { "FontFamily": 1 @@ -89,7 +91,7 @@ "Spans": [ "5,1,1,5", "1,2,3,3", - "7,1,1,5" + "6,1,1,5" ], "PageInfo": { "$type": "Forguncy.Model.Pages.TemplatePage, ServerDesignerCommon", @@ -98,5 +100,163 @@ "PrintInfo": { "PaperSize": {}, "Margin": {} - } -}//nRyUAlTDYqOMDM39ZB45s/9q2kYfHClHINh/9JTxjbM8c15loi7/v2Pckqlk11VcSvcwv5gQvkmBBgFjpKwUy1TvdxV2vjP0w193xvzCKtmS7reGxBlpuabt+YkvCuGJhWZsasKRqoS1xjfxl7f+03D7EtIH0LzdWQ2gjP0lJync66VtDW1BNdBlmfZ5P0hY4glCzWCqQdy/vwmpEBhpGbMj91+AkJMl1xVaCb0k/d5T9UO1P/47nBZ9MmoTqpAauo3wPoKcJXgGX+AlQh7yFgEGSdaEiBJwVv3WH7Dh+eQ9xZT6M5oMncOBD+HUogmlVCa7TXcajyxJpciBvrTQl+ytmi7Nex9+rYDsQJcAy8N3gwElx+bzkjf7YE0z6MOa2RtOEhr19WSMcj460HiuXyQsiwgACN6CaL+c+EoYBpk+PkWWBTj4TuZeM7yhjzIEbR+lwtf15RudxW6NvOerXXail+7IgvPt8iHZJgrrGeyER3idj4T/eUWfPxMmlDShTxnvuZqdGe1ErGoSnnb3zBL2hfL7Z8y0RBA/LqhpHgH7pmmPssnLp1/6qLI7bltXR5nLCiPBk+Vqsp5/5s+TvADnhJnbGcWuAE09LEWog/GxNYDHVFyRNesb68q+Z0HzeyI8VFy7OOKHqvt7LDRaCL2IhLbA/ZOgMtMi00gPi2Rq1TsNOjYq/6cCXTKG2up7UmAGyOy0jFFCzsHkJ6g2frrzeHg8SzCfsh264UH514MM1w5VUopVAAOb1qnsW3wUbXhhVn5tcfMWF5Fb/z5Ybv9hnEmcuVghnMBvyxkXUdMWsQS+dfuYA5ylB4z0A4fMOijERR10eUOoWaIBeywIjHuyA3EEIg0fjB8fKOlqNB8GVociy5rl+jkXyPTeuqAbrmZz5XlMr3sDIvagLkvE8g==|920 \ No newline at end of file + }, + "Pictures": [ + { + "Name": "8c096078-eaf2-4436-9b02-2b6ddf4443e4.svg", + "ForguncyPictureName": "更多.svg", + "ForguncyPictureSourceType": 0, + "Stretch": 2, + "PictureCommands": [ + { + "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", + "PopupDisplayMode": 1, + "Placement": { + "SerializeProperty": "='007ea4aa4c7440478a9a092179dace8'!G1" + }, + "ClosePopupCallbackCommand": { + "Commands": [ + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=是否为确定" + } + ] + }, + "value": "1" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=选择项" + } + ] + }, + "value": "编辑" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", + "PageName": "项目成员详情", + "LoadBindingDataOption": 1 + } + ], + "ID": "5fecf1fa-ff1f-4af6-b695-b8c03c0cd264" + }, + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=选择项" + } + ] + }, + "value": "删除" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", + "ServerCommandName": "移除项目成员", + "Parameters": [ + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "项目ID", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='007ea4aa4c7440478a9a092179dace8'!项目ID" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "成员用户名", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='007ea4aa4c7440478a9a092179dace8'!C2" + } + } + ], + "ResultErrorCodeTo": { + "SerializeProperty": "code" + }, + "ResultMessageTo": { + "SerializeProperty": "msg" + }, + "RefreshAfterFinish": true, + "CheckDataValidation": true + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=code" + } + ] + }, + "value": "0", + "compareType": 1 + }, + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Report_Command, Notiflix_Forguncy", + "FunctionName": "warning", + "Title": "温馨提示", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='007ea4aa4c7440478a9a092179dace8'!code" + }, + "BtnText": "知道了" + } + ], + "ID": "151bcc86-62ba-4346-8f45-5ba1fe0917f1" + } + ] + } + ], + "ID": "0e19c90c-90de-47a1-a6c2-3a03b040cbd0" + } + ] + } + ], + "ID": "e52bf7d2-8113-4101-8fc5-0b7c9a974870" + } + ] + } + ], + "ParamProperties": { + "IsOK": "是否为确定", + "选择项": "选择项" + } + }, + "PageName": "编辑删除页面" + } + ], + "ForegroundFill": "Text 1 50", + "Location": "113.90476190476193,5.714285714285715", + "Size": "20,20" + } + ] +}//CIl5LZcK9rI/yFt3Q6j9+h8vdmEHR0bUVylxOhByceWEiaOSf8fah+OlhlinICIeI/qj58kXF3EyKqJ1UMK7CE31a7Pq/fCDSBkE8DmGbVK9sUoX+Cuv39+i2FV+UG5QPbKWyty3DD9gA/qLQI+5v7a1AWWMv928Oc2mf4JC0Da9XukjM9EOssj0Gj/8rh1AobRE8E27N1glr4tHN9I0edLHv5rYh0xRX7Q1aYhp6VytxFaZ9yuwZo5o0YV8Eq8M2DQiQu0LpXxBECD2Gv9DejoUhUdqWEQ9rjfRuzfmY/rUi8wrLU9k9Yz5kksBDCgF/KLJSK9uvHP/y2EnuVW3JLo9MWDwoDEwUA2AejHKpf0ym5ZuFRpxtTl3s7Q618ywINaFBowJ3kKZRKCq7Sd2+ruj2hZ9LBp59ZgglasOS5xevlmlFhGS4yB13rgoeYHR5tuPEz8G3cpu+3pLtNC0Y+mHEJYRDBZSvSlJddPos4165ve3bKLhkF1imOa+PkYfkMMw9pGywFZE0Zxi19jsnX0qQ4DeOx4luQaeQdfQgBjvmrAcmmMLJVTq+Uiwa3Nmptz6k0Q5teSPVFNMuTesLJbTRuab3p+7rBBMbfBGPS9Ihz9paxpIYgt5+5YVF6oMepOKFZXGtncn6qTOmWpUM4NXR9IMSPWeqU/23hWsZX+GFCC0ojdQuoYT3BelHppenwzXTt7DFtvUH+p7Kf1MG00+0Ys95GKw6NrjAWu2LaofgR3YlBR6iH/MfmOYIy1REPnP0Yeh6abF/yg4I1DEJBwBnZ8clHGIVtSovXKPQ0JFLGvZDVafNsofv3egrMYqehH595s9cQcgaQ5lGDTCC19kz1V1xhe0D5i7UXBJ1Tt8/S6q9BmAw3SxnDZ+yAUGOrkpuJfoDkzMTZyxLWswSw==|920 \ No newline at end of file diff --git a/Pages/57e644c056074f9d885f24a5bd7b4ae.json b/Pages/57e644c056074f9d885f24a5bd7b4ae.json index 0157d2eb..7aab98d4 100644 --- a/Pages/57e644c056074f9d885f24a5bd7b4ae.json +++ b/Pages/57e644c056074f9d885f24a5bd7b4ae.json @@ -88,7 +88,7 @@ "FontSize": 13.333333333333332 }, { - "FontSize": 16.0, + "FontSize": 13.333333333333332, "Foreground": 0, "Formatter": 1 }, @@ -98,23 +98,22 @@ { "FontFamily": 2, "FontSize": 13.333333333333332, - "Foreground": 3, - "Formatter": 4, - "HorizontalAlignment": 5 + "Foreground": 0, + "Formatter": 3, + "HorizontalAlignment": 4 }, { "FontSize": 13.333333333333332, - "Foreground": 3, - "Formatter": 6, - "HorizontalAlignment": 5 + "Foreground": 0, + "Formatter": 5, + "HorizontalAlignment": 4 } ], "Types": { "Strs": [ - "#FFFF0000", + "Text 1 50", "0.0\"小时\"", "Body", - "Text 1 50", "\"平均时薪：\"¥#,##0.00_)", "Left", "\"预计收益：\"¥#,##0.00_)" @@ -157,4 +156,4 @@ "PaperSize": {}, "Margin": {} } -}//NHFLhdQ9xFpmSDGVOA3fBqpqjayYzvsPTQWxdxoeiihLx7InmwahmSkKoccRhHnMr7dEopO7AdsbB1yTnWtOR827prub9H/DEMtJUvZz4B8Wu7/3HvYenetiEsTPllEnuaShZ7jnG+sVHDf8m0bM8m5mtVP5KuJCFdBkZUdE6PXYGUG/7OjR06qRORDdpRMhKoQ7cnvd5AJ+pG0efX8HxQgTQpVLUR4Oq8ied8P5tJorrexYZjxbL8onJoi7HyDk3wespaJZT9Ax42nFYp/vMrmoPAjAcns/tscghWHrSTpsAnXAksJWM9l5rfRuYLRCWhZxAnDY0DtReSiRYYlYc7wVDStKmqGyGGrT1Ss83ESWHppkgd2M2uwfUyyOCck1Uj64oawHL+fXC3g+/TYwsAd9CKRVrY4a3ZJd0OyDLPC3DHpR91iCRwm6kY3qrR0K9wQoU/xhM3gBsTgCR1lyK4N1JiNtXfoR94KnAJx+QkjJyK3x3DhKwix+wsNBVGkdiMm6ykELfH90qnOWNmhBYi83aBK8Topf5TCEdiqggTqoky21bljekbBnDyu94W0Cy2vXOTYCNcpYpsexAidabgAlMu97iN0Tpby9OJGnZ0CvkGPzGw9OigA6MDs7PAfgqxldcO+2mrTNWoV11L9snoeCECyL/wv92Mth5TrAebmKL/f4WjgSnnGENoqU4IGi1AaxPhTtQ5G69//ub5rnI5ca47Aj/oqhWrI2MDTUBgoiCS2wI+60kMTY52GCqF6pI6BqBxYkH/hLkuu3eH+YY5SS/hKpTylCq+BzvjwmFhGXzCus3jKSlTcDnbFq76wjnuvPQO/8BLvekGO5C4JTNe6EwiWLH7M2sAHmAhrXf86Dn6LO3l1Jh+ZVrpM+NB2wylmdNUFGr5yk9ZQ4VxXfhw==|920 \ No newline at end of file +}//5+Ieatrr6LJlpn2HIuAwlXygZgT6/+tGPJutQTy4cBVmZmO9/4UltUxET2ompDoci471m863x97PBv3hIH+vkFD1SqRQVWYNfomXjWtp4BQztD7+dSnc8X3RgeWH0SgoMR6WfR/nQ1rqiJpBqm/4EMN9QMdteDPPxtO3bIiJwVNO9BhaGja9EGLQULfpq3pu0x6+WuBC1an2McDQOzn4OrOK0Nn898wUXgnjKVpfpbN0D1HNO5vUj4AmLWusnTyOndjio92JpTHIfJKhwMqRFgzQ2rYlabQtQSduHFcu7uessA9qmMG9INJGSWHuBRHAqBLvazzBh6NwNme6jUHFv1gPEA4OSjp5qsgk/Q1arAZXQlHRcdvJueFvM1gYD1HO+K9oMqNNAyIpW70VpJDJbJ5Oj7/vBPbPLoQaUtATPcb4loESBKqOC5mGYm8mMkdT8R2l9dx5TNFz3zOgsWbhWLBvjWHz5IgIZH1VgPHGn01BPH6IevPKRJWW39oGtIik0w6J4mgT8aE7MD3LMB1PFW2OUKzSY7fZb6rN+/iuDro5MwIUD24yh7hjZuJ+bp3UYQ6Aj8q3EW4Siz6rjGNvHKRv9hvd6mqSG+raZPEgKlvy7SIpyNYt9U0GTrAGkUmh7w8uJeEegv6hKKD2Zjk6sVhRlLGvZBx7nm9srIVBfhJsIHpyT76UCKlx+bytsi7xrol4hYXjk0uNDpZ5oIgf/uJ32S4Bddau0e1uGNSzoV2bSbpXV3GlmYLiYsZItCRh4dvV/sQ9cXmK+mh7bGNwROrIEWJbsjoHK2qx5sMDxNjCIUlcTaKSfNLzMrZvqH36+BRMkG3Wn5bLt/OMyngSJ/Z7O0BhyDA5AuMHGp5nBiwGgf9RBVKX+UJaylsuxQwcQpVwXCCdnOLN2lJEAxsjtA==|920 \ No newline at end of file diff --git a/Pages/5f448cc5e408484e9837a0183cf1365.json b/Pages/5f448cc5e408484e9837a0183cf1365.json index ee114cae..245b914d 100644 --- a/Pages/5f448cc5e408484e9837a0183cf1365.json +++ b/Pages/5f448cc5e408484e9837a0183cf1365.json @@ -11,11 +11,6 @@ "DesignLengthInPixel": 77.0 } }, - "5": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0 - } - }, "2": { "GridRowColumnDefinition": { "DesignLengthInPixel": 20.0 @@ -30,6 +25,11 @@ "GridRowColumnDefinition": { "DesignLengthInPixel": 20.0 } + }, + "5": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 15.0 + } } }, "Count": 6, @@ -71,10 +71,6 @@ "Count": 6, "DefaultSize": 15.0 }, - "Values": { - "3,1": "执行人", - "4,1": "0/0" - }, "AttachInfos": { "1,2": { "CellType": { @@ -84,16 +80,15 @@ "$type": "GrapeCity.Forguncy.Plugin.ImageValue, GrapeCity.Forguncy.Plugin", "Name": "默认头像 .png" }, - "badge": "初级工程师", "showSystemAvatar": true }, - "TemplateCellSource": "执行人" + "TemplateCellSource": "项目成员" }, "3,1": { - "TemplateCellSource": "执行人姓名" + "TemplateCellSource": "项目成员_全名" }, "4,1": { - "TemplateCellSource": "工时情况" + "TemplateCellSource": "岗位名称" } }, "StyleDatas": { @@ -122,7 +117,6 @@ }, "CellStyles": { "1,2": 0, - "1,3": 0, "3,1": 1, "4,1": 2 }, @@ -132,8 +126,8 @@ }, "Spans": [ "1,2,1,2", - "3,1,1,4", - "4,1,1,4" + "4,1,1,4", + "3,1,1,4" ], "PageInfo": { "$type": "Forguncy.Model.Pages.TemplatePage, ServerDesignerCommon", @@ -143,4 +137,4 @@ "PaperSize": {}, "Margin": {} } -}//HPpArMuqS53AVLQNK4SAfvaAVWP+PygKjDgnjxp6uzqz3VeXopU6gFgNEcm2afmnHAgpWQA22toRcCH7qen7aW30wLo2I2gmX9e339cyrDxROcNufmP/htxttSi4SjNw+T16bfVduOMcQtcBU2ebSGZ4qBaht05QnMn3GJ9dZ6ybHI/tVQfv7AT7REirVR49wDzkB2pCKELLZ2C1anV23EogbVAB/3WvMCoI3pXGNIRIlFejVUTpAHVR/ZyhKr8Q4sCB4MX+J4BAmxVcnmIwX87Ie9k2nD+mGKZg0dUZf9prcl5MEs1SYK45j2Tl1bTqviUpxxBWMurT+qSfAg9ifGpTFacw92DEb1CbFJTVQgyPUnE6fY+nUeHrufMxNhuGRUBnAwjL3SNtaxfmv8O4LdrvZ0CKqfnPXwyACBFZtiKa5af36eN5TPvlFC+5jChKyX/9mTX4LSZeokelIyTsiQM/LzHnWsO8z95+wtE+LW4D/+kX11B+eppnVWdduLQr7jzjX26Hxx3X8rSL6DrsIoNOhb/rzEtyv088CP3u7InSTTHAK4Yrf0hVhGsBzFy2QkU84LV6O11ay1xRyVNNZonWu53D7bRjeKERC3lnu9UmqGQlzwNhoHvdZqJ8DZzIxtATSOoTsJA41AsE86bNPOloeZbimvvrGx8JcUXs5RSQGmei7umO9tuLxwZprWGjPdd0eR6jLfi+89CDLL1qoGC5b/EqHhD8HY5h//jm/YGX3l/yFvYWKnTLzA1t6K/nkGKmFW7zloZVedCjahd26QbHKVet9KcA9qhjwnV0xspYMqrn1qUxqQ7YpcKDn821iUx2/i4P/wX/gf+fz3D1Ecg8X0NkPMY56wE4vwu3TzJfH2o0zzWzNz8BjjuvgpCkpilTj6iH5tbNLx2rd8/0wA==|920 \ No newline at end of file +}//yKkepqve6OUNl4xg1a5oIc4GzBNOvf3ehJhaFhVglTW9DTLyE7rkx+hrkAy0L16M8qFF/czEADi3c4LhCSWU9C93+epWDuDt2K6gVhaV5dmypeCvBjjf681qvxYO2Oc3PFQRlY0eoak5IunyGmcFihb6QfNISzHYHITkErTLsQqQAyLeymmsgQCb5IB1OYhK1LmdkGUp2kTBsDYszr7Yfyv3YnjIizjTC9tuVyRfsAeysMHVXhui9Mp+K2DFoBmLgBZ9VcO/kbP5nGndcPen/qBEhqwETN4HEaSMhcpN3py7b0bnBQsqtAr/K6j9J1p7gKs3+VCZhNrZ6a1TerxLpDBdCOV3vXfm+wyD5P6EanJIBonL4jBtU/z18x49bB11xY8YqO6+CSVBIDH4HGSUlcApqWhtUtCLwCF7WyPsbRpFLeABPJOXLVGV1cRvdGrUyejpJ68LKTtSUeitFpF4FsfwpF+Kas/xuRr9J4zJxcqX3PHeelkD/FISGq+IrIu6D/MFfh7QgrVGZr8IJHu/M16OsBXTnFH2t7/xrf1sRwgVnx46dRrdDLoSWzS01f31hmi0jNQUN3DboUuVftrTVHYzYMTkI7p8W3MtfLXVOtnRYPoTMhPJ5/9IUl8nGC5BP8ot640H79fWjJGNvJwRg/hsb2En7w/QdwvwFkcyXOAdqWRbQPuyfUFxgfnb49uJ/E0PI8pluAcN5yPhNZMp8bX0w1Hc11VuKVW267K28Hi2pSx3TYEuncTiYZFZnxawvKUsRy/K9S7DAjLs5NPhKNgdjQlJQCFFQbRKBJtIC9kAU5IcmFQJ8ZK57nGRusVqWrywdytO+iFc8XaflP0+7x5l04MGp/pB97iZKKEPeHmk7u4pMla1Bnv4cgdUCHETpP2Ly8n8MEI3q26LyWZ83Q==|920 \ No newline at end of file diff --git a/Pages/6899a8cead694b3ba00307b6756dbd7.json b/Pages/6899a8cead694b3ba00307b6756dbd7.json index 3f6f07ce..d7c77c2d 100644 --- a/Pages/6899a8cead694b3ba00307b6756dbd7.json +++ b/Pages/6899a8cead694b3ba00307b6756dbd7.json @@ -22,17 +22,12 @@ } }, "4": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0 - } - }, - "5": { "GridRowColumnDefinition": { "DesignLengthInPixel": 10.0 } } }, - "Count": 6, + "Count": 5, "DefaultSize": 10.0 }, "Cols": { @@ -63,23 +58,19 @@ "Count": 14 }, "Values": { - "1,1": "执行人", + "1,1": "岗位名称", "1,8": 0, - "3,1": 0, - "4,1": 0 + "3,1": 0 }, "AttachInfos": { "1,1": { - "TemplateCellSource": "执行人姓名" + "TemplateCellSource": "岗位名称" }, "1,8": { - "TemplateCellSource": "总工时" + "TemplateCellSource": "默认时薪" }, "3,1": { - "TemplateCellSource": "平均时薪" - }, - "4,1": { - "TemplateCellSource": "总提成" + "TemplateCellSource": "成员数量" } }, "StyleDatas": { @@ -88,7 +79,7 @@ "FontSize": 13.333333333333332 }, { - "FontSize": 16.0, + "FontSize": 13.333333333333332, "Foreground": 0, "Formatter": 1 }, @@ -98,26 +89,18 @@ { "FontFamily": 2, "FontSize": 13.333333333333332, - "Foreground": 3, - "Formatter": 4, - "HorizontalAlignment": 5 - }, - { - "FontSize": 13.333333333333332, - "Foreground": 3, - "Formatter": 6, - "HorizontalAlignment": 5 + "Foreground": 0, + "Formatter": 3, + "HorizontalAlignment": 4 } ], "Types": { "Strs": [ - "#FFFF0000", - "0.0\"小时\"", - "Body", "Text 1 50", - "\"平均时薪：\"¥#,##0.00_)", - "Left", - "\"预计收益：\"¥#,##0.00_)" + "¥#,##0_);[Red](¥#,##0)", + "Body", + "\"成员数：\"0", + "Left" ] }, "CellStyles": { @@ -125,19 +108,10 @@ "1,8": 1, "3,0": 2, "3,1": 3, - "3,2": 2, - "3,3": 2, - "3,4": 2, - "3,5": 2, - "3,6": 2, - "3,7": 2, - "3,8": 2, - "3,9": 2, "3,10": 2, "3,11": 2, "3,12": 2, - "3,13": 2, - "4,1": 4 + "3,13": 2 }, "SheetStyle": { "FontFamily": 2 @@ -146,7 +120,6 @@ "Spans": [ "1,1,1,7", "1,8,1,5", - "4,1,1,9", "3,1,1,9" ], "PageInfo": { @@ -157,4 +130,4 @@ "PaperSize": {}, "Margin": {} } -}//eMOh40/TLJmYGCua46SYjP2eWaxcA/GbWbGb586yVfBfOlONx9VC+2Fs0Mut8tcVqtz02VKlUxQrJBzgGFwoyIXAX3eCrzdJFGaiAospjTNUIwwUYswOL0b0C79Nm1Fi7kL0ZASJ2+2dn6K7urdQuSliwFX38w/keGb4ieqJw1Km/yUQtr4wVQ5STrfIjOlysQeO3ncYYbiE2YVTTtFRs06IGVTPKO7tMfnsupL0DV9gY8448LLyR4Kibe7c6XoQd44LM6gxzHcocl3uSvvIKV5cd0qk+HQXA/8KAGlOragBxDG3Mr1Tvf24ZWtP3rVFiEhzWvnqlp/3QPfNufFe252hJgdGS6Ohxp9jQQ8C/3svBvbUPkuCPSP2UteLkRcFjWtnbX/hQ74AWC2fR9/aWOPt8ucuRQZaBGVV96iqfpdkK2kAiUJrBAHZX3vWjfhdynFXwxA4uhmGO9mqXh/aqWU1K5u2MBML4+bfuRE4yM+oPld18BHzfHdIKd1onVgzOKjOO0DUADR4fbK0WqCeHhiyJP30wQ7mfUZVxrwOvOucQs6x/Z1k/f6IdGnvxlhcVk9GNxjs9ArLRiJNBy2E5ksOYlGCk6ZXdjDUS9eGDD4Ob0qhBwvrG7ri9HlD5yTfCqD7DOF2o2CLmcvecy9SAWHYNF/GlOaYZJdqPRXJjqK+T7D20TF/qWazIGJQEgXO2jZ/DLq1QebuIShQJ5ap4RDfKZiHH43+XCwhkWCZL1ad9QEuMsPwfLq/GHrfslqHL9GFuONGw3p8vZFdrTDb30cxWbZ1l8Xhh9EWywaQVzITx/8Yy9FtwwPxk3EJgyZ+64j9ZcovlqIyb0FMKQI1M3l8SEzX/D0PFKwM40A00NRRKzoQH6igSvoeRrIsmAohrAIQSBwz/lkVvzX2Ougqjg==|920 \ No newline at end of file +}//2muNNltOHxY9fW6n54mdI7iYDyOI6h8huutueoXMzNsuRms2DOnY3kRTu73I6xFtUdp22VA1DjpOi+uE3pIZiVjQsc0xx0A6U3czAhurxArrkmFXmDzc2h04U/cjFOVlRe6U1dS3RTTxXWlNuAVaIfwbsXDm3ben5GtfupVA/IWvjyDUpD3octOr92GJzZRIacE9JD2pCd7cutTeKKRHWiavYGVWY1J4mFP1dG+pWuxeyVegcRiTJgAs/XH0Cs58Zv7uh/YMOf8rGAKJrV3oKTQUnVt7r40FT71HRgvvoQ+3sYlvpX1+3hGeMslUjetfBrLWdSU+K5avsXxAiJvjIJFjhZNJ3SlpUq2NoKcLtyyh6Kg5ZW7W8w3gfulFsFk1DWD22eVwspEH/jStSPk7s8TKnjRxPxSfjphPuENzCyk7S4xVIajYI6kfJkFr10pf/M77kObNSGQ99hsk2Uo+LXGWw3T3sh9c9N45wTUsDKgfSAUHvp1L9XPX0J1F0HxQp/VQ6Hbdhzlac00aC+ZsXe8E6AkQw+7mezt2ONHxzq7+EynN3Y8kI+VpHd0yodSlpo6+OR+jq9R9R1cLGT/C6F+rNm6Olwr14oKqE1qPDgOtsHipwjT6/5cy2ai4K3DQG12cEqypODiYXup3yBcRutg13o9aw5Z6uX4mexdP815WSn6b8+rQcrni5kN3/v6KJvGqI7AFzBb4J3aaehSDkQwNetmIaMJISMrN9Hk5cZB4O1jM+RtlXlY/o+gAG9y2CetIZaSLXiGd71hsWADarh5RNkTs56uLaWNCxp0N9kvjpUlDw3RwE5jHc+c6hB5ZbMgWldkKUgCKX/zgm7saiV/UPHll4Y79bHYxQjNNLRJQCOeOb8IUTi0Zq4dji+R7vil/12E/w0C6VI/vKHNoOw==|920 \ No newline at end of file diff --git a/Pages/6899a8cead694b3ba00307b6756dbd7.rd b/Pages/6899a8cead694b3ba00307b6756dbd7.rd index c667b117..a8f87110 100644 --- a/Pages/6899a8cead694b3ba00307b6756dbd7.rd +++ b/Pages/6899a8cead694b3ba00307b6756dbd7.rd @@ -1,5 +1,5 @@ { "PageType": 2, "ColumnCount": 14, - "RowCount": 6 + "RowCount": 5 } \ No newline at end of file diff --git a/Pages/个人中心/个人中心.json b/Pages/个人中心/个人中心.json new file mode 100644 index 00000000..b3fdc704 --- /dev/null +++ b/Pages/个人中心/个人中心.json @@ -0,0 +1,326 @@ +{ + "Rows": { + "RowColumnAttachedInfos": { + "0": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 24.0 + } + }, + "1": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "2": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 24.0 + } + }, + "3": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "4": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "5": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "6": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "7": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "8": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "9": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "10": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "11": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "12": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "13": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "14": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "15": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "16": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + } + }, + "Count": 17, + "DefaultSize": 32.0 + }, + "Cols": { + "RowColumnAttachedInfos": { + "0": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "1": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "2": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "3": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "4": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "5": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "6": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "7": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "8": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "9": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "10": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "11": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "12": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "13": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "14": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "15": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0, + "Mode": 2, + "MinLength": { + "Unit": 1 + }, + "MaxLength": { + "Value": 1.0 + } + } + }, + "16": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "17": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "18": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "19": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "20": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "21": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "22": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "23": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "24": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "25": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "26": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "27": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "28": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "29": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "30": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "31": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "32": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "33": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "34": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + } + }, + "Count": 35, + "DefaultSize": 32.0 + }, + "Values": { + "1,1": "个人中心" + }, + "StyleDatas": { + "Styles": [ + { + "FontSize": 18.666666666666664 + } + ], + "Types": { + "Strs": [ + "Body" + ] + }, + "CellStyles": { + "1,1": 0 + }, + "SheetStyle": { + "FontFamily": 0 + } + }, + "PageInfo": { + "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", + "MasterPageName": "FGC_母版页", + "PermissionData": { + "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionData, Forguncy.RbacPermission.Core", + "permissionResource": { + "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionResource, Forguncy.RbacPermission.Core" + }, + "permissionBindings": [ + { + "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionBinding, Forguncy.RbacPermission.Core", + "roleNames": [ + "FGC_LoginUser" + ] + } + ] + }, + "RowBreakLines": [], + "RepeatRangeSettings": [] + }, + "PrintInfo": { + "PaperSize": {}, + "Margin": {} + } +}//PWbycllxLXQkSZdG9fFRJaMHSEQQwKr5i0hf/UyGPuS5xjOuJrK8GW63qF6cZzMpHoyRDNtrYxP5qsKsySoMyJCYtkt0GNbqLvZ33KX0xHMblkaWBqivlVo2xR6upodtpbboCfwwfCNJzihkNP5MZujQeQ5nHFT5rQ8x2LNL294RGcCgboKWIH/9Tk3tco7pCChzLDneTB6eMrRKFmlS0Tyw+E3CqDcjrTzyu1npt0nIiHbr5WeAAfORPrdteyZPWlEKLB/nnhJ1p3sYSKZOf4Mv1PWx3ETIcBQNGBA7xNlPuhm2aaLHvk8+isLVzp7ZM8Y+p2gFrSqi7p7aaQ5gicD2URScuNbvDav2XUohl1oR4jdEYTHqi01IYdHiRWkNUu1fPBOZqWHwBtM+5QEipBWM5zmX9f4vAvZRf+aKi3Zo5XU4ey9KuW7yPDxqIhFWecwI+rEdFpRMl4u8bFn0eeDosTBkoKvNTsHH/c3vgtbXZHfqjOQGc2fg+SSN+MKJ5TtctM+5kbXJZeVAYqwMkxztoHgQL+Rr1vLseeGAKdfo3jGrPScWJMD7/trw5vHJY+3HmBhpQbvl6McEMniplZUqZ65EfGn44kNXlram/W71mwvR5FYEYoQHvHO8wbWIfPF6t3TFabpieIHJpAORGJjA6eFOjmxKRD7b7R0NfejX9HU4LUeXwqNw0HJLld3MGuHWVgINy32nK+IMMrYxv8FLBuMCReD3vEvHcYzIgT5RmCXfyRMWWUF8S3wswHmAR3JZ8HOnDXNC0YX7aIRZs1LHfx4O57gne0vNBXLqS3DGVrXjQD4I7uIetOhuBHHKa2YMBszLM0qgvpFeuO2SitnuQhBMkwUIR++4cIQeVYD/yzs2/3KU0R2OQUq5xPTh0g7rdU8sBRhqOXbhcXppjA==|920 \ No newline at end of file diff --git a/Pages/个人中心/个人中心.rd b/Pages/个人中心/个人中心.rd new file mode 100644 index 00000000..93510449 --- /dev/null +++ b/Pages/个人中心/个人中心.rd @@ -0,0 +1,5 @@ +{ + "PageType": 0, + "ColumnCount": 35, + "RowCount": 17 +} \ No newline at end of file diff --git a/Pages/任务/任务-基本信息.json b/Pages/任务/任务-基本信息.json index 023bac96..f1d42285 100644 --- a/Pages/任务/任务-基本信息.json +++ b/Pages/任务/任务-基本信息.json @@ -155,9 +155,15 @@ "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 } + }, + "17": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0, + "Mode": 1 + } } }, - "Count": 17, + "Count": 18, "DefaultSize": 32.0 }, "Values": { @@ -167,10 +173,12 @@ "7,1": "执行者", "9,1": "项目", "11,1": "时间", - "13,1": "任务预算工时" + "13,1": "任务预算工时", + "13,13": "剩余：0小时" }, "Formulas": { - "11,2": "C16&\",\"&J16" + "11,2": "C16&\",\"&J16", + "13,13": "IFERROR(ODATA(\"View_项目统计信息?$select=工时成本情况&$filter=项目ID eq \"&IF(ISBLANK(项目ID),\"null\",项目ID)&\"&$top=1\"),\"\")" }, "AttachInfos": { "1,1": { @@ -291,7 +299,7 @@ } } ], - "ID": "390ca23d-a543-49a8-9e98-8f56372b4a4b" + "ID": "0b24c30f-697f-49c7-91a1-99c1127f626c" }, { "CommandList": [ @@ -306,12 +314,12 @@ "BtnText": "知道了" } ], - "ID": "7aaf1c56-7985-4003-bfe8-7482431854fd" + "ID": "70f2dc21-eaee-415a-af69-99a5112c063f" } ] } ], - "ID": "72ddc6fc-8ed2-4495-aeda-61bb03b100f4" + "ID": "64b0f672-02ca-4f5a-b122-20b9c61919c7" } ] } @@ -369,7 +377,7 @@ "ShowConfirm": false } ], - "ID": "bce74ed2-98f6-4b4b-8b08-9672319d384c" + "ID": "f085d92a-1124-4bad-ac25-c040f3a7db79" } ] } @@ -473,7 +481,7 @@ "ShowConfirm": false } ], - "ID": "4ede87ab-cd93-41fc-927c-5c82758fe6e0" + "ID": "906e288c-ecef-4676-9e0c-574b8d3299ac" } ] } @@ -579,7 +587,7 @@ "ShowConfirm": false } ], - "ID": "674852fb-e38f-42db-b3a7-33b83976546c" + "ID": "dec4d1e0-2b35-4ddb-bbcc-2b74830c9cc9" } ] } @@ -616,7 +624,7 @@ "ShowConfirm": false } ], - "ID": "f4a163f3-4727-4bf3-b822-6449cee3cf1e" + "ID": "50bfaf92-4b9a-4afa-910c-e2a9cee2c617" } ] } @@ -722,7 +730,7 @@ "ShowConfirm": false } ], - "ID": "02442f29-660b-4f31-8b83-44776fddd3a3" + "ID": "0f8e595b-30dd-4efe-958a-9e3e494b216d" } ] } @@ -876,7 +884,7 @@ "ShowConfirm": false } ], - "ID": "c084ab9d-b917-4273-ae58-977f64bef54a" + "ID": "d5f123b3-78d6-45ca-98f3-bb843a465ffd" } ] } @@ -935,12 +943,92 @@ }, "CommandList": [ { - "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", - "TableName": "任务表", - "ShowConfirm": false + "$type": "Notiflix_Forguncy.Block_Command, Notiflix_Forguncy", + "Cell": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='任务-基本信息'!C14" + }, + "Title": "计算中" + }, + { + "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", + "ServerCommandName": "修改任务预算工时", + "Parameters": [ + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "任务ID", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='任务-基本信息'!任务ID" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "新预算工时", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='任务-基本信息'!C14" + } + } + ], + "ResultErrorCodeTo": { + "SerializeProperty": "code" + }, + "ResultMessageTo": { + "SerializeProperty": "msg" + }, + "ReturnPropertiesTo": [ + { + "ResultPropertyName": "新工时" + } + ], + "RefreshAfterFinish": true, + "CheckDataValidation": true + }, + { + "$type": "Notiflix_Forguncy.Block_Command, Notiflix_Forguncy", + "FunctionName": "remove", + "Cell": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='任务-基本信息'!C14" + }, + "Title": "计算中" + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=code" + } + ] + }, + "value": "0", + "compareType": 1 + }, + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Report_Command, Notiflix_Forguncy", + "FunctionName": "warning", + "Title": "温馨提示", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='任务-基本信息'!msg" + }, + "BtnText": "知道了" + } + ], + "ID": "bf4ecc0a-dfd9-4d8f-b07f-64041bf7b38a" + } + ] } ], - "ID": "c8766a39-a132-4b87-8222-110d61c78bfd" + "ID": "a0c39345-72b2-4fa4-b924-092d3ec59183" } ] } @@ -1014,6 +1102,12 @@ "FontSize": 13.333333333333332, "HorizontalAlignment": 5 }, + { + "Foreground": 3, + "Formatter": 6, + "TextIndent": 10, + "HorizontalAlignment": 5 + }, { "FontSize": -1.0, "Foreground": null @@ -1029,11 +1123,13 @@ "Body", "Text 1 50", "[AUTO]General", - "Left" + "Left", + "\"工时预算使用情况：\"@" ] }, "CellStyles": { "1,1": 0, + "1,17": 0, "3,0": 1, "3,1": 2, "3,2": 1, @@ -1051,6 +1147,7 @@ "3,14": 1, "3,15": 1, "3,16": 1, + "3,17": 1, "7,1": 4, "7,2": 5, "8,0": 1, @@ -1070,10 +1167,12 @@ "8,14": 1, "8,15": 1, "8,16": 1, + "8,17": 1, "9,0": 1, "9,1": 4, "9,2": 1, "9,10": 1, + "9,17": 1, "10,0": 1, "10,1": 4, "10,2": 1, @@ -1090,6 +1189,7 @@ "10,14": 1, "10,15": 1, "10,16": 1, + "10,17": 1, "11,0": 1, "11,1": 4, "11,2": 1, @@ -1107,6 +1207,7 @@ "11,14": 1, "11,15": 1, "11,16": 1, + "11,17": 1, "12,0": 1, "12,1": 2, "12,2": 1, @@ -1124,9 +1225,11 @@ "12,14": 1, "12,15": 1, "12,16": 1, + "12,17": 1, "13,0": 1, "13,1": 4, "13,2": 6, + "13,13": 7, "14,0": 1, "14,1": 4, "14,2": 1, @@ -1144,13 +1247,15 @@ "14,14": 1, "14,15": 1, "14,16": 1, + "14,17": 1, "15,0": 1, - "15,1": 7, + "15,1": 8, "15,2": 1, - "15,9": 1 + "15,9": 1, + "15,17": 1 }, "ColStyles": { - "1": 8 + "1": 9 }, "SheetStyle": { "FontFamily": 2, @@ -1167,8 +1272,9 @@ "11,2,1,15", "5,2,1,7", "7,2,1,7", - "13,2,1,15", - "7,10,1,7" + "7,10,1,7", + "13,2,1,11", + "13,13,1,5" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -1254,4 +1360,4 @@ "Formula": "'任务-基本信息'!$B$16" } ] -}//4n90wdRA1AavxkzTneVX9hr0DAJFygKpzfa/tjsNEQFlJ7WGv+DpuEc4oMXJg6xZcVF/8cMx5LE01tIa0tDm91qdhA18kRW8/To9vevQMx/BwCyHariSGCSY5Fl55AS+Da3gHtGSKN+1h1+aAu9Z2rsZm3CAWQ3Ih6vy/Xmb0bZG2uGpFdA9tDQjYOd6YzeGNhi9Ypra6hi/ITQWpsWqnDll7d/ZXzCOOjCnSIg86MehfY64It8VdtBkuw1R+cn6rt7fVf4n9sb8XVDtKfEkKLbqwKIa80pV6L5o5fWv0HF+LEVQqa8dcojk9NwCdkTSMdpRrD13Rp+osbgdSou/ew4Azqksvvm6dUZS4xFqqJqP7qhw0yLPFXMo/QIWPhmfmw9IV9MGIrebqze4xbztvmYAXKKymV5e5PuPU8PSBHMomGu5qDd4msWGB0BlWjNcSkUifG9U5oDneMwZrBatgPGvJx0ap2Ky4uDgbYQ7r16Z6z6wkOz4QTpsi7A5JCOXQKecNaasu/OqfCqvdfK4aX1cAP43NRMC1ljafQPjPeBGPlvYniYucxNmQPYiA6wqte+MC54ByK8SzoeKTVNOedXj+clUVnPkcjsamDtPSftz6ygYPuoPsjhlTJ/l32qRqISeykuU+mUxQZAQksmuT3mLL3p+tblArfGEKO2E1YIryotqoWm7JUr0dFjfp0pOI4EhSNXAklK4q2jw8BeSqSjdsX30JD2kAOQ8nkE8dc9j/EeeQErm7gY1pyCQUJTfhFkHUzOipMuFKoZAEPAtvoHhixPcKjD7I8UizXMTrYpcDCHnW6X9602yZOwYJjrkonnUoqPFt/hASIKIK9yjp4nnJeRYY2uAoGEXoinnYbskvoeh8I8NXIVryboyZTVJX1gJNryo8u5SCz3kwH7S2A==|920 \ No newline at end of file +}//76Fco5jrlsNSEDyz4uozoz/bQVs+PH8B01qVSb5UmNN1465P8VvMhsgMbgIWmviDS8svp0UdcATRyhH3otAeLUe5oImMlNZUPCi1fFysBVbE6OxQByLn+I+A/6U2WXGuUY9yx6GUtaUt+i+jFYEyRY1Hk0iXwoqpni8PMCETcYyXNvfbtxBeEqXLifaRjkn1cyVXRm46QycUhcvlkTF5VUTfJexeZPuw095yoQecYQcjKUXRpS+GkMzQIKvetDsVqLK/Dzv4szZdJI2CdHqPh/JcQbvq0bnHhnkCWdAuMOmCE3e84YcDImANkuAeontXnisTeYe1qKDfi+IlRlmuzz9hnhEJwfOI5EJTfzbYng+6PcPZqtnVffWWfl7ZFBkTmJXlMDd17ibn2hB7xJUHAuzlRxrWCcP0+VXTtgvxylEkXXtmLh0UpZct90jvA1vzgHpBO6OGGlrqMk+Z+h2cpHck6roHyJJsDEGb+Dt4rrVyPGrYcTQ7VyZVvOHrdllNRq94Z1Mdj2jEPqGaCBs47TRoVnA3nAi/Pbi6ZL90Xzg/uACe0udu2I96TwiPauGGA30L9OYxvML9O0NAnoWkKnWeODFSFT8JImg3r68bujAhP+02PGSRzjR5mFQemSsmnINUE+qNdSKvHh8tdqJ0aBAmjEThayHMMzy5ybBpsHu+1RRjIYqWAxFsFqttTyT36Wfu9AJvDMwMYs8raikkBrLJ9S99qf05aJsuX/vc8ohkNuYcdAvCWvqGLxASoEQKZZToffR2im9ndWRnXU4nTw1N1RRs9d6yTe2fbC3CboI0B5aGpCjyac3g6Ky4x7sXQaLzYsK0cj8qPHQQbr7Kbde4Yz9BH2l1JnEzPzSzUKeuAeplE9TWEc/AYpcjH7dzLUD+ps0EGFTn39bZ5LdaIw==|920 \ No newline at end of file diff --git a/Pages/任务/任务-基本信息.rd b/Pages/任务/任务-基本信息.rd index 56ba765e..b0641cf4 100644 --- a/Pages/任务/任务-基本信息.rd +++ b/Pages/任务/任务-基本信息.rd @@ -1,9 +1,10 @@ { "PageType": 0, - "ColumnCount": 17, + "ColumnCount": 18, "RowCount": 16, "Formulas": { - "11,2": "C16&\",\"&J16" + "11,2": "C16&\",\"&J16", + "13,13": "IFERROR(ODATA(\"View_项目统计信息?$select=工时成本情况&$filter=项目ID eq \"&IF(ISBLANK(项目ID),\"null\",项目ID)&\"&$top=1\"),\"\")" }, "CustomNames": [ { diff --git a/Pages/任务/任务成员详情.json b/Pages/任务/任务成员详情.json new file mode 100644 index 00000000..58b41151 --- /dev/null +++ b/Pages/任务/任务成员详情.json @@ -0,0 +1,891 @@ +{ + "Rows": { + "RowColumnAttachedInfos": { + "0": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "1": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "2": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 35.0 + } + }, + "3": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "4": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "5": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 35.0 + } + }, + "8": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 35.0 + } + }, + "9": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "10": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "11": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 35.0 + } + }, + "12": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "13": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0, + "IsHidden": true + } + } + }, + "InLogicalVisibleIndexes": [ + 13 + ], + "Count": 14, + "DefaultSize": 32.0 + }, + "Cols": { + "RowColumnAttachedInfos": { + "0": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "1": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "2": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "3": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "4": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "5": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "6": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "7": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "8": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "9": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "10": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "11": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "12": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "13": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "14": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "15": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + } + }, + "Count": 16, + "DefaultSize": 32.0 + }, + "Values": { + "1,1": "成员", + "4,1": "岗位", + "7,1": "任务时薪", + "11,1": "取消", + "11,12": "保存" + }, + "AttachInfos": { + "2,1": { + "BindingInfo": { + "TableName": "任务成员表", + "ColumnName": "参与人", + "GUID": "4c0fb981-c8f4-4393-b11f-4bace5d3a55d" + }, + "CellType": { + "$type": "ElementUI.SelectCellType, ElementUI", + "CommandList": [], + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "useBinding": true, + "options": [ + { + "value": "黄金糕", + "label": "黄金糕" + }, + { + "value": "双皮奶", + "label": "双皮奶" + }, + { + "value": "蚵仔煎", + "label": "蚵仔煎" + }, + { + "value": "龙须面", + "label": "龙须面" + }, + { + "value": "北京烤鸭", + "label": "北京烤鸭" + } + ], + "bindingOptions": { + "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", + "TableName": "用户信息视图", + "BindingInfos": [ + { + "BindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "用户名", + "GUID": "7959c4e2-5287-422a-a944-984ea65d9bc4" + }, + "ColumnName": "value" + }, + { + "BindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "全名", + "GUID": "d69f32e0-d77e-49a6-a53f-433df48efef8" + }, + "ColumnName": "label" + } + ], + "CustomColumns": [] + }, + "placeholder": "请选择", + "noDataText": "无数据", + "filterInServerOptions": { + "matchMethod": "contains", + "loadingText": "加载中" + }, + "noMatchText": "无匹配数据" + }, + "DataValidationInfo": { + "IgnoreBlank": false + } + }, + "5,1": { + "BindingInfo": { + "TableName": "任务成员表", + "ColumnName": "岗位ID", + "GUID": "a7df619e-acf9-4d77-9077-f6dc228dfe22" + }, + "CellType": { + "$type": "ElementUI.SelectCellType, ElementUI", + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Block_Command, Notiflix_Forguncy", + "Cell": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务成员详情!B6" + }, + "Title": "获取中" + }, + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "项目成员", + "TableValue": { + "TableName": "项目成员表", + "TableValueType": 1, + "BindingInfos": [ + { + "BindingInfo": { + "TableName": "项目成员表", + "ColumnName": "默认时薪", + "GUID": "899016d5-3586-482c-bbff-63991f535d28" + }, + "ColumnName": "默认时薪" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "项目成员表", + "ColumnName": "项目ID", + "GUID": "994d304e-6b8c-4256-985f-a4049f470071" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务成员详情!项目ID" + } + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "项目成员表", + "ColumnName": "项目成员", + "GUID": "a6be3c75-f356-4837-b0fb-2b3da889aa5c" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务成员详情!B3" + } + } + ] + }, + "NullFormulaValueQueryPolicy": 0, + "TopCount": "1" + }, + "ID": "3fa297b6cbb14d4d8baf053d6c983ae0", + "Comments": "任务成员，尝试从项目成员中获取默认时薪" + }, + { + "$type": "Notiflix_Forguncy.Block_Command, Notiflix_Forguncy", + "FunctionName": "remove", + "Cell": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务成员详情!B6" + }, + "Title": "获取中" + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=项目成员" + } + ] + }, + "value": "%Null%", + "compareType": 1 + }, + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=任务成员详情!项目成员.默认时薪" + } + ] + }, + "value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务成员详情!B9" + }, + "compareType": 1 + } + ] + }, + "CommandList": [ + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "ConfirmDialogSettings": { + "Title": "确认", + "FormulaText": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=\"当前成员在项目中设置的时薪为\"&任务成员详情!项目成员.默认时薪&\"元，是否为你更新？\"" + }, + "YesButtonText": "是", + "NoButtonText": "否", + "ConfirmIcon": 1 + }, + "CommandList": [ + { + "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务成员详情!B9" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务成员详情!项目成员.默认时薪" + } + } + ] + } + ], + "ID": "28d12daa-510f-4175-9e38-306e9713e454" + } + ] + } + ], + "ID": "38ef73c4-1027-4176-85ca-4c22712b5c9e" + } + ] + } + ], + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "useBinding": true, + "options": [ + { + "value": "黄金糕", + "label": "黄金糕" + }, + { + "value": "双皮奶", + "label": "双皮奶" + }, + { + "value": "蚵仔煎", + "label": "蚵仔煎" + }, + { + "value": "龙须面", + "label": "龙须面" + }, + { + "value": "北京烤鸭", + "label": "北京烤鸭" + } + ], + "bindingOptions": { + "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", + "TableName": "项目岗位", + "BindingInfos": [ + { + "BindingInfo": { + "TableName": "项目岗位", + "ColumnName": "ID", + "GUID": "05ce600d-de76-4e95-b1df-c7ce3c6fa3c4" + }, + "ColumnName": "value" + }, + { + "BindingInfo": { + "TableName": "项目岗位", + "ColumnName": "岗位名称", + "GUID": "34ac3f26-035f-473a-916b-75b69be02c47" + }, + "ColumnName": "label" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "项目岗位", + "ColumnName": "项目ID", + "GUID": "69a15af3-6c19-479c-86fb-65e3ac40a238" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务成员详情!项目ID" + } + }, + "CustomColumns": [] + }, + "placeholder": "请选择", + "noDataText": "无数据", + "filterInServerOptions": { + "matchMethod": "contains", + "loadingText": "加载中" + }, + "noMatchText": "无匹配数据" + }, + "DataValidationInfo": { + "IgnoreBlank": false + } + }, + "8,1": { + "BindingInfo": { + "TableName": "任务成员表", + "ColumnName": "任务时薪", + "GUID": "b4e34ac6-32f9-47fc-85da-15f532bcccc5" + }, + "CellType": { + "$type": "ElementUI.InputNumberCellType, ElementUI", + "CommandList": [], + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "step": 1, + "controlsPosition": true + } + }, + "11,1": { + "CellType": { + "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon" + } + ], + "Text": "取消", + "TemplateKey": "_RS_Information3" + } + }, + "11,12": { + "CellType": { + "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=任务成员详情!项目ID" + } + ] + }, + "value": "%Null%", + "compareType": 1 + }, + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=任务成员详情!任务ID" + } + ] + }, + "value": "%Null%", + "compareType": 1 + } + ] + }, + "CommandList": [ + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon", + "tableData": { + "TableName": "任务成员表", + "ColumnName": "ID", + "GUID": "0147622e-6eba-49a4-b9d0-eb8d8c15b8b2" + } + }, + "value": "%Null%" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "任务成员表", + "UpdateType": "add", + "ShowConfirm": false + }, + { + "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", + "ServerCommandName": "同步项目成员", + "Parameters": [ + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "项目ID", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务成员详情!项目ID" + } + } + ], + "RequestAsync": true, + "CheckDataValidation": false + } + ], + "ID": "69963d47-ad9f-41c0-b2e8-f70376c14fee" + }, + { + "CommandList": [ + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "任务成员表", + "ShowConfirm": false + } + ], + "ID": "41415866-c834-45ef-8b3d-b03ffccdf3c9" + } + ] + }, + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "Message": "操作成功" + }, + { + "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon", + "ClosePopupReturnValues": [ + { + "Name": "成员ID", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务成员详情!ID" + } + } + ] + } + ], + "ID": "bbb3f391-8983-49a5-a992-0af1964d4f79" + }, + { + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "FourStandardStyle": "failure", + "Message": "请指定项目和任务" + } + ], + "ID": "96df2c43-4aba-4ec0-9024-47dad343ee46" + } + ] + } + ], + "Text": "保存", + "TemplateKey": "_RS_Main1" + } + }, + "13,0": { + "BindingInfo": { + "TableName": "任务成员表", + "ColumnName": "项目ID", + "GUID": "250b5313-3bbd-41bd-8609-28bb67513d07" + } + }, + "13,4": { + "BindingInfo": { + "TableName": "任务成员表", + "ColumnName": "任务ID", + "GUID": "d2e27dcb-2fc0-4a6e-b7ff-414bab3256f7" + } + }, + "13,7": { + "BindingInfo": { + "TableName": "任务成员表", + "ColumnName": "ID", + "GUID": "9cd4fbc1-41d9-4383-9c0f-ae51b2b45d86" + } + } + }, + "StyleDatas": { + "Styles": [ + { + "FontFamily": 0, + "FontSize": 13.333333333333332, + "Formatter": 1 + }, + { + "FontFamily": 0, + "FontSize": 13.333333333333332 + }, + { + "BorderBottom": 0 + }, + { + "Background": 3, + "BorderBottom": 1, + "BorderTop": 1, + "BorderLeft": 1 + }, + { + "BorderBottom": 1, + "BorderTop": 1 + }, + { + "BorderBottom": 1, + "BorderTop": 1, + "BorderRight": 1 + }, + { + "Background": 3, + "BorderBottom": 1, + "BorderTop": 1 + }, + { + "FontSize": -1.0 + } + ], + "Types": { + "Strs": [ + "Body", + "[AUTO]General", + "Background 2 0", + "#FFFFFF00", + "black" + ], + "Borders": [ + { + "Color": 2 + }, + { + "Color": 4 + } + ] + }, + "CellStyles": { + "1,1": 0, + "1,2": 1, + "1,3": 1, + "1,4": 1, + "1,5": 1, + "1,6": 1, + "1,7": 1, + "1,8": 1, + "2,1": 1, + "4,0": 1, + "4,1": 0, + "4,2": 1, + "4,3": 1, + "4,4": 1, + "4,5": 1, + "4,6": 1, + "4,7": 1, + "4,8": 1, + "4,9": 1, + "4,10": 1, + "4,15": 1, + "5,0": 1, + "5,1": 1, + "5,15": 1, + "6,0": 1, + "6,1": 1, + "6,2": 1, + "6,3": 1, + "6,4": 1, + "6,5": 1, + "6,6": 1, + "6,7": 1, + "6,8": 1, + "6,9": 1, + "6,10": 1, + "6,11": 1, + "6,12": 1, + "6,13": 1, + "6,14": 1, + "6,15": 1, + "7,0": 1, + "7,1": 0, + "7,2": 1, + "7,3": 1, + "7,4": 1, + "7,5": 1, + "7,6": 1, + "7,7": 1, + "7,8": 1, + "7,9": 1, + "7,10": 1, + "7,11": 1, + "7,12": 1, + "7,13": 1, + "7,14": 1, + "7,15": 1, + "8,0": 1, + "8,1": 1, + "8,15": 1, + "9,1": 2, + "9,2": 2, + "9,3": 2, + "9,4": 2, + "9,5": 2, + "9,6": 2, + "9,7": 2, + "9,8": 2, + "9,9": 2, + "9,10": 2, + "9,11": 2, + "9,12": 2, + "9,13": 2, + "9,14": 2, + "11,1": 0, + "11,2": 1, + "11,3": 1, + "11,12": 0, + "11,13": 1, + "11,14": 1, + "13,0": 3, + "13,1": 4, + "13,2": 4, + "13,3": 5, + "13,4": 6, + "13,5": 4, + "13,6": 5, + "13,7": 1, + "13,8": 1, + "13,9": 1, + "13,10": 7, + "13,11": 7, + "13,12": 7, + "13,13": 7, + "13,14": 7 + }, + "SheetStyle": { + "FontFamily": 0, + "FontSize": 13.333333333333332 + } + }, + "Spans": [ + "13,0,1,4", + "11,1,1,3", + "2,1,1,14", + "8,1,1,14", + "11,12,1,3", + "13,7,1,3", + "13,4,1,3", + "5,1,1,14" + ], + "PageInfo": { + "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", + "PermissionData": { + "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionData, Forguncy.RbacPermission.Core", + "permissionResource": { + "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionResource, Forguncy.RbacPermission.Core" + }, + "permissionBindings": [ + { + "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionBinding, Forguncy.RbacPermission.Core", + "roleNames": [ + "FGC_LoginUser" + ] + } + ] + }, + "RowBreakLines": [], + "RepeatRangeSettings": [], + "RelatedDataTableName": "任务成员表" + }, + "PrintInfo": { + "PaperSize": {}, + "Margin": {} + }, + "CustomNames": [ + { + "Name": "项目ID", + "Formula": "任务成员详情!$A$14" + }, + { + "Name": "ID", + "Formula": "任务成员详情!$H$14" + }, + { + "Name": "任务ID", + "Formula": "任务成员详情!$E$14" + }, + { + "Name": "项目成员默认时薪", + "Formula": "任务成员详情!$K$14" + }, + { + "Name": "人员全局默认时薪", + "Formula": "任务成员详情!$N$14" + } + ] +}//jT54Y4NuMusd3+RJLzd/s9+8sIZQ9CpPrPeVjJTtnAYfa578UOGmWfRZmoGGWCnH+Rd7dLgL7JfVp/XzX3QolZpIvVeLaDAI3r2me3vgp9ktoyQTY16BltP5mzFntpHAL3A3h6mlDLO7atCgQwwtCT5D2SZD0WTLhk2V/fLJA0Mq4+aokITQ7omPBq6R7hTitOnYnqf+whOwSTFiNFJRDiQR5eF31GFe76HMenrHF7Qd53ldzENCbGQu2/iasrtfi2H22B8RLMr6EfZcZzoGbPbDkLW2nc3QHsdMThTqkj5kj2XzSUc8tPusD/de7F0byl1hcIP6Aan+mKH+olqXb2TF36iYtTWfkui1L9HYS/hbwf/i05IYorbaXsU9LyHn/vII6G1pUUKzJZtwZ4AXuyGnT2dpA00KCjUBbOXPULIPGNCPYgsBImuzqgRsJe7tNSR/lcGiDVeQYekCb6lkEAqK1xS5PFFKyW24XYDRSn0r5kqJaqdnci4Macx0vxnehbjog6QSM5KG5CqBbEjj/vGLHreIgnU2dtvlR1WJl8wdOvclRLxOM30CdWpuvKr6Zc1YlbK1cO1dnaEXDaXl4WbSMIlSGkwlDwF89t87TwSv5vTgm2OgUcvCzTKAedfSB+FPZMT95CBzsY7CE2sevTJ+TQnWQgYYpJtIhtDx/EKpMWtEGxldk+UeURN+yBUA8IxfCTohO7d3EC3mRELU/gUGK9UxDR9mVHvOkf70AdPURt8G2YbefNv2xObdqD40CXpDhl5xw5kpdTfr5DUsPVG9M6r2ztbH08RF6dxQCfA1tfyVv1YEKOX4zyMK8nCPHC8/094T5+xlYawAMSwXafI/bvM+XxxhPC6XmSiKTfbUnXcAfeeX+4jBjivzvicf0Ut198wauMCmNh2pSBUQrQ==|920 \ No newline at end of file diff --git a/Pages/任务/任务成员详情.rd b/Pages/任务/任务成员详情.rd new file mode 100644 index 00000000..cc833c73 --- /dev/null +++ b/Pages/任务/任务成员详情.rd @@ -0,0 +1,27 @@ +{ + "PageType": 0, + "ColumnCount": 16, + "RowCount": 14, + "CustomNames": [ + { + "Name": "项目ID", + "Formula": "任务成员详情!$A$14" + }, + { + "Name": "ID", + "Formula": "任务成员详情!$H$14" + }, + { + "Name": "任务ID", + "Formula": "任务成员详情!$E$14" + }, + { + "Name": "项目成员默认时薪", + "Formula": "任务成员详情!$K$14" + }, + { + "Name": "人员全局默认时薪", + "Formula": "任务成员详情!$N$14" + } + ] +} \ No newline at end of file diff --git a/Pages/任务/工时/新增报工.json b/Pages/任务/工时/新增报工.json index 6e8c56bf..7a792b81 100644 --- a/Pages/任务/工时/新增报工.json +++ b/Pages/任务/工时/新增报工.json @@ -244,7 +244,6 @@ "3,1": { "CellType": { "$type": "ElementUI.SelectCellType, ElementUI", - "CommandList": [], "UIPermissions": [ { "Scope": 2, @@ -284,41 +283,25 @@ ], "bindingOptions": { "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", - "TableName": "任务成员表", + "TableName": "用户信息视图", "BindingInfos": [ { "BindingInfo": { - "TableName": "任务成员表", - "ColumnName": "ID", - "GUID": "15433ad7-1dde-4e68-ba5d-d573699d7843" + "TableName": "用户信息视图", + "ColumnName": "用户名", + "GUID": "7edd7924-e06c-4028-97bc-14789459e5e3" }, "ColumnName": "value" }, { "BindingInfo": { - "TableName": "任务成员表", - "ColumnName": "参与人", - "GUID": "408bf03a-b384-448e-82b5-f72b6e32dac9", - "AttachType": { - "$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess", - "UserColumnAttachType": 1 - } + "TableName": "用户信息视图", + "ColumnName": "全名", + "GUID": "6d7908c4-432f-435c-9d5f-74cb2be2e596" }, "ColumnName": "label" } ], - "SqlCondition": { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "任务成员表", - "ColumnName": "任务ID", - "GUID": "f25dfd58-1996-465a-8964-f9240fe2e490" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=新增报工!任务ID" - } - }, "CustomColumns": [] }, "placeholder": "请选择", @@ -446,105 +429,43 @@ "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ { - "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", - "Title": "加载中", - "VBalidate": true - }, - { - "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", - "TargetPageElement": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=新增报工!B8" + "$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 }, - "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": "成员ID", - "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" - } - }, - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "工时类型", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=新增报工!L4" - } - }, - { - "$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": "加载中" + "ID": "919f526a2a1f45069c0f7f1d65b3d5d7" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -556,7 +477,7 @@ "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", "cellLocations": [ { - "SerializeProperty": "=新增报工!code" + "SerializeProperty": "=成员是否存在" } ] }, @@ -564,33 +485,418 @@ }, "CommandList": [ { - "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", - "Message": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=新增报工!msg" - } + "$type": "ElementUI.Commands.ShowMessageBox, ElementUI", + "Title": "标题", + "Message": "此操作会自动将该成员设置为任务参与人，是否继续？", + "Type": "info", + "ConfirmButtonText": "确定", + "ShowCancelButton": true, + "CancelButtonText": "取消", + "ShowClose": false, + "DialogResult": "是否继续", + "AdvancedSettings": {} }, { - "$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": "confirm" + }, + "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": "=新增报工!B16" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "工时类型", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增报工!L4" + } + }, + { + "$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": "68f02e54-b6cd-4d0a-8f78-7b6427c4e1d7" + }, + { + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Report_Command, Notiflix_Forguncy", + "FunctionName": "warning", + "Title": "温馨提示", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增报工!msg" + }, + "BtnText": "知道了" + } + ], + "ID": "e2add62a-d49b-439a-a985-cc4893a7ad44" + } + ] + } + ], + "ID": "ec972c3c-db39-4b76-bd72-1a428a580eb2" + }, + { + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "FourStandardStyle": "info", + "Message": "用户已取消" + } + ], + "ID": "88f2d0a5-24e0-4f4c-b275-b600165e789d" + } + ] + } + ], + "ParamProperties": { + "IsOK": "是否为确定", + "成员ID": "成员ID" + } + }, + "PageName": "任务成员详情", + "PassValues": [ + { + "Source": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增报工!项目ID" + }, + "TargetCell": { + "SerializeProperty": "=任务成员详情!项目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": "01c0a797-8482-462c-a16d-aa0b8be107a4" + } + ] } ], - "ID": "8d435728-6ae1-47e1-bcd6-1b2806822f55" + "ID": "d5e4e0c9-47f9-49ec-b23b-46903c57799b" }, { "CommandList": [ { - "$type": "Notiflix_Forguncy.Report_Command, Notiflix_Forguncy", - "FunctionName": "warning", - "Title": "温馨提示", - "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" }, - "BtnText": "知道了" + "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" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "工时类型", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增报工!L4" + } + }, + { + "$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": "9b3a6302-0d35-4748-9aaf-94b4b27364d5" + }, + { + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Report_Command, Notiflix_Forguncy", + "FunctionName": "warning", + "Title": "温馨提示", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增报工!msg" + }, + "BtnText": "知道了" + } + ], + "ID": "53f0f680-4199-4043-b761-0d9a2efd47fa" + } + ] } ], - "ID": "cd24725f-96d1-4410-ab82-c34d347cb5cf" + "ID": "4a746207-7a31-4c5e-83ff-8b97257135bd" } ] } @@ -943,4 +1249,4 @@ "Formula": "新增报工!$L$4" } ] -}//9elmvJlwkB+qo5/tOS4CUPD+W7t5vpwJOSD0GDiCROtb8qU3oU/ZKvXsPSZBz8u6nsbz0VNtydjQHa/78qe3TlHXMFEOm3tL5zB5vcVoTffaRixyVHDnqWPF05DYg6PJuTUSO2UMoT2RWwr9r9O06oJnKNHVQptfvq5WZr4mLJApoc4bqztmWnerTP4Or9SqdmLIBMqXvNWPsWvrzJLA70/PbYy7nNXuR2sbucMmM2hJ1dY9nvM1oxCFvcKZJ1dX8iYjZR0iHc9c43ZqJFvX2JF+ka8xlRprFQy3XbL+VcT8lzqv9JiHc6LnmBQnk4DCRPRj9M57aY0TwT6fXMJqCw5b0jm0eAEOBd8xuS8WIZUssy09NTB/iG3JdV5MVyT9ZAqUYvJVJRN1yJ0XUVhByfWvoNVSGqdoVmXuhf7XP00M9jg+JJRO1vV8MIwuSW1dwdMRB3abGPJM8rYEEvP14wjInafsFURtvYMi/JRkf5RqvTFXddYGkQ9hCBAobwZnUEz98wDOdA4sS4bE4r/MBUbn4l7Y15BP5bAO3ipSJTkD0OgGe1cpvopBN/ls94Zpjp45F8+lzfHjX63OZMygukAUa7DjbvX48B7Hb83jK+pQC5V+VsYzYEzMwuoM2XPojsA+lL2WuspEAGc5VTFXjch/jYYy6IWWUSsKbiNLS6y25ie7VOfrbpmO0UWrdAWvTuR7A3nkQHjF9qM1jmIN3lOjPnqdA4gsR07QyOoSyYD+wzcoYAJE3mQMphwuy86GkBZoOkLWBhwpqdw4T10LaoajlTurnqy5gCGvzC+VjblWs19N0bH3ESvKRZs55/Emwt2sDBHzwVB7BD+aoJ242mcgKWrjbDSM44KE1JmxFYZhLdSI7cJZ81zAP9HzQLJv6YYUpgkmhNuysHPiR69how==|920 \ No newline at end of file +}///7asOd5dapnuBEjGKSW0wRBUDvpYEXUr4hjlV0j6Qd4U5Pxi7KcP1ObEqkTq97eK73H7pxt7nA3867sawCK8kQxRJvzqwVuzodBvwJysTZ9hacCDn4UDvE4539GIa69MiFPRDmEVIVcTdpi8lAarPN+VBPyH0wkOnVYWW/yQNNgLpneOTKsFFSk2a6/7IsvchYSNxveJfVoz2w4KXg67lBEkmGi37IIyNEBJ+eTNJSVDkrNfRkk79L/+vP18qWr6klToD6/FPxCA9SJGpiPYjvuDVjFkYBqNn/V9cdup9QWHZ6oLSXFQZ/qAozvfwj6cpElbL5ui6p75qr/lVBweYGT10AQPmXuNxPtX46nKM3FWSrUvd71Av+Z9qEZCF4gVZKHMxPo4WadYJXdazQ+TjrZKId/NBdZeKdlXVB4kRjhmGXSKZI8yibIsZ8MtnwlGs9YqOSZkWkeHm/GtXp9AF05b4CmzgBuzKwxFNXlTqtVkcIDjyRL6/ZYb5ul6ZhJ03naXRofaFWC4tOX0nedDGs/Jyf9rua4sb/5fKoVstmBITh6ogokAnuX82gs+S3sKBMM5E88NnJ3flkmhf8Z7Cwb2QXeV37VMqHBuLn12HC3N3QHyGv5xtYDMYEAT5P2B+8teyUEjFFotm6UaNYrZ/wc2hvgdioJLcQ3+LBF5/S8zNgcwRgktJIBqeuFMyM4LWznq4ek+7ERWF827vzPVSJHbLpa9oRRWMUKcaH1oWxzjvF9KI9kybIanWA0jKbWOtmarM6XuqoC9MqN6jUE5LKujRQQWhNmZ56zGuUrZ7jlvvkQWkcoFsY8MXbuQprUm2CLD/JtnbcwaA8/Z+MYuP9oETKC7cKoTQ+bDSoFk04dnfOmyv5daUZqGg5oWLXO73SpS5+TJ5bjL5DgzzVEMKA==|920 \ No newline at end of file diff --git a/Pages/任务/新增任务.json b/Pages/任务/新增任务.json index 26d99d41..7c16956e 100644 --- a/Pages/任务/新增任务.json +++ b/Pages/任务/新增任务.json @@ -228,23 +228,22 @@ "Values": { "1,21": "任务说明", "1,37": "编辑", - "5,1": "工时核算方式", - "5,5": 1, - "8,1": "执行人", - "8,9": "计划日期", - "9,1": "%CurrentUser.UserName%", + "5,1": "任务执行人", + "5,5": "%CurrentUser.UserName%", + "8,1": "计划日期", "11,1": "所属项目", "11,9": "分组", "11,21": "备注", "11,37": "编辑", "14,1": "任务类型", "14,9": "任务版本", - "17,1": "参与人", + "17,1": "预算工时", "21,32": "取消", "21,36": "提交" }, "Formulas": { - "1,1": "IFERROR(ODATA(\"任务表?$select=任务名称&$filter=ID eq \"&IF(ISBLANK(父任务ID),\"null\",父任务ID)&\"&$top=1\"),\"请输入任务标题\")" + "1,1": "IFERROR(ODATA(\"任务表?$select=任务名称&$filter=ID eq \"&IF(ISBLANK(父任务ID),\"null\",父任务ID)&\"&$top=1\"),\"请输入任务标题\")", + "17,1": "\"预算\"&F6&\"工时\"" }, "AttachInfos": { "1,37": { @@ -313,31 +312,6 @@ } }, "5,5": { - "CssName": "singlebox", - "CellType": { - "$type": "Forguncy.RadioGroupCellType, ServerDesignerCommon", - "Style": 3, - "PrimaryColor": "Accent 1 0", - "SecondaryColor": "Background 1 0", - "CellDefaultValue": 1, - "IsBounding": true, - "DataSource": "工时核定方式", - "ValueColumnBindingInfo": { - "TableName": "工时核定方式", - "ColumnName": "ID", - "GUID": "fcf51035-9f55-4d46-85c3-86e6fe9e33e1" - }, - "DisplayColumnBindingInfo": { - "TableName": "工时核定方式", - "ColumnName": "核定方式", - "GUID": "b29ddaca-6a1d-46a8-a4c8-c92acd7a092d" - } - }, - "DataValidationInfo": { - "IgnoreBlank": false - } - }, - "9,1": { "CellType": { "$type": "ElementUI.SelectCellType, ElementUI", "CommandList": [], @@ -411,7 +385,7 @@ "noMatchText": "无匹配数据" } }, - "9,9": { + "9,1": { "CellType": { "$type": "ElementUI.DatePickerCellType, ElementUI", "CommandList": [], @@ -798,7 +772,7 @@ }, "18,1": { "CellType": { - "$type": "ElementUI.SelectCellType, ElementUI", + "$type": "ElementUI.InputNumberCellType, ElementUI", "CommandList": [], "UIPermissions": [ { @@ -814,61 +788,15 @@ ] } ], - "useBinding": true, - "options": [ - { - "value": "黄金糕", - "label": "黄金糕" - }, - { - "value": "双皮奶", - "label": "双皮奶" - }, - { - "value": "蚵仔煎", - "label": "蚵仔煎" - }, - { - "value": "龙须面", - "label": "龙须面" - }, - { - "value": "北京烤鸭", - "label": "北京烤鸭" - } - ], - "bindingOptions": { - "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", - "TableName": "用户信息视图", - "BindingInfos": [ - { - "BindingInfo": { - "TableName": "用户信息视图", - "ColumnName": "用户名", - "GUID": "2c2f9576-3f47-4755-aa8d-51deb10d2a8d" - }, - "ColumnName": "value" - }, - { - "BindingInfo": { - "TableName": "用户信息视图", - "ColumnName": "全名", - "GUID": "962a03a2-2603-4861-b3a0-a44974d69a19" - }, - "ColumnName": "label" - } - ], - "CustomColumns": [] - }, - "placeholder": "请选择", - "noDataText": "无数据", - "multiple": true, - "filterInServerOptions": { - "matchMethod": "contains", - "loadingText": "加载中" - }, - "noMatchText": "无匹配数据", - "clearable": true + "min": "0", + "step": 1, + "placeholder": "请输入工时(h)", + "controlsPosition": true + }, + "DataValidationInfo": { + "NumberType": 1, + "CompareParamType": 6, + "FirstParamValue": "0" } }, "21,32": { @@ -896,7 +824,7 @@ "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", "TargetPageElement": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=新增任务!J10" + "SerializeProperty": "=新增任务!B10" }, "TargetType": "ElementUI.DatePickerCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", "MethodName": "GetSelectedRange", @@ -942,7 +870,7 @@ "ParamName": "执行人", "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=新增任务!B10" + "SerializeProperty": "=新增任务!F6" } }, { @@ -987,7 +915,7 @@ }, { "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "参与人", + "ParamName": "预算工时", "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=新增任务!B19" @@ -1050,7 +978,7 @@ "ReloadData": true } ], - "ID": "142d4cf6-006d-4abf-bf98-12a9d05428f0" + "ID": "1db9310d-e162-45b0-828f-d115f8138fef" }, { "CommandList": [ @@ -1065,7 +993,7 @@ "BtnText": "知道了" } ], - "ID": "c1616364-a718-4f04-a20b-080406f812c7" + "ID": "c2cda3fe-b5a2-40e0-bddd-38ca25da6d85" } ] } @@ -1140,12 +1068,6 @@ "FontSize": 13.333333333333332, "BorderBottom": 0 }, - { - "Foreground": 3 - }, - { - "Foreground": 6 - }, { "BorderBottom": 0, "BorderLeft": 0 @@ -1158,6 +1080,9 @@ "FontFamily": 2, "FontSize": 13.333333333333332, "Formatter": 4 + }, + { + "Background": 7 } ], "Types": { @@ -1168,7 +1093,8 @@ "Text 1 50", "[AUTO]General", "Center", - "black" + "black", + "#FFFFFF00" ], "Borders": [ { @@ -1267,8 +1193,7 @@ "7,19": 1, "7,21": 8, "7,38": 1, - "8,1": 14, - "8,9": 9, + "8,1": 9, "8,10": 3, "8,11": 3, "8,12": 3, @@ -1277,10 +1202,9 @@ "8,19": 1, "8,21": 8, "8,38": 1, - "9,1": 15, - "9,9": 10, + "9,1": 10, "9,19": 1, - "9,21": 16, + "9,21": 14, "9,22": 12, "9,23": 12, "9,24": 12, @@ -1297,7 +1221,7 @@ "9,35": 12, "9,36": 12, "9,37": 12, - "9,38": 17, + "9,38": 15, "10,19": 1, "11,1": 9, "11,2": 3, @@ -1398,7 +1322,7 @@ "17,38": 1, "18,1": 10, "18,19": 1, - "18,21": 16, + "18,21": 14, "18,22": 12, "18,23": 12, "18,24": 12, @@ -1415,7 +1339,7 @@ "18,35": 12, "18,36": 12, "18,37": 12, - "18,38": 17, + "18,38": 15, "19,1": 13, "19,2": 13, "19,3": 13, @@ -1521,13 +1445,14 @@ "21,29": 10, "21,30": 10, "21,31": 10, - "21,32": 18, + "21,32": 16, "21,33": 3, "21,34": 3, "21,35": 3, - "21,36": 18, + "21,36": 16, "21,37": 3, - "21,38": 3 + "21,38": 3, + "23,1": 17 }, "SheetStyle": { "FontFamily": 2, @@ -1535,25 +1460,24 @@ } }, "Spans": [ - "9,1,1,6", - "9,9,1,10", "3,1,1,18", "12,1,1,6", "12,9,1,10", "15,1,1,6", "15,9,1,10", - "18,1,1,18", "23,1,1,3", "1,1,1,18", "5,1,1,3", - "5,5,1,14", "1,37,1,2", "11,37,1,2", "19,19,1,2", "21,36,1,3", "21,32,1,3", "3,21,7,18", - "12,21,7,18" + "12,21,7,18", + "18,1,1,18", + "5,5,1,14", + "9,1,1,18" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -1589,4 +1513,4 @@ "Formula": "新增任务!$B$13" } ] -}//mv5uDStCe0lF/IolkkIEmkjVIcAFCi6DdCIeafzYwbxVp2cDrbc4e1/HYpqNLVhJxdPaXrobndSwGO+b3XxY5+hrNvJY6TrSAZKG+aKsdMviS4tACKkf0L86ER6++l5Gq4CpD8LKbvYABRAVPZtjy8TQEiEJZiZygc12C+xsr5aF83mkaaWHkcF/EL7AAb5dFn/kJRgPgBSRDtro+8RieTtjhPDw8QycRsh2eHiPtxj7KSIrnIZzK3Jw/VTVyTG6Ks7YhOaGWsySnzGOW07KODdmfZD8Hwoc79dhGn2BRzCwyFybCbujx2hIfjGNa3PfoSnElrc6gxqm9a6sXYjmZVr7ZdoFUly563hOKqIcRTtbY+q+xmzHEpZl62Tp9cbY6xS2q1ibbyACAAkzmXeDi/wvI9dDa1h5IaHKHwJlFf9lQL3omBIh3OiV/dxCMDZrsBpdaENSIAage+UXxcQuYygVbcNXreaIQxZJ+qhqMKUrjeiUWEJeBk2IrKgVPFVRs53tFyHKxoUssCegaskrsHmCmXWV1NM8G4Gl+UecO2pPeSsnOHexAlWx9VlvvNtSvd2HUqlxwQKo/XkNvKq9p7ta3qGGDsQPuDhPtIVBT+5d4JO/1zHh/qIlLHI5ZrLDvteTuoQ3AvdCu8umocp5VHKK0lRfwvPC8cVN6GSFYvzFHi8ZYjmvjqEqIOBo7Q150fQVd6lH5nT3RSUq/gX4Sb8aIWP7wDPtxCA8CnugBMs+6S25lz7QFtpaVYrIwAJjxFx5Zfritx4Qd1w2JtjU03+SthArZvn5POqliCaKEzWPMW3kDdQpkpI0kSTIbFo5axIwWrdBlhWR6QopUTO4uZqlNWTPsot3f/4HI7hSNNv6YD3adQzpJo9GmsskbsfGuy0nQ1tWGchTRV+HUbbKMg==|920 \ No newline at end of file +}//Mp41C+8oc/O+ARIn3ih0GMbJpbI3Hznhl5igr9t8uhp75kxzyn6bXI856NHy072UaiXCfkj9IYzYes9aoco5SCL+fr+E96yBRJ3k0Psj0Yl1Nhi0TTlwM5WGU+lLYey4oROnSEbMwHphouzJ56jM1OmFYaB6SN7Z4eoA96sGJYcVlrncciqLpdddwWs8iACqr3u6PSEapeUAMc2coI+7wzUHAydTJlvrd77JVspi57/jU36qWf2GX3YEPzXMYun/yAOZrJ5IGd5tfpPcohO2WxyJBD7M7XZ+4EAaTzTeceLXju8JQ3Jh8Agwzm/je9TwG1VqOMh9+zFnPnGh4weFg8xC132x4VGFVTJJpRIVute/3Y1MVlt3P/KU/loCbjOODVKHWFBI7zV0sxMYoiRPX58HLP0UKpqZUn7ve9rydsFOBdT3+45mpq1BYFBMQDOvXBuwrluUpj9rlx3y9/f2d/gUc0Y2C6eXlXUutpTlMZxbJNLfEojXIdO8g+u67A9HeSxM/XsIzhg42ahEJNxYBAaDtqnlyV5o/g7wGOq12M8EjUI2B8ornM61tBhYjQhP6ZCzp0pMKtlwp+ShIbTrXynX6vrk0IqI6cr0Q2NhFIq+xlRCu1EwmpcFg948Pwo7K/5uhjFQHwcqjSfFY4BT+RjeSrP49A3Z7GHbya4ktFcbSaY/A6bVdkeKSgy/5EhVwYw2JdjIjURP17pNnGRdXrvQVkFbKKKdHvvy3+FDhfRtZp7W6Xs+nt+2ltn4pFIOgKC3dWT8d8420V9ztEyZckYD8UpKzeq8e+LW6ZmLwhDDkigs87K29Q8xuu6HGb8Qo7o51IY/XkRoiHWjGtJWzKeXsKV2gAzc88NTETynawkSFL5vM5IrOuU94AmSU1zyrcpmw9nb9cu0kC209lG8ig==|920 \ No newline at end of file diff --git a/Pages/任务/新增任务.rd b/Pages/任务/新增任务.rd index 8f54c25a..3866b4da 100644 --- a/Pages/任务/新增任务.rd +++ b/Pages/任务/新增任务.rd @@ -3,7 +3,8 @@ "ColumnCount": 40, "RowCount": 24, "Formulas": { - "1,1": "IFERROR(ODATA(\"任务表?$select=任务名称&$filter=ID eq \"&IF(ISBLANK(父任务ID),\"null\",父任务ID)&\"&$top=1\"),\"请输入任务标题\")" + "1,1": "IFERROR(ODATA(\"任务表?$select=任务名称&$filter=ID eq \"&IF(ISBLANK(父任务ID),\"null\",父任务ID)&\"&$top=1\"),\"请输入任务标题\")", + "17,1": "\"预算\"&F6&\"工时\"" }, "CustomNames": [ { diff --git a/Pages/内建页面/FGC_修改用户信息.json b/Pages/内建页面/FGC_修改用户信息.json index 40aa27cb..a1e0a4ca 100644 --- a/Pages/内建页面/FGC_修改用户信息.json +++ b/Pages/内建页面/FGC_修改用户信息.json @@ -1,48 +1,135 @@ { "Rows": { "RowColumnAttachedInfos": { + "0": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 24.0 + } + }, "1": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } + "DesignLengthInPixel": 32.0 + } + }, + "2": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 24.0 + } + }, + "3": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "4": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "5": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 15.0 + } + }, + "6": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "7": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 35.0 + } + }, + "8": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 24.0 + } + }, + "9": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "10": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 35.0 + } + }, + "11": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "12": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 } }, "13": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 30.0 + "DesignLengthInPixel": 32.0 + } + }, + "14": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 15.0 + } + }, + "15": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "16": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 35.0 } }, "17": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 30.0 + "DesignLengthInPixel": 24.0 } }, - "28": { + "18": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } + "DesignLengthInPixel": 32.0 + } + }, + "19": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 35.0 + } + }, + "20": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "21": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "22": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 } } }, - "Count": 30 + "Count": 23, + "DefaultSize": 32.0 }, "Cols": { "RowColumnAttachedInfos": { + "0": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, "1": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, + "DesignLengthInPixel": 32.0, "Mode": 2, "MinLength": { "Unit": 1 @@ -54,185 +141,192 @@ }, "2": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } + "DesignLengthInPixel": 32.0 } }, "3": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } + "DesignLengthInPixel": 32.0 } }, "4": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } + "DesignLengthInPixel": 32.0 } }, "5": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } + "DesignLengthInPixel": 32.0 } }, "6": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } + "DesignLengthInPixel": 32.0 } }, "7": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } + "DesignLengthInPixel": 32.0 } }, "8": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } + "DesignLengthInPixel": 32.0 } }, "9": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } + "DesignLengthInPixel": 32.0 } }, "10": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } + "DesignLengthInPixel": 32.0 } }, "11": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } + "DesignLengthInPixel": 32.0 } }, "12": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } + "DesignLengthInPixel": 32.0 } }, "13": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } + "DesignLengthInPixel": 32.0 } }, "14": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } + "DesignLengthInPixel": 32.0 } }, "15": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } + "DesignLengthInPixel": 32.0 + } + }, + "16": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "17": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "18": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "19": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 } }, "20": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 10.0 + "DesignLengthInPixel": 32.0 } }, "21": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 10.0 + "DesignLengthInPixel": 32.0 + } + }, + "22": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "23": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "24": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "25": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "26": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "27": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "28": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "29": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "30": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "31": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "32": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "33": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "34": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "35": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "36": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "37": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "38": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 } }, "39": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, + "DesignLengthInPixel": 32.0, "Mode": 2, "MinLength": { "Unit": 1 @@ -244,186 +338,44 @@ }, "40": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } - } - }, - "41": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } - } - }, - "42": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } - } - }, - "43": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } - } - }, - "44": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } - } - }, - "45": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } - } - }, - "46": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } - } - }, - "47": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } - } - }, - "48": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } - } - }, - "49": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } - } - }, - "50": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } - } - }, - "51": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } - } - }, - "52": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } - } - }, - "53": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } + "DesignLengthInPixel": 32.0 } } }, - "Count": 55 + "Count": 41, + "DefaultSize": 32.0 }, "Values": { - "4,20": "修改用户信息", - "13,20": "*", - "13,21": "显示名", - "17,20": "*", - "17,21": "电子邮箱", - "22,20": "保存", - "25,20": "取消" + "1,1": "个人中心", + "4,9": "基本信息", + "4,28": "保存", + "6,16": "姓名", + "9,16": "邮箱", + "13,9": "其他配置", + "13,28": "保存", + "15,16": "最大日负荷(小时)", + "16,16": "%CurrentUser.负荷%", + "18,16": "默认时薪", + "19,16": "%CurrentUser.默认时薪%" }, "AttachInfos": { - "7,25": { + "4,28": { + "CellType": { + "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", + "Text": "保存", + "AutoExecute": true, + "TemplateKey": "链接样式", + "Icon": { + "Name": "Application/067_save_4.svg", + "BuiltIn": true, + "Color": "Background 1", + "UseCellTypeForeColor": true + }, + "IconSize": 12.0, + "ForguncyAttribute": "ChangeProfile_Button" + } + }, + "6,9": { "CellType": { "$type": "Forguncy.UploadImageCellType, ServerDesignerCommon", "UploadImageLimit": { @@ -438,7 +390,7 @@ "ForguncyAttribute": "ChangeProfile_Picture" } }, - "14,20": { + "7,16": { "CellType": { "$type": "Forguncy.TextCellType, ServerDesignerCommon", "SavedValidators": [ @@ -454,7 +406,7 @@ "IgnoreBlank": false } }, - "18,20": { + "10,16": { "CellType": { "$type": "Forguncy.TextCellType, ServerDesignerCommon", "SavedValidators": [ @@ -470,26 +422,124 @@ "IgnoreBlank": false } }, - "22,20": { + "13,28": { "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", - "Text": "保存", - "AutoExecute": true, - "TemplateKey": "_RS_Main1", - "ForguncyAttribute": "ChangeProfile_Button" - } - }, - "25,20": { - "CellType": { - "$type": "Forguncy.HyperlinkCellType, ServerDesignerCommon", "CommandList": [ { - "$type": "Forguncy.Model.NavigateCommand, ServerDesignerCommon", - "NavigateType": "back" + "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", + "ServerCommandName": "更新用户配置", + "Parameters": [ + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "用户名", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=FGC_修改用户信息!母版_当前用户" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "负荷", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=FGC_修改用户信息!Q17" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "默认时薪", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=FGC_修改用户信息!Q20" + } + } + ], + "ResultErrorCodeTo": { + "SerializeProperty": "code" + }, + "ResultMessageTo": { + "SerializeProperty": "msg" + }, + "RefreshAfterFinish": true, + "CheckDataValidation": true + }, + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "FourStandardStyle": "info", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=FGC_修改用户信息!msg" + } } ], - "Text": "取消", - "TemplateKey": "_RS_Main" + "Text": "保存", + "TemplateKey": "链接样式", + "Icon": { + "Name": "Application/067_save_4.svg", + "BuiltIn": true, + "Color": "Background 1", + "UseCellTypeForeColor": true + }, + "IconSize": 12.0 + } + }, + "16,16": { + "CellType": { + "$type": "ElementUI.InputNumberCellType, ElementUI", + "CommandList": [], + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "DefaultValue": "%CurrentUser.负荷%", + "min": 0, + "max": "24", + "step": 1, + "placeholder": "请填写小时", + "controlsPosition": true + }, + "DataValidationInfo": { + "IgnoreBlank": false + } + }, + "19,16": { + "CellType": { + "$type": "ElementUI.InputNumberCellType, ElementUI", + "CommandList": [], + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "DefaultValue": "%CurrentUser.默认时薪%", + "min": 0, + "max": "24", + "step": 1, + "placeholder": "请填写元", + "controlsPosition": true + }, + "DataValidationInfo": { + "IgnoreBlank": false } } }, @@ -497,7 +547,7 @@ "Styles": [ { "FontFamily": 0, - "FontSize": 24.0, + "FontSize": 18.666666666666664, "FontWeight": 1, "Foreground": 2, "Underline": false, @@ -505,35 +555,60 @@ }, { "FontFamily": 0, - "Foreground": 3, - "HorizontalAlignment": 4, "Underline": false, "Strikethrough": false }, { "FontFamily": 0, - "FontSize": 14.666666666666666, - "Foreground": 2, - "HorizontalAlignment": 4, + "Underline": false, + "Strikethrough": false, + "BorderBottom": 0 + }, + { + "FontFamily": 0, + "FontSize": 13.333333333333332, + "Foreground": 4, "Underline": false, "Strikethrough": false }, { "FontFamily": 0, - "Formatter": 5, - "HorizontalAlignment": 6, + "FontSize": 13.333333333333332, "Underline": false, "Strikethrough": false }, { "FontFamily": 0, - "Foreground": 3, + "FontSize": 13.333333333333332, + "Foreground": 4, + "HorizontalAlignment": 5, "Underline": false, "Strikethrough": false }, { "FontFamily": 0, - "HorizontalAlignment": 6, + "Formatter": 6, + "HorizontalAlignment": 7, + "Underline": false, + "Strikethrough": false + }, + { + "FontFamily": 0, + "FontSize": 13.333333333333332, + "Foreground": 4, + "Formatter": 8, + "HorizontalAlignment": 5, + "Underline": false, + "Strikethrough": false + }, + { + "BorderBottom": 0 + }, + { + "FontFamily": 0, + "FontSize": 13.333333333333332, + "Foreground": 4, + "Formatter": 8, "Underline": false, "Strikethrough": false } @@ -543,21 +618,474 @@ "Body", "Bold", "Text 1 25", - "#FFFF0000", + "Background 2 0", + "Text 1 50", "Left", "@", - "Center" + "Center", + "[AUTO]General" + ], + "Borders": [ + { + "Color": 3 + } ] }, "CellStyles": { - "4,20": 0, + "1,1": 0, + "2,0": 1, + "2,1": 2, + "2,2": 2, + "2,3": 2, + "2,4": 2, + "2,5": 2, + "2,6": 2, + "2,7": 2, + "2,8": 2, + "2,9": 2, + "2,10": 2, + "2,11": 2, + "2,12": 2, + "2,13": 2, + "2,14": 2, + "2,15": 2, + "2,16": 2, + "2,17": 2, + "2,18": 2, + "2,19": 2, + "2,20": 2, + "2,21": 2, + "2,22": 2, + "2,23": 2, + "2,24": 2, + "2,25": 2, + "2,26": 2, + "2,27": 2, + "2,28": 2, + "2,29": 2, + "2,30": 2, + "2,31": 2, + "2,32": 2, + "2,33": 2, + "2,34": 2, + "2,35": 2, + "2,36": 2, + "2,37": 2, + "2,38": 2, + "2,39": 2, + "2,40": 1, + "3,0": 1, + "3,1": 1, + "3,2": 1, + "3,3": 1, + "3,4": 1, + "3,5": 1, + "3,6": 1, + "3,7": 1, + "3,8": 1, + "3,9": 1, + "3,10": 1, + "3,11": 1, + "3,12": 1, + "3,13": 1, + "3,14": 1, + "3,15": 1, + "3,16": 1, + "3,17": 1, + "3,18": 1, + "3,19": 1, + "3,20": 1, + "3,21": 1, + "3,22": 1, + "3,23": 1, + "3,24": 1, + "3,25": 1, + "3,26": 1, + "3,27": 1, + "3,28": 1, + "3,29": 1, + "3,30": 1, + "3,31": 1, + "3,32": 1, + "3,33": 1, + "3,34": 1, + "3,35": 1, + "3,36": 1, + "3,37": 1, + "3,38": 1, + "3,39": 1, + "3,40": 1, + "4,9": 3, + "4,10": 1, + "4,11": 1, + "4,12": 1, + "4,13": 1, + "4,14": 1, + "4,15": 1, + "4,16": 1, + "4,17": 1, + "4,18": 1, + "4,19": 1, + "4,20": 1, + "4,21": 1, + "4,22": 1, + "4,23": 1, + "4,24": 1, + "4,25": 1, + "4,26": 1, + "4,27": 1, + "4,28": 4, + "4,29": 1, + "4,30": 1, + "5,9": 1, + "5,10": 1, + "5,11": 1, + "5,12": 1, + "5,13": 1, + "5,14": 1, + "5,15": 1, + "5,16": 1, + "5,17": 1, + "5,18": 1, + "5,19": 1, + "5,20": 1, + "5,21": 1, + "5,22": 1, + "5,23": 1, + "5,24": 1, + "5,25": 1, + "5,26": 1, + "5,27": 1, + "5,28": 1, + "5,29": 1, + "5,30": 1, + "6,9": 1, + "6,10": 1, + "6,11": 1, + "6,12": 1, + "6,13": 1, + "6,14": 1, + "6,15": 1, + "6,16": 5, + "6,17": 1, + "6,18": 1, + "6,19": 1, + "6,20": 1, + "6,21": 1, + "6,22": 1, + "6,23": 1, + "6,24": 1, + "6,25": 1, + "6,26": 1, + "6,27": 1, + "6,28": 1, + "6,29": 1, + "6,30": 1, + "7,9": 1, + "7,10": 1, + "7,11": 1, + "7,12": 1, + "7,13": 1, + "7,14": 1, + "7,15": 1, + "7,16": 6, + "7,17": 1, + "7,18": 1, + "7,19": 1, + "7,20": 1, + "7,21": 1, + "7,22": 1, + "7,23": 1, + "7,24": 1, + "7,25": 1, + "7,26": 1, + "7,27": 1, + "7,28": 1, + "7,29": 1, + "7,30": 1, + "8,9": 1, + "8,10": 1, + "8,11": 1, + "8,12": 1, + "8,13": 1, + "8,14": 1, + "8,15": 1, + "8,16": 1, + "8,17": 1, + "8,18": 1, + "8,19": 1, + "8,20": 1, + "8,21": 1, + "8,22": 1, + "8,23": 1, + "8,24": 1, + "8,25": 1, + "8,26": 1, + "8,27": 1, + "8,28": 1, + "8,29": 1, + "8,30": 1, + "9,9": 1, + "9,10": 1, + "9,11": 1, + "9,12": 1, + "9,13": 1, + "9,14": 1, + "9,15": 1, + "9,16": 7, + "9,17": 1, + "9,18": 1, + "9,19": 1, + "9,20": 1, + "9,21": 1, + "9,22": 1, + "9,23": 1, + "9,24": 1, + "9,25": 1, + "9,26": 1, + "9,27": 1, + "9,28": 1, + "9,29": 1, + "9,30": 1, + "10,9": 1, + "10,10": 1, + "10,11": 1, + "10,12": 1, + "10,13": 1, + "10,14": 1, + "10,15": 1, + "10,16": 6, + "10,17": 1, + "10,18": 1, + "10,19": 1, + "10,20": 1, + "10,21": 1, + "10,22": 1, + "10,23": 1, + "10,24": 1, + "10,25": 1, + "10,26": 1, + "10,27": 1, + "10,28": 1, + "10,29": 1, + "10,30": 1, + "11,1": 2, + "11,2": 2, + "11,3": 2, + "11,4": 2, + "11,5": 2, + "11,6": 2, + "11,7": 2, + "11,8": 2, + "11,9": 2, + "11,10": 2, + "11,11": 2, + "11,12": 2, + "11,13": 2, + "11,14": 2, + "11,15": 2, + "11,16": 2, + "11,17": 2, + "11,18": 2, + "11,19": 2, + "11,20": 2, + "11,21": 2, + "11,22": 2, + "11,23": 2, + "11,24": 2, + "11,25": 2, + "11,26": 2, + "11,27": 2, + "11,28": 2, + "11,29": 2, + "11,30": 2, + "11,31": 8, + "11,32": 8, + "11,33": 8, + "11,34": 8, + "11,35": 8, + "11,36": 8, + "11,37": 8, + "11,38": 8, + "11,39": 8, + "12,1": 1, + "12,2": 1, + "12,3": 1, + "12,4": 1, + "12,5": 1, + "12,6": 1, + "12,7": 1, + "12,8": 1, + "12,9": 1, + "12,10": 1, + "12,11": 1, + "12,12": 1, + "12,13": 1, + "12,14": 1, + "12,15": 1, + "12,16": 1, + "12,17": 1, + "12,18": 1, + "12,19": 1, + "12,20": 1, + "12,21": 1, + "12,22": 1, + "12,23": 1, + "12,24": 1, + "12,25": 1, + "12,26": 1, + "12,27": 1, + "12,28": 1, + "12,29": 1, + "12,30": 1, + "13,9": 9, + "13,10": 1, + "13,11": 1, + "13,12": 1, + "13,13": 1, + "13,14": 1, + "13,15": 1, + "13,16": 1, + "13,17": 1, + "13,18": 1, + "13,19": 1, "13,20": 1, - "13,21": 2, - "14,20": 3, - "17,20": 4, - "17,21": 2, - "18,20": 3, - "25,20": 5 + "13,21": 1, + "13,22": 1, + "13,23": 1, + "13,24": 1, + "13,25": 1, + "13,26": 1, + "13,27": 1, + "13,28": 4, + "13,29": 1, + "13,30": 1, + "14,9": 1, + "14,10": 1, + "14,11": 1, + "14,12": 1, + "14,13": 1, + "14,14": 1, + "14,15": 1, + "14,16": 1, + "14,17": 1, + "14,18": 1, + "14,19": 1, + "14,20": 1, + "14,21": 1, + "14,22": 1, + "14,23": 1, + "14,24": 1, + "14,25": 1, + "14,26": 1, + "14,27": 1, + "14,28": 1, + "14,29": 1, + "14,30": 1, + "15,9": 1, + "15,10": 1, + "15,11": 1, + "15,12": 1, + "15,13": 1, + "15,14": 1, + "15,15": 1, + "15,16": 9, + "15,17": 1, + "15,18": 1, + "15,19": 1, + "15,20": 1, + "15,21": 1, + "15,22": 1, + "15,23": 1, + "15,24": 1, + "15,25": 1, + "15,26": 1, + "15,27": 1, + "15,28": 1, + "15,29": 1, + "15,30": 1, + "16,9": 1, + "16,10": 1, + "16,11": 1, + "16,12": 1, + "16,13": 1, + "16,14": 1, + "16,15": 1, + "16,16": 1, + "17,9": 1, + "17,10": 1, + "17,11": 1, + "17,12": 1, + "17,13": 1, + "17,14": 1, + "17,15": 1, + "17,16": 1, + "17,17": 1, + "17,18": 1, + "17,19": 1, + "17,20": 1, + "17,21": 1, + "17,22": 1, + "17,23": 1, + "17,24": 1, + "17,25": 1, + "17,26": 1, + "17,27": 1, + "17,28": 1, + "17,29": 1, + "17,30": 1, + "18,0": 1, + "18,9": 1, + "18,10": 1, + "18,11": 1, + "18,12": 1, + "18,13": 1, + "18,14": 1, + "18,15": 1, + "18,16": 9, + "18,17": 1, + "18,18": 1, + "18,19": 1, + "18,20": 1, + "18,21": 1, + "18,22": 1, + "18,23": 1, + "18,24": 1, + "18,25": 1, + "18,26": 1, + "18,27": 1, + "18,28": 1, + "18,29": 1, + "18,30": 1, + "18,31": 1, + "18,32": 1, + "18,33": 1, + "18,34": 1, + "18,35": 1, + "18,36": 1, + "18,37": 1, + "18,38": 1, + "18,39": 1, + "18,40": 1, + "19,0": 1, + "19,9": 1, + "19,10": 1, + "19,11": 1, + "19,12": 1, + "19,13": 1, + "19,14": 1, + "19,15": 1, + "19,16": 1, + "19,31": 1, + "19,32": 1, + "19,33": 1, + "19,34": 1, + "19,35": 1, + "19,36": 1, + "19,37": 1, + "19,38": 1, + "19,39": 1, + "19,40": 1 }, "SheetStyle": { "FontFamily": 0, @@ -566,15 +1094,18 @@ } }, "Spans": [ - "14,20,2,15", - "18,20,2,15", - "22,20,2,15", - "25,20,1,15", - "7,25,5,6", - "4,20,2,15" + "6,9,5,6", + "7,16,1,15", + "10,16,1,15", + "4,28,1,3", + "13,28,1,3", + "1,1,1,7", + "19,16,1,15", + "16,16,1,15" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", + "MasterPageName": "FGC_母版页", "MobilePageName": "FGC_修改用户信息_手机版", "Title": "修改用户信息", "RowBreakLines": [], @@ -584,23 +1115,5 @@ "PrintInfo": { "PaperSize": {}, "Margin": {} - }, - "BackgroundPictures": [ - { - "Name": "BackgroundPicture3", - "DisplayName": "背景图1", - "StyleInfo": { - "CornerRadius": 20.0, - "Fill": "#FFF6F6F8", - "StrokeDashType": 8, - "Stroke": "Background 1 -25", - "StrokeThickness": 0.0 - }, - "IsAutomaticStroke": false, - "IsAutomaticFill": false, - "Location": "340,40", - "Size": "400,540", - "BoxShadowString": "0 0 0 5 #18000000" - } - ] -}//joap596P2warTEIZ0oavzC+Y8d5yH0fYJ1vIOJxqNKCXb2ee29TRSVfGhYNsHLTi1m5qBYuUlRIBZanJqp7OOBluS9G0Lsy40e057dA6ONH3I4ZWo9OkBokBUCCjLteh77MklILpxnHgV5UnU9Bd5s056110SFErZWf/wiQTMfOInEFDXuHtgDou5QzE5wddn4RbMh87gHvjyHeWUnarY95O5GZIy5JQsF1vrpuImJbKF6ABvpHYeYLbgaKTz55szJB00loSPYAHRKYv7q1P747Jhj0NFupGBE7B7Ee8awoPKjm//pJ2OAZHsxDqoVU85GYE3kSNQAtJioAtJOVXvdcrSwRpf5PCVyBEnpyDmwWRN08A0SwRXLoJ9+IXV24lj5nNEAL9avHTtkQ2w3PYFIX7Jy/9IYZXGX+ZLlm8qD/quFcoLNdov3EGLw7dqb2KENCmrwymQm+9pJes01+Dgc7eKHO7cAfpF4qcCQ6p0p8iPly8eGzXlxwdQbTmdRsle2e0BnD9a23/ZOBEQYubtq0Sip2rPDwWFhEN88CdvdpjhEjUIgGq/vL3lp7bFDZ2SBnVrvzXisbCKkRj5TxeMJ0NuGAI/7pG/TDau5h8xzzbN9Mixul0FYPFdHr/3ROyavehPxMltaEBBsDBpeNk1dhrpO0kWlalLoeyKzxlg8RZLGZw4RwqouBJgyJ1GU/nvxYCA3fCL1EIB2yIwNA6z4DmIh0Mhh2vgpLCAAf/Wbq5qWS7oBfwZIFJm09gCXeXoQ58YFtKg7WUTljSo1SFygISdxdQAz1bC2HmudvOpnd3BGBLqOz1mtncZHzFxrDHNukHaU2+5TIievE/OeSiJJUNQNHlPG6W0MmeLLe9h3MnR1aOmq9TMWieZLKv1/yasXDv1YdtZeAS238PGZQnXQ==|920 \ No newline at end of file + } +}//hlQ2AB0MoY5D/73UbYzPD53GmKD8xEliUWbHqttW8tgM2b9v+Bv/GE1P+kPUq7pKad9/h0yx2sO8aOTVCDTSNyAXdr0/KB/NS5qar5+2MYey5efpZOJhot80gE8gyZUuywkUl3qjCV1sP4kL098NyelX9HC98UppZKUNrSYjsDoHR4n5g5XJzs3c+ogqzkLzdiXyNfn0kMzAwE/a7agguCB7onz977R5Ctch37R1/ADsWTLgiBZW9QxLQ8h68Nfw+dmMc/IdOLwt7H6HCOYgkVNNVEm48Lchu/Y75q14IPzGN2MpVXXLJrTWFe8MA5zh9+622LO6gsq8+fnlVx60N0oSqyTPv0WF3vMAc4YYPkrGTpbyR219hD1MQ1zT2Be1JRG1Tflfqk0A5sDi98co8xPZ8MzSROOg0TGfMUEUC3Cxox5vsPsoA8vHwKro3cIzN2JAhsWOsNLWp5553GWIwbj+Ujxo4Cx01of9pcRvRsiYjobBMiAoePfsprQ/FxNx/ixpfQNlXJakPoivw6vpVeheVq3mu21HkQ9IWnJ6uRtIqz2MDst2FzyK1iAUL0A57HQ75Adu6Rvr9AzYWblJ4bGoq/WuapyoojtYvdn1vQT9sZsH6AKfHWMZF/+1SjtQlULn/RvAamdK6RM9ZFXOs6ktSEKP7s+83ZbMXlEcd83XRqunCx3RSVgmFZpJAwDue6MfRdKbb1QVry9Xyv6kZEWYadi6JoDaM5SdX6vAz/C3gCjIvWxQXTXV3BhWZeRZTmulfmgqI/GGkATiCrsd9cxG+m9mbXnOaDn84nvkHXjFeCHhqtjQHJulHsTXq/p2/1Lxg/SYbEX9i67JgHo0sE7zwQn6fPbU0eAb0qPhk13ea0JnPLEDWO+0PV0suQI71D8zqzIAyqo4b3fqZ5S5gw==|920 \ No newline at end of file diff --git a/Pages/内建页面/FGC_修改用户信息.rd b/Pages/内建页面/FGC_修改用户信息.rd index e80e7736..e4e77694 100644 --- a/Pages/内建页面/FGC_修改用户信息.rd +++ b/Pages/内建页面/FGC_修改用户信息.rd @@ -1,5 +1,5 @@ { "PageType": 0, - "ColumnCount": 55, - "RowCount": 30 + "ColumnCount": 41, + "RowCount": 23 } \ No newline at end of file diff --git a/Pages/流程页面文件夹/FGC_我的待办.json b/Pages/流程页面文件夹/FGC_我的待办.json index f0c5a3bc..55c8d457 100644 --- a/Pages/流程页面文件夹/FGC_我的待办.json +++ b/Pages/流程页面文件夹/FGC_我的待办.json @@ -1563,7 +1563,7 @@ ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", - "MasterPageName": "FGC_母版页", + "MasterPageName": "FGC_流程中心", "MobilePageName": "FGC_我的待办_手机版", "Title": "我的待办", "AuthorizeInfo": { @@ -1577,4 +1577,4 @@ "PaperSize": {}, "Margin": {} } -}//5/8vJg30KQGDgggwLrNLPuNVHw8L8Xy3m8VDtz4mtKBaJDtDTeKCv5rT14tYJXWHH7fVZEJTj1HT6+vKTZZGuslWU70lwl6YfIsi8bmDIfA8HZo6qju/kczqD2rNaQDUgodkGc4BeZiY9D0axsdjhn/QFn2/eAMy07X9ObmClV5K5kxGlh8TIfDPFHJVB+N9DtLrD7HR1+9tXl7ElsYXAdUQtf4wtPYdtZOupBF9ln3yncL4GG5Hpiaoi59y0HkH6dFFXAxzk4qxbXtyRgsedZ0QamqUdU1cNcB/I1scWduUAqfeVDGoKpLBIt1drAc8Wtr9Xd5Pz3EMrzWVPLlgFjcblSN1hIX+F2jAkDk9JzDO01fzzFw/RwEpTNOCfUwhOOyjGKHfjmOKflkPsxkexE4WsCVbCcLa8sshNYQFI2fzMVsjocMiMYj2xlK3WI8SiOnDqN2SUOaHYk17rOZFupvs9NwVoy1LzQgfHcTXGRh2vJcS6uauMbZjpvolDPiHKMVDddFjumPldb40KXf/tgJ8Rn9tsd91CNnpubAu/bHzeqlJjaSdVGZ5p+kifMJ/ZxyBV9nqCKMn7s5gp0r+Wk8mrKubipzmEI+Cho4X1TMN87p4J5hIz39W+VeiABFBpquwMFg02JUIOOIduQbC3VEY/hXN4XOfaLfyqS9pGhFrSg7KCY0x5upFqvb+WP7xUiq4kytoB4NZTNQ7Zr5Ixhszmfg8o1jGvT7aw5A2wrEPHvPOplqo6oGIP7ZqrdATznLPFyM6r6wFL7a9bRQy8OHG/EdKFNgnjmjYmX7SK3D3f+lKKJSTygy43kU3jrEBFF0hQ3eR8M/I5p8Xtm+pqDwmHWfPBdl50EwSTOXMxDiQZOuO7YI9nU99M9EhP4/a3dA5IkKqf4Aw+6AcjxAESA==|920 \ No newline at end of file +}//abg//+0fRO6QR5s0x48uaynV6L7+hzYY26Fk3VhIHvRH5Z+SfFOOMt4gU7mDzGuNG5TAWEGSswIqmJ9gjLfQoju7UzdTJlRl/T7m3SSVgqb0+HcZFcQSlwxn3/vtpUIIgwKqLEW/+xMZeFGghfskKYcEh1gYsjFkxcj7AESx0ztct3z3j98j9q5WbzUnP3yRd4El4xnrEEttT3FORa3fK+jLpficu3qeu6zmKgRzqcQx9hn7bL6GdT355+e1tgxCKKEmy36ggHEtTltG7sBtxJmzRu6HCayi2ASsE3MB4qh5U1GU6bmXtL8E/OVT35bjb+MhVvqIKvZICDZbpEI4O7q6WVY0/aFHpl4RIAbc51df1Re7okGjvqkk0oesVB+xUGq9GczyXQGOYEp68JkZ698anemGRPYURPgHiN/OqOo4CcWPFZPSpSAMS3fE6Vpz6YdufFZj+W/TOehRb2JHOpmou8GsBy5LbSjaBYJjNI+s7uX6+UFucR1BgLdZpRO8LDoGOjSDcKOYnqdNG7h9h9kcnuaTr5hv/KNLHwf9gA0X1ig1fFtm3b/8xzUwxKpWltXjWS/T+S7XOPsa5H7u+qr+mRAcjGlAqam10ZTOI0ULqXFZcc8Kb1m11TxgCk6VPjIL+xIDtRoPVWxDWj9EoakLRiSg0yJ6gRokIucbZu72BkDU12hzWWqgSB//BJ86Cp8rfEDKzp19DvfTU/FkWlO+O3K8B6OmxkZnVTcU1LaIYR3zqXiXvSA1aDGzsqrpLs+UJg5TKzcqlOpTWwdJpFDSdEHFnXWMH5pISuBo63i5I79ZFn0G8eijlUrJwD+LDVO6RYnINrRDr3vZ/iwjzCUkezG+XXxmfqZ3yJn6DfCRQmyY2ZyzhYHgn5ADaYQRmNZmOP2lJ3NaslDaw0JQag==|920 \ No newline at end of file diff --git a/Pages/项目首页/项目列表.json b/Pages/项目/项目列表.json similarity index 95% rename from Pages/项目首页/项目列表.json rename to Pages/项目/项目列表.json index 92cf3474..29432472 100644 --- a/Pages/项目首页/项目列表.json +++ b/Pages/项目/项目列表.json @@ -524,7 +524,7 @@ } } ], - "ID": "8ca03558-2ba6-47e9-9770-db290212db59" + "ID": "ab18cb7c-632c-47c6-bc4c-d601191ef539" }, { "CommandList": [ @@ -537,7 +537,7 @@ "LoadBindingDataOption": 2 } ], - "ID": "54414511-ed05-493e-bbd1-d55f8a97ba5d" + "ID": "0c5fb35c-a982-4847-90c3-0149720ddcb2" } ] } @@ -880,4 +880,4 @@ "PaperSize": {}, "Margin": {} } -}//Juprtj1QbYLFtPo+vVB6pBQfauZhKYhD9N1CnCe2ov29QObdrpbB83xj0ewX9JSarwIH8LaC1VhgfctHud7sCO3qBzy+K8djjk9nyhmNfWiU+2HeG22dfLbf00tEZHymYAwWAIK5N2PH8iFIbqlO0sOLsv5XxqmKtK/sX4Xt1z4Yeq8Yfy2ZbuJRc659fxWMNH2+qJu+MneAymXRjbs21sIVQKTVEJx2FE5CslC4Uer6CDahe8J7XsDCR5iUHwnDmpw05y2Ywhw8kIS8uZGVL6a1ZXr9ThAElr1pqUnYBP6iKArVNF1jX1yZtsQjix+FjbtwtPXY6zpBI9YLksEkRHsPXtw+odcb4WvpbBFFrHZnig+fLQQfSyRxejG76jtGyCl8ljNxb27DJx1+x4MqbU9vnUfOa9wwkqkNpyvLrI7DGMlQujKraILXjwnR2cwW3U5guwGTofKAG6euS3qT+Qfm9vaISv0Qlb6pRqEZ6yxNasRf5fEHx4J5QxXyQn9dZZRu1yU53/j2Zn4XEGgoKw5zKWgpfqAcM6EY6/HuNMf2he4agQAXPTQGVt+NVumOui/IuSdewROmm1E2pg1uRIQv23j4DGLZF/O7BGhEJSuZ2PZDH71bBTF36HTjfrlXi0N9oXZxb2iXv4iOPfgHV94FZN8T7hAALk7leb3nhjIUo1f8DUz85pLQ+wX0o9tQABmNQW2ohMbXxFDeeAMSGqlJ2OZZmwBIBiQgxWcdseShB50/Y/dBykxDcKsvJBztWp83bKFFjzzBgO3w+8lxjiyZ+RI7mjMbNpVUSR3fWSgZ8zTvJRrZxImUcdHBuzFMfo1LdEkyLXLP3GkqG3D1PIjg7YrgSB/g3Po2hFYJznuRenxQfY1OOZcl11IRq/1SiWkMM9VsAu6CLtQCV/hcVg==|920 \ No newline at end of file +}//eqWEvCm3TAnJwn4BpPAjgQQFZFejUIA/FjbrIkUsgypBoDVnUOSW0e/W9lqPreuXkoJl6Ctg1C1Q81R9RIGVUat2Wtwn+6L66dk52GGJHzd4eyy+zSVtpe6ZpLXMsvImwQQYnZfWiAHBXD2/nUAvwcB7HTQgoH98c3mbE0KzKcpZ96ZWeTLNf3F4y6QPylW1keQh8pwd7nSL53kb7fITgtv0Fgrkibftcg4vt1MR8DQHhIJfga62JZtA8mdcsgp46ld8NLpgiIeoOz9QnEoJS+fGmt392P2s7m6DXyggtoPt36a1wzjsmpTkhviKyHGzPxEceyvYvbkxgW8NlgzdrTpJgsQaH4LO+AMCy4RaFEqVF7mqhdJgAxFngkjxUzIFp9Gdv7NZasSNiYkigJB+O9XAElZW5paf2C1NMpqVffOMoEX1Ad8TiabN030DTo8nk+2ojWALOdidudnrw4M6j3dIFOQFvgQK1x/TAgF7E1SJASciJ4QLkc51ZwkrNP7P/jBrJK+euz3R3mLV4jKi0gETkN2LUXgIpZmhplS5XK0xhhbyG+1M3QX6eNYL6t2LC9eLB4dHRxw5QS+hYIkxGTootlryyIpx8oEnaY8yXo/MqyeFwhKdtNSzsEPp5ITuaLrrQDm1bysA3s+SQHsVR668T6DD8YxaHnPiKT62QasBGEc5SEKCG+is4bX1X5Q1pgXlEG/+LZo10I+VBY0nQSlpPY5tShgW6NsDMXAPwY2lICAd+OyjdCbtxYDcEF/ezzbJc/FnaOA99jR1YzpHDvlcdPMxYTXWThe5YreJToVKlaFR0/mjQYf9P017/cnj8pmkXgcz60J9Nmzq91sVi4N3URld0JJEgZCL3TW1Upe1jHv98E63aBUNEl1pFfEQXu7OZ5ckjdjAooPzA2oZyw==|920 \ No newline at end of file diff --git a/Pages/项目首页/项目列表.rd b/Pages/项目/项目列表.rd similarity index 100% rename from Pages/项目首页/项目列表.rd rename to Pages/项目/项目列表.rd diff --git a/Pages/项目/项目岗位详情.json b/Pages/项目/项目岗位详情.json new file mode 100644 index 00000000..4a118bb7 --- /dev/null +++ b/Pages/项目/项目岗位详情.json @@ -0,0 +1,510 @@ +{ + "Rows": { + "RowColumnAttachedInfos": { + "0": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "1": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "2": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 35.0 + } + }, + "5": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 35.0 + } + }, + "6": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "7": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "8": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 35.0 + } + }, + "9": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "10": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0, + "IsHidden": true + } + } + }, + "InLogicalVisibleIndexes": [ + 10 + ], + "Count": 11, + "DefaultSize": 32.0 + }, + "Cols": { + "RowColumnAttachedInfos": { + "0": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "1": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "2": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "3": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "4": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "5": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "6": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "7": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "8": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "9": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "10": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "11": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "12": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "13": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "14": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "15": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + } + }, + "Count": 16, + "DefaultSize": 32.0 + }, + "Values": { + "1,1": "岗位名称", + "4,1": "默认时薪", + "8,1": "取消", + "8,12": "保存" + }, + "AttachInfos": { + "2,1": { + "BindingInfo": { + "TableName": "项目岗位", + "ColumnName": "岗位名称", + "GUID": "7a9344cd-068f-4423-8cf9-2c40559deff8" + }, + "CellType": { + "$type": "ElementUI.InputCellType, ElementUI", + "CommandList": [], + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 4, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "type": "text", + "placeholder": "请选择", + "resize": "none" + }, + "DataValidationInfo": { + "IgnoreBlank": false + } + }, + "5,1": { + "BindingInfo": { + "TableName": "项目岗位", + "ColumnName": "默认时薪", + "GUID": "2155b146-3113-44fc-9ba9-225f4772e1e7" + }, + "CellType": { + "$type": "ElementUI.InputNumberCellType, ElementUI", + "CommandList": [], + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "step": 1, + "controlsPosition": true + }, + "DataValidationInfo": { + "IgnoreBlank": false, + "InputMessageTitle": "提示", + "InputMessage": "如果任务没有设置时薪，则采用此处设置的时薪来计算收益" + } + }, + "8,1": { + "CellType": { + "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon" + } + ], + "Text": "取消", + "TemplateKey": "_RS_Information3" + } + }, + "8,12": { + "CellType": { + "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=项目岗位详情!项目ID" + } + ] + }, + "value": "%Null%", + "compareType": 1 + }, + "CommandList": [ + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon", + "tableData": { + "TableName": "项目岗位", + "ColumnName": "ID", + "GUID": "9da4aad2-d4b3-4c96-9760-8996730192af" + } + }, + "value": "%Null%" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "项目岗位", + "UpdateType": "add", + "ShowConfirm": false + } + ], + "ID": "4ec11fb7-4daf-4976-a395-8d6874a9e61d" + }, + { + "CommandList": [ + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "项目岗位", + "ShowConfirm": false + } + ], + "ID": "a9885ba9-5f2c-41fb-9dc5-0f10a7bd4c4e" + } + ] + }, + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "Message": "操作成功" + }, + { + "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon", + "ReloadData": true, + "ClosePopupReturnValues": [ + { + "Name": "成员ID", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目岗位详情!ID" + } + } + ] + } + ], + "ID": "c7620d24-df20-458d-9cfb-e0b3495dce61" + }, + { + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "FourStandardStyle": "failure", + "Message": "请指定项目" + } + ], + "ID": "d28051e7-5e3f-4652-8438-39052cb27b57" + } + ] + } + ], + "Text": "保存", + "TemplateKey": "_RS_Main1" + } + }, + "10,0": { + "BindingInfo": { + "TableName": "项目岗位", + "ColumnName": "项目ID", + "GUID": "42aceeff-c7e5-4c36-b5a7-7d9fb1564bfb" + } + }, + "10,4": { + "BindingInfo": { + "TableName": "项目岗位", + "ColumnName": "ID", + "GUID": "75c28a60-1b04-4f94-8ae0-02966a2f6013" + } + } + }, + "StyleDatas": { + "Styles": [ + { + "FontFamily": 0, + "FontSize": 13.333333333333332, + "Formatter": 1 + }, + { + "FontFamily": 0, + "FontSize": 13.333333333333332 + }, + { + "FontFamily": 0, + "FontSize": 13.333333333333332, + "Formatter": 2 + }, + { + "BorderBottom": 0 + }, + { + "Background": 4, + "BorderBottom": 1, + "BorderTop": 1, + "BorderLeft": 1 + }, + { + "BorderBottom": 1, + "BorderTop": 1 + }, + { + "BorderBottom": 1, + "BorderTop": 1, + "BorderRight": 1 + } + ], + "Types": { + "Strs": [ + "Body", + "[AUTO]General", + "¥#,##0_);[Red](¥#,##0)", + "Background 2 0", + "#FFFFFF00", + "black" + ], + "Borders": [ + { + "Color": 3 + }, + { + "Color": 5 + } + ] + }, + "CellStyles": { + "1,1": 0, + "1,2": 1, + "1,3": 1, + "1,4": 1, + "1,5": 1, + "1,6": 1, + "1,7": 1, + "1,8": 1, + "2,1": 1, + "3,1": 1, + "3,2": 1, + "3,3": 1, + "3,4": 1, + "3,5": 1, + "3,6": 1, + "3,7": 1, + "3,8": 1, + "3,11": 2, + "3,12": 2, + "3,13": 2, + "3,14": 2, + "4,0": 1, + "4,1": 0, + "4,2": 1, + "4,3": 1, + "4,4": 1, + "4,5": 1, + "4,6": 1, + "4,7": 1, + "4,8": 1, + "4,9": 1, + "4,10": 1, + "4,11": 1, + "4,12": 1, + "4,13": 1, + "4,14": 1, + "4,15": 1, + "5,0": 1, + "5,1": 1, + "5,15": 1, + "6,1": 3, + "6,2": 3, + "6,3": 3, + "6,4": 3, + "6,5": 3, + "6,6": 3, + "6,7": 3, + "6,8": 3, + "6,9": 3, + "6,10": 3, + "6,11": 3, + "6,12": 3, + "6,13": 3, + "6,14": 3, + "8,1": 0, + "8,2": 1, + "8,3": 1, + "8,12": 0, + "8,13": 1, + "8,14": 1, + "10,0": 4, + "10,1": 5, + "10,2": 5, + "10,3": 6, + "10,4": 1 + }, + "SheetStyle": { + "FontFamily": 0, + "FontSize": 13.333333333333332 + } + }, + "Spans": [ + "8,1,1,3", + "8,12,1,3", + "10,4,1,3", + "10,0,1,4", + "2,1,1,14", + "5,1,1,14" + ], + "PageInfo": { + "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", + "PermissionData": { + "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionData, Forguncy.RbacPermission.Core", + "permissionResource": { + "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionResource, Forguncy.RbacPermission.Core" + }, + "permissionBindings": [ + { + "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionBinding, Forguncy.RbacPermission.Core", + "roleNames": [ + "FGC_LoginUser" + ] + } + ] + }, + "RowBreakLines": [], + "RepeatRangeSettings": [], + "RelatedDataTableName": "项目成员表" + }, + "PrintInfo": { + "PaperSize": {}, + "Margin": {} + }, + "CustomNames": [ + { + "Name": "项目ID", + "Formula": "项目岗位详情!$A$11" + }, + { + "Name": "ID", + "Formula": "项目岗位详情!$E$11" + } + ] +}//MAo6PZjcGUVkgb1scBw6yl8lEcJ5dz1VuMKNVrDvHuAV/bsmsB2hrJcXXCq+vv8k0y/gQaXpYu5d/z2gY6Kfksuyz4bKxgKrPOvUAsyZEAlV9oERNaD0NDfDaOIDdv3KtRk5jxrn4oWiGnUXvReEvrMXYZTSctUbiVbJu0sy2rcDp/meYTNTU4gIiQSyDpicSK6rH+TAXgsXN8iEB3P2apc1UsLKCkqkLcSx5YHtcr0k6y6RqvLZZ1j0EpvgefzUi5c0uwu7v1LBEdd8QZj8uRgA5zKR1lKgQHtiIDzfEExkkbxp1XeEspHKPZN9NsaRTIambTN4V512Ezqa/MwOj7kdzTZeyld0seS7mg+MHDCdY6pyNTTEKxi4Jq21IEv3ZtrdifNANUu9loWotv/5WwsSFrU8rNFYgi4DKwZUPwuBzlYKZ6MboBxarajUXln76kOAaB7cofdnxwkAz1WKajD3wQ3g9p1MJ+vQLRxhZ5jYki+ZmpluA7vNCzdQaQzfb2IP0mvHdI0JcEIQmwOt5dmolSDzZXxySVQ+hZNPufaFC9Osm+gkl3+ain7bCvWdCyWj8/J+HuxwM7JnWn8mFJdIu6SkvR4IhPL2Keq2ckT8ixBBBgP3MLv4Lsri8Xoxz/7E/S6d6qo2m9I943Gc7p+5dIC8aYOMXFXWk5IDFEpoIbHTuDWlVJkC4V3ING6Rzx2TLEX7BMyz56SQtiUmSTyLJqfwP+X7GsUAyOuAmi5CaqcmrUE5gW2Yb5GpRgLbtqpDPLXtOPLOIwZCt8dTDEIzXqDt6x9mJo5ze7vLEdF6ewuEeNybFCXXH9PDlI9fHEgdexVLq0TrrTOtmc9zVEdfmTavyrrE/P/DQWkqci5GPtdWdg0JkEHuOrMy0DfeiSmOCd1QoLm4LyG/KVeHxA==|920 \ No newline at end of file diff --git a/Pages/项目/项目岗位详情.rd b/Pages/项目/项目岗位详情.rd new file mode 100644 index 00000000..069c4384 --- /dev/null +++ b/Pages/项目/项目岗位详情.rd @@ -0,0 +1,15 @@ +{ + "PageType": 0, + "ColumnCount": 16, + "RowCount": 11, + "CustomNames": [ + { + "Name": "项目ID", + "Formula": "项目岗位详情!$A$11" + }, + { + "Name": "ID", + "Formula": "项目岗位详情!$E$11" + } + ] +} \ No newline at end of file diff --git a/Pages/项目/项目成员详情.json b/Pages/项目/项目成员详情.json new file mode 100644 index 00000000..e85e8984 --- /dev/null +++ b/Pages/项目/项目成员详情.json @@ -0,0 +1,879 @@ +{ + "Rows": { + "RowColumnAttachedInfos": { + "0": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "1": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "2": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 35.0 + } + }, + "5": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 35.0 + } + }, + "6": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "7": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "8": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 35.0 + } + }, + "11": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 35.0 + } + }, + "12": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "13": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "14": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 35.0 + } + }, + "15": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "16": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0, + "IsHidden": true + } + } + }, + "InLogicalVisibleIndexes": [ + 16 + ], + "Count": 17, + "DefaultSize": 32.0 + }, + "Cols": { + "RowColumnAttachedInfos": { + "0": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "1": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "2": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "3": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "4": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "5": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "6": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "7": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "8": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "9": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "10": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "11": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "12": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "13": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "14": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "15": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + } + }, + "Count": 16, + "DefaultSize": 32.0 + }, + "Values": { + "1,1": "成员", + "4,1": "成员默认时薪", + "7,1": "岗位", + "10,1": "默认时薪", + "14,1": "取消", + "14,12": "保存" + }, + "Formulas": { + "5,1": "IFERROR(ODATA(\"用户信息视图?$select=默认时薪&$filter=用户名 eq \"&IF(ISBLANK(B3),\"null\",\"'\"&B3&\"'\")&\"&$top=1\"),\"\")" + }, + "AttachInfos": { + "2,1": { + "BindingInfo": { + "TableName": "项目成员表", + "ColumnName": "项目成员", + "GUID": "1af53027-9f17-4545-99e5-2dd7e8cdd752" + }, + "CellType": { + "$type": "ElementUI.SelectCellType, ElementUI", + "CommandList": [], + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "useBinding": true, + "options": [ + { + "value": "黄金糕", + "label": "黄金糕" + }, + { + "value": "双皮奶", + "label": "双皮奶" + }, + { + "value": "蚵仔煎", + "label": "蚵仔煎" + }, + { + "value": "龙须面", + "label": "龙须面" + }, + { + "value": "北京烤鸭", + "label": "北京烤鸭" + } + ], + "bindingOptions": { + "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", + "TableName": "用户信息视图", + "BindingInfos": [ + { + "BindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "用户名", + "GUID": "90e7d711-9325-4beb-99f0-f4a1e76f26cd" + }, + "ColumnName": "value" + }, + { + "BindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "全名", + "GUID": "439dadad-a41a-460f-ac7d-2767040df148" + }, + "ColumnName": "label" + } + ], + "CustomColumns": [] + }, + "placeholder": "请选择", + "noDataText": "无数据", + "filterInServerOptions": { + "matchMethod": "contains", + "loadingText": "加载中" + }, + "noMatchText": "无匹配数据" + }, + "DataValidationInfo": { + "IgnoreBlank": false + } + }, + "5,1": { + "BindingInfo": { + "TableName": "项目成员表", + "ColumnName": "项目成员", + "GUID": "f71da0ef-5394-41a0-b91d-a27c8397362c", + "AttachType": { + "$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess", + "UserColumnAttachType": 5, + "AttachTypeTag": "默认时薪" + } + }, + "CellType": { + "$type": "ElementUI.InputNumberCellType, ElementUI", + "CommandList": [], + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "step": 1, + "controls": false, + "controlsPosition": true, + "IsDisabled": true + } + }, + "8,1": { + "BindingInfo": { + "TableName": "项目成员表", + "ColumnName": "岗位ID", + "GUID": "fdbf4197-fa81-407e-8471-5bb15a95a4c8" + }, + "CellType": { + "$type": "ElementUI.SelectCellType, ElementUI", + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Block_Command, Notiflix_Forguncy", + "Cell": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目成员详情!B9" + }, + "Title": "获取中" + }, + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "岗位", + "TableValue": { + "TableName": "项目岗位", + "TableValueType": 1, + "BindingInfos": [ + { + "BindingInfo": { + "TableName": "项目岗位", + "ColumnName": "默认时薪", + "GUID": "fc96af9b-45a5-4390-a5e6-d6457ff37273" + }, + "ColumnName": "默认时薪" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "项目岗位", + "ColumnName": "ID", + "GUID": "de9d950e-3a64-451e-91ae-f82c4a256835" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目成员详情!B9" + } + }, + "NullFormulaValueQueryPolicy": 0, + "TopCount": "1" + }, + "ID": "f1e8788e6b7f43ada37ce5974657e4b9" + }, + { + "$type": "Notiflix_Forguncy.Block_Command, Notiflix_Forguncy", + "FunctionName": "remove", + "Cell": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目成员详情!B9" + }, + "Title": "获取中" + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=岗位" + } + ] + }, + "value": "%Null%", + "compareType": 1 + }, + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=项目成员详情!岗位.默认时薪" + } + ] + }, + "value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目成员详情!B12" + }, + "compareType": 1 + } + ] + }, + "CommandList": [ + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "ConfirmDialogSettings": { + "Title": "确认", + "FormulaText": "当前岗位时薪于设置不一致，是否为你更新？", + "YesButtonText": "是", + "NoButtonText": "否", + "ConfirmIcon": 1 + }, + "CommandList": [ + { + "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目成员详情!B12" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目成员详情!岗位.默认时薪" + } + } + ] + } + ], + "ID": "d24a2f7b-c625-461a-a07a-857f2bcdb804" + } + ] + } + ], + "ID": "3b9893e2-a358-429a-99d0-049ce1b9c524" + } + ] + } + ], + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "useBinding": true, + "options": [ + { + "value": "黄金糕", + "label": "黄金糕" + }, + { + "value": "双皮奶", + "label": "双皮奶" + }, + { + "value": "蚵仔煎", + "label": "蚵仔煎" + }, + { + "value": "龙须面", + "label": "龙须面" + }, + { + "value": "北京烤鸭", + "label": "北京烤鸭" + } + ], + "bindingOptions": { + "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", + "TableName": "项目岗位", + "BindingInfos": [ + { + "BindingInfo": { + "TableName": "项目岗位", + "ColumnName": "ID", + "GUID": "ac894880-71bc-4521-87e0-944192ddb93f" + }, + "ColumnName": "value" + }, + { + "BindingInfo": { + "TableName": "项目岗位", + "ColumnName": "岗位名称", + "GUID": "96f973ab-a19c-4f6a-b03a-c279f0ebf7d8" + }, + "ColumnName": "label" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "项目岗位", + "ColumnName": "项目ID", + "GUID": "69a15af3-6c19-479c-86fb-65e3ac40a238" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目成员详情!项目ID" + } + }, + "CustomColumns": [] + }, + "placeholder": "请选择", + "noDataText": "无数据", + "filterInServerOptions": { + "matchMethod": "contains", + "loadingText": "加载中" + }, + "noMatchText": "无匹配数据" + }, + "DataValidationInfo": { + "IgnoreBlank": false + } + }, + "11,1": { + "BindingInfo": { + "TableName": "项目成员表", + "ColumnName": "默认时薪", + "GUID": "5ec66ac2-1b7c-4a99-b6eb-6b227e6435c6" + }, + "CellType": { + "$type": "ElementUI.InputNumberCellType, ElementUI", + "CommandList": [], + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "step": 1, + "controlsPosition": true + }, + "DataValidationInfo": { + "IgnoreBlank": false, + "InputMessageTitle": "提示", + "InputMessage": "如果任务没有设置时薪，则采用此处设置的时薪来计算收益" + } + }, + "14,1": { + "CellType": { + "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon" + } + ], + "Text": "取消", + "TemplateKey": "_RS_Information3" + } + }, + "14,12": { + "CellType": { + "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=项目成员详情!项目ID" + } + ] + }, + "value": "%Null%", + "compareType": 1 + }, + "CommandList": [ + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon", + "tableData": { + "TableName": "项目成员表", + "ColumnName": "ID", + "GUID": "6ee34442-9d7c-49fb-bc92-17f7d0c3e78b" + } + }, + "value": "%Null%" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "项目成员表", + "UpdateType": "add", + "ShowConfirm": false + } + ], + "ID": "3ef5972e-4224-4329-83e7-89a8db26b303" + }, + { + "CommandList": [ + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "项目成员表", + "ShowConfirm": false + } + ], + "ID": "92afc930-79bb-47ae-b6aa-e8cde6732512" + } + ] + }, + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "Message": "操作成功" + }, + { + "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon", + "ReloadData": true, + "ClosePopupReturnValues": [ + { + "Name": "成员ID", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目成员详情!ID" + } + } + ] + } + ], + "ID": "333bec23-450e-4a17-b4f0-e03c73a2cda6" + }, + { + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "FourStandardStyle": "failure", + "Message": "请指定项目" + } + ], + "ID": "ba01a341-f200-48b9-87b6-76cf22478b0d" + } + ] + } + ], + "Text": "保存", + "TemplateKey": "_RS_Main1" + } + }, + "16,0": { + "BindingInfo": { + "TableName": "项目成员表", + "ColumnName": "项目ID", + "GUID": "cc5c0ec5-c025-4baa-9241-87b443d7c451" + } + }, + "16,4": { + "BindingInfo": { + "TableName": "项目成员表", + "ColumnName": "ID", + "GUID": "314562f3-292a-48d6-ae9b-f410d11976b3" + } + } + }, + "StyleDatas": { + "Styles": [ + { + "FontFamily": 0, + "FontSize": 13.333333333333332, + "Formatter": 1 + }, + { + "FontFamily": 0, + "FontSize": 13.333333333333332 + }, + { + "FontFamily": 0, + "FontSize": 13.333333333333332, + "Formatter": 2 + }, + { + "BorderBottom": 0 + }, + { + "Background": 4, + "BorderBottom": 1, + "BorderTop": 1, + "BorderLeft": 1 + }, + { + "BorderBottom": 1, + "BorderTop": 1 + }, + { + "BorderBottom": 1, + "BorderTop": 1, + "BorderRight": 1 + } + ], + "Types": { + "Strs": [ + "Body", + "[AUTO]General", + "¥#,##0_);[Red](¥#,##0)", + "Background 2 0", + "#FFFFFF00", + "black" + ], + "Borders": [ + { + "Color": 3 + }, + { + "Color": 5 + } + ] + }, + "CellStyles": { + "1,1": 0, + "1,2": 1, + "1,3": 1, + "1,4": 1, + "1,5": 1, + "1,6": 1, + "1,7": 1, + "1,8": 1, + "2,1": 1, + "3,1": 1, + "3,2": 1, + "3,3": 1, + "3,4": 1, + "3,5": 1, + "3,6": 1, + "3,7": 1, + "3,8": 1, + "3,11": 2, + "3,12": 2, + "3,13": 2, + "3,14": 2, + "4,1": 0, + "4,2": 1, + "4,3": 1, + "4,4": 1, + "4,5": 1, + "4,6": 1, + "4,7": 1, + "4,8": 1, + "4,11": 2, + "4,12": 2, + "4,13": 2, + "4,14": 2, + "5,1": 2, + "7,0": 1, + "7,1": 0, + "7,2": 1, + "7,3": 1, + "7,4": 1, + "7,5": 1, + "7,6": 1, + "7,7": 1, + "7,8": 1, + "7,9": 1, + "7,10": 1, + "7,15": 1, + "8,0": 1, + "8,1": 1, + "8,15": 1, + "9,0": 1, + "9,1": 1, + "9,2": 1, + "9,3": 1, + "9,4": 1, + "9,5": 1, + "9,6": 1, + "9,7": 1, + "9,8": 1, + "9,9": 1, + "9,10": 1, + "9,11": 1, + "9,12": 1, + "9,13": 1, + "9,14": 1, + "9,15": 1, + "10,0": 1, + "10,1": 0, + "10,2": 1, + "10,3": 1, + "10,4": 1, + "10,5": 1, + "10,6": 1, + "10,7": 1, + "10,8": 1, + "10,9": 1, + "10,10": 1, + "10,11": 1, + "10,12": 1, + "10,13": 1, + "10,14": 1, + "10,15": 1, + "11,0": 1, + "11,1": 1, + "11,15": 1, + "12,1": 3, + "12,2": 3, + "12,3": 3, + "12,4": 3, + "12,5": 3, + "12,6": 3, + "12,7": 3, + "12,8": 3, + "12,9": 3, + "12,10": 3, + "12,11": 3, + "12,12": 3, + "12,13": 3, + "12,14": 3, + "14,1": 0, + "14,2": 1, + "14,3": 1, + "14,12": 0, + "14,13": 1, + "14,14": 1, + "16,0": 4, + "16,1": 5, + "16,2": 5, + "16,3": 6, + "16,4": 1 + }, + "SheetStyle": { + "FontFamily": 0, + "FontSize": 13.333333333333332 + } + }, + "Spans": [ + "14,1,1,3", + "14,12,1,3", + "2,1,1,14", + "8,1,1,14", + "11,1,1,14", + "16,0,1,4", + "16,4,1,3", + "5,1,1,14" + ], + "PageInfo": { + "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", + "PermissionData": { + "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionData, Forguncy.RbacPermission.Core", + "permissionResource": { + "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionResource, Forguncy.RbacPermission.Core" + }, + "permissionBindings": [ + { + "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionBinding, Forguncy.RbacPermission.Core", + "roleNames": [ + "FGC_LoginUser" + ] + } + ] + }, + "RowBreakLines": [], + "RepeatRangeSettings": [], + "RelatedDataTableName": "项目成员表" + }, + "PrintInfo": { + "PaperSize": {}, + "Margin": {} + }, + "CustomNames": [ + { + "Name": "项目ID", + "Formula": "项目成员详情!$A$17" + }, + { + "Name": "ID", + "Formula": "项目成员详情!$E$17" + } + ] +}//zjp1dKiZsTgWzcBy7k57awgY+9kFNxH9u+IgQidUdzMYfTtdqrHWCV3f0iSJOkVgBwYz0zLlbtIaooMIjwxuTfWlKcGhZctUW52+f/7tf1YOSkwfE96Isr6kstFx4OxZjUhhtyjtQivhbqYNgRZQWe47QlKB0iZi//0zuYcP5qi80wKR53H1Hcx0yO971Tte07/bh8CptxgH4/tAZM1wZiWXkF5Guktcyh8n41vwsTrgwcd+gzp10sWl1xMHDQkVwMLBe4gRMXEWG9IUUeCOSIaMnX4KyVP+AjbXysX11b7W7sHPMnnjxgKAbI2NNTEfDnLZ/sKqvsPpJJyWBh1Kygjy+xfPpbKlPUhHalJvLBIEopuTSoDlRr8dJA4V5N8gYXLzqGDzqS5a77GdFl/aiOF7IAeTB/H+tO3sG9udfA00zpPuF07ZcP6zN3XFfvkkJt1RcVwwbBgdI185G/3hEgy6+ekitCVDnFepnnEEJ0YeyDnAs/3/kT2j0xKwo+93PaE2vlgrf4KvgxBm4M/FFbhXjrgJf+dvc/WvLxJGTtdJKJUIe0rB+hXqVgzSErLINSruSDxRLFrMNZLMAHan6ZZl71Xd22VAuqqWGLqVXC9IgyxL9ZMHRnCvKBDl+lerFIqC0hsYxnwfR+MyN8ZBM75CO9qHKo2XaYdMXvEPZxCecZFqTGW6nawfvXgn0EVUIl1Y+saAgmqtajiYnSSF9iuwP3cfzjEpBaKGdyoZkIl0czH2vu4hSZcfKuOy3JOSpgbmD1JOFScgh7cV+Z5dFcmss6dUzCVYTowdSeIf7HBDa5zUy2ZdHly7hmcGrVDq6FNuqTUsH03pYAJEU+sQ6vhhdCZzYoMO2zW5N7S5WKJo75LW0/NXXJoPbOGLa2ecYMxSYsLaS2qImwcoRTNY5w==|920 \ No newline at end of file diff --git a/Pages/项目/项目成员详情.rd b/Pages/项目/项目成员详情.rd new file mode 100644 index 00000000..9dd7a824 --- /dev/null +++ b/Pages/项目/项目成员详情.rd @@ -0,0 +1,18 @@ +{ + "PageType": 0, + "ColumnCount": 16, + "RowCount": 17, + "Formulas": { + "5,1": "IFERROR(ODATA(\"用户信息视图?$select=默认时薪&$filter=用户名 eq \"&IF(ISBLANK(B3),\"null\",\"'\"&B3&\"'\")&\"&$top=1\"),\"\")" + }, + "CustomNames": [ + { + "Name": "项目ID", + "Formula": "项目成员详情!$A$17" + }, + { + "Name": "ID", + "Formula": "项目成员详情!$E$17" + } + ] +} \ No newline at end of file diff --git a/Pages/项目首页/项目标题.json b/Pages/项目/项目首页/项目标题.json similarity index 93% rename from Pages/项目首页/项目标题.json rename to Pages/项目/项目首页/项目标题.json index e89325fa..278bebe2 100644 --- a/Pages/项目首页/项目标题.json +++ b/Pages/项目/项目首页/项目标题.json @@ -252,7 +252,7 @@ "$type": "LoadingCommand.EndLoadingCommand, LoadingCommand" } ], - "ID": "e41ad2e9-e738-44ae-9d9c-c879262f7346" + "ID": "2da05b25-ac8b-4a2f-952f-a512bb15a679" } ] } @@ -370,7 +370,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "bf09c564-9887-49a5-ba0c-7ed60259cd71" + "ID": "fbdf945f-8a62-482f-9ec0-8a7b7a85e890" }, { "Condition": { @@ -391,7 +391,7 @@ "PageName": "项目配置首页" } ], - "ID": "d315568a-84c1-474b-b36d-0902ce41841f" + "ID": "6406a4c8-a0a3-44d1-9f20-f56b08ee2e6a" }, { "Condition": { @@ -434,7 +434,7 @@ } } ], - "ID": "aa5575cc-9221-4088-8d57-21b70838acdc" + "ID": "bf74c72c-90d6-4115-9d7d-c3334a062239" }, { "Condition": { @@ -470,12 +470,12 @@ "Message": "操作完成" } ], - "ID": "d4fd1c0a-43f0-4f6b-b753-a66d2a2d2b8e" + "ID": "74c532af-70e6-440d-b1e2-f79b68857a05" } ] } ], - "ID": "73c7ce0a-6c29-4a9c-8bc4-f34f2602c10d" + "ID": "e06991e6-a2f6-40a6-8204-e150bc069c50" } ] } @@ -548,7 +548,7 @@ ] } ], - "ID": "e72e5d6b-ef17-437e-bf77-3f73b5123686" + "ID": "b1c94289-5eef-4f80-9501-4214b39cbeaf" } ] } @@ -573,28 +573,28 @@ "Value": "项目工时", "Name": "工时" }, - { - "Value": "文档", - "Name": "文档" - }, { "Value": "项目成员", "Name": "人员" }, { - "Value": "负荷", + "Value": "项目负荷", "Name": "负荷" }, { - "Value": "钉钉群", + "Value": "项目群", "Name": "沟通" }, { - "Value": "代码", + "Value": "项目文档", + "Name": "文档" + }, + { + "Value": "项目代码", "Name": "代码" }, { - "Value": "统计", + "Value": "项目统计", "Name": "统计" } ], @@ -775,4 +775,4 @@ "Formula": "项目标题!$O$6" } ] -}//IdTEDTFa8yUELguX+Y3GEgl602drJwF6gymv1sE3ZmDhxZiDpjuuxnQV42YqdeW9zBZ/JG/jxK3hE/6uZ0V1i6TPiPshtUJvJArkScgjlsfZPn4Isao63MFwzsUXywYxDMLIi3oPfz4lNht2TGqlM8s4U/TSFW+FtEWshCncjAYjzPi3Y8icF3O838VvXXGx6awu3kbwShlvybfmcuOSy27yV69O/9biTjaz4HkBMafD5TmZ7wrl0BoEaz/rb6pxUcspCiFn+vLSH5T6gp0eJ8et0xUVXLvIpasHiL5Rup1nJ8xdfFySYbglilAtGU/5J7hdIwOzcn2U5gY5qNLJUR1z7Tt2pT065f9+PRzymHT0FiicbSKtz4I1t/Ny15A8jmql0q2A2P3WNeiox/jdA4cWXK0qeYJ///0buvOPW5s0eUXTyMD1Y0Gt9H2H0A3NXyV024Mp/KgI7vHhCb0drV2WarEb/Lq8x9xgntClgzWclg+BMd3ICK5Iy5Mv53bOS0e0Kw6VkpBY+U+XEqczHqjLyIJWrCZFnR3EbsUa6DEQGikUib4dKXWZ8rZOmoWzARl+MmxxVo64n+gDLrCt3T0epjVE36oGQgjxP7uDkb3qT9v6FrAUzio7p/3cErUvV7Rx5F02tIlZoVtp4oYEqTiRMEzKo9Q//j+sx8aCPoiLa1q103P/b5RODEfk1KwynH2C1UOCWiXkc6Iiuk0e6watf/ULJ76ZIHSvGZmqifAAMRO4LLX0Nri6EuP2c+gOy+DxBAHqcmKgsE/53tcrzHrUhHOk3SW/f0cJ/WtHDNr7DeWdNvzYAyXOEUccQvYib47YHJL7OsWCU8R7SOWv+vGNY5T5PkPsx8/a3ZrsmEKiJiauquN441F2LXulHqgXiaY4MngiOB54LhUlCS5TFQ==|920 \ No newline at end of file +}//J7Ajnq25wPyn0K40+h1acYmX0m85HEVtGHgGOXJwqJb64bwUCYmp9t4OSeh58a//cYPw0UHKrU0IwK+dcfucaH51cHp0oJfnzDMdDAdF374DaDYm1zvuCVMBFwGykNN0JD+94D7U4TEoQLBRFc+Y0+Fg78Tr2LYRWR0FZgbHyFPuzlqVrRBrtUEdA/eSftNThyCNUuKs1SAu+qToNpkG2VwT4CxOv8chVO7iBKlGyl3JzcObialzg5jJQFo2ayD7PGmpNUCVfjgcxOJ4yjZQjD6VYbYMD+RB/T+MWXK4z+d02uxEnNCOyj59KU29bVKuUE74T1A25fTnBpFzEIA9gJrrv9FkXWZmFZUBgiCvbsAroWwhIBNkQDQxmfV37x0P0MxppChpfsDQIH2mMjolv0SXGOfA3OulPEbqupd/JaqLHAvYAZe5qp1NKV212IJR0uhKdTXerLfNczYXPUkGHDw22q7hBS7UrT5S1JkpxVEO6nFFs7aVwmXUiMp9hH1OlbaXI1LyECbqnhxlgg7Th40ouBLrh3hj9+MaSF58S4UBJACSfjw/qTon53LmRfzvb4W9hvc3W0NgpnUJxjYTFshCparej6dZ9gkNfzyBJ7S5mAxm4HD16+wulTcSVIB2sdxVqPseYYoCgjfGUroUAksTJe6Vz2UKZ2YL41MZOqYn79E7TRGOgObGAN4SMLZCTB1HaSn6g0v1ndAkvCbNg1j8lhxk9jtcYhntxRzZJtQWXeeYrgXZoWVzkhxkyFrjvnXRpIFWdjNy1rbzDb/PudBMsmygViIez8/jNIweoU5VZ7VjgRyxdvYl7XkSbRSgb5zqmvpQ3/vs7Cg30mycwx302rwzANNET4d5or5IiF4ZJXgyCpi6XrAieGwm4aL0L7NqbRv9tbIphjan90yzNA==|920 \ No newline at end of file diff --git a/Pages/项目首页/项目标题.rd b/Pages/项目/项目首页/项目标题.rd similarity index 100% rename from Pages/项目首页/项目标题.rd rename to Pages/项目/项目首页/项目标题.rd diff --git a/Pages/项目首页/项目信息.json b/Pages/项目/项目首页/项目配置/项目信息.json similarity index 97% rename from Pages/项目首页/项目信息.json rename to Pages/项目/项目首页/项目配置/项目信息.json index b543854e..11c57671 100644 --- a/Pages/项目首页/项目信息.json +++ b/Pages/项目/项目首页/项目配置/项目信息.json @@ -898,7 +898,7 @@ } ], "Comments": "如果流程发起后，存在当前用户正在办理的任务，那么弹出任务详情页面", - "ID": "f5ed9807-e089-4980-93da-4300af09393f" + "ID": "350f0ab4-392c-4404-94b5-2866e5e2a3eb" } ] } @@ -952,7 +952,7 @@ } ], "Comments": "如果流程发起后，存在当前用户正在办理的任务，那么弹出任务详情页面", - "ID": "6edbff22-cab7-4a57-adc1-bb0bde9962c7" + "ID": "29369a71-9ba3-404f-a296-6fb9e785ba97" } ] } @@ -1384,7 +1384,7 @@ "ReloadData": true } ], - "ID": "67d1f856-a969-49d2-aa85-29d3deed7e3f" + "ID": "a7af1694-6f0c-4d59-8435-2836d7463638" }, { "CommandList": [ @@ -1399,12 +1399,12 @@ "BtnText": "知道了" } ], - "ID": "917f1617-c025-4a83-b595-6a150d176efe" + "ID": "597f9e25-fb50-4dd3-9019-74db6a8fd632" } ] } ], - "ID": "bc2c28f9-05fd-4bec-bb93-83bf74506def" + "ID": "5b915fd3-1dbc-479f-a336-3f31368e8c43" }, { "CommandList": [ @@ -1422,7 +1422,7 @@ "ReloadData": true } ], - "ID": "ed40dad9-627a-42a9-a0df-9aa05188a39d" + "ID": "c3b76761-dc4b-4427-bc09-0baa4b33dfac" } ] } @@ -2032,4 +2032,4 @@ "Formula": "项目信息!$B$36" } ] -}//UoQlvJtY7eZcdRBW2Qyt4b991A1ztyTeq9QgypVs5d65Qm8MxSTyvzHcfYEC0LlW1MN7MeAxBhhqd8R2uyXlHfeSb5FQkSgvkwLM8Mi1k6XVQWpwRtPKnLdo3Amx+kX+7SZWK+7SfDPdJKsE2QWOysM+wKtbRlNL/9RLUAOXBu3moKlHl8MsABmqPva4/EwK+D1y/6MqnOtkVSDG9Y1Jj5GP1fQmP4O4zvOXLqZvT9y29S51TYv9VTStgmKIIXLbGDZr/FL9VzPGb3KkksG/nrHUAAlYSV9pAOH04YlMj3vvM7v0/7Dj9zbRm+7mkTiReVkkjpJkeD3y1BXL1aYG3yLfbdKw8TvUmJcQBnSkOnr3L7l/sGCmCcdkwM1low+K0DRJQuNzZw+uvSZoeAVo8sycESQeT1zc4Vx/ett1aPjX6qCOtger3BWM8O1m1W57RRtUbo4/uxDmY3jhFqPwVZ9Nb/XvcZfgW4Ovw3VOcCXNdmFX+j7ebZuSvQXVqA32pJdNP+Xp2kMc4ktZdVkS/Le5sf+uAS2A6CmgwlFK62Xz5Fa47kvFxNQ+WNFfrGgCTlQD/gCVcmedEUIogn8lsVfLDVU/UkePDWOHkTwV2x4sDg4Wix6hwOxoOp/YK7Zz8m0CmsWe5jGSzTyoz9Fc5VwU0FiorrYKr1jmgny8YqDvaLm/ek4CB88ZW+wUMBGW16spniDgwlEraY+DiDNytHpPkY6mSFjYgoZsnu4AXUdtcqQqpVwgiHuHHuRdb72w8m8Dw4qL7rPcJfy2mMQhiPFETOvmcppQNH/JHaPKh0JnMc2rDx9MGmPjoBozHC8WAeYkFLYZqVcs/4g2pNKJAZWrX9m6kXkFYpO4XZw9EYNirhyK/fxuZkggFWZqQbC1NtJBc2Nz1eY0nOwbBbRg/g==|920 \ No newline at end of file +}//LiNbT/tW1cFv+8CPlW5vz3LfdwC0LE8GDQ54/tlsVMrF8vKrxBZbXs/LajJENaAL+9w4YqKzp4Qer+ieXtx2kRXejiMgoF3AsXzqUABONGbE8aIueTBzlkdjTBBqZ5YHyl3UkNX58Gob4L6JOGnvyxOF6I0rOFJSxOejtpQLiI+dQwNuyBUEYUVBGxQGAbmxg/3DMrxVF6NNVwIOxlpnuT16hn1mu1RlnjdCGary2yNm+KPpzAzY6YXt6nlMIwA5CSy99Z9NdpgppuKOiz5In7oHFNByQ5kcoVSi64F6Vft7/67opBNVhAxcVi+oVr/Z3ZWxOv9hGws9oM+KjUZ0LrfLVyyH0LPWW91IbiHzNz9jVbCPh2cRRmK5PyJ3dA1sz9qsNm74JGn58bdlxlkLJQRpYJVZtrmTFkQa1wwsBaR2F0/Q9xDsfhK1scaOwtpgFU+WClfpjim/zm/tav1gUpA4hSZ5OKMuNFecleSSSZB5pyrkSQQK82FAWzhJlZHaQCfCwSu0SuTUyjqrr5HzRtWakGaGxx3YboYC7ud61lkXft6n5L7o2FmJyEPyA4DgbsN2nbosq6+GxH1U6CZxSR3B7KJ0KnjMi7x7urOLuOiOyhsQCo4u7jxwK6vJKBtzrsgNQJOJRb2hSaNZRq5c+JvFim23bYLt5tMYSfQsdGyivtORGLnL61EXpGI2Ap6DPmp4c2EnmKgNDwsYdrN5ycR2jH8B3MbDRw+OCo07aPXanwcXb5Zv46UKHwx8xCbGkpxecgjFR5dcyc5DBIYsveti3555QqHLvpPUit5jwshRqkjaq+KY9Z6TF5EEy/aDtn7V+Z9ZDL2kvjdbZTx0uHoXstE7caVxMsf6DIfLAJGq3jT90CFoVKCgHUQN5IZe01FxBGxiVE+VIFQaSGQYLA==|920 \ No newline at end of file diff --git a/Pages/项目首页/项目信息.rd b/Pages/项目/项目首页/项目配置/项目信息.rd similarity index 100% rename from Pages/项目首页/项目信息.rd rename to Pages/项目/项目首页/项目配置/项目信息.rd diff --git a/Pages/项目首页/项目审批.json b/Pages/项目/项目首页/项目配置/项目审批.json similarity index 100% rename from Pages/项目首页/项目审批.json rename to Pages/项目/项目首页/项目配置/项目审批.json diff --git a/Pages/项目首页/项目审批.rd b/Pages/项目/项目首页/项目配置/项目审批.rd similarity index 100% rename from Pages/项目首页/项目审批.rd rename to Pages/项目/项目首页/项目配置/项目审批.rd diff --git a/Pages/项目首页/项目配置/项目岗位配置.json b/Pages/项目/项目首页/项目配置/项目岗位配置.json similarity index 100% rename from Pages/项目首页/项目配置/项目岗位配置.json rename to Pages/项目/项目首页/项目配置/项目岗位配置.json diff --git a/Pages/项目首页/项目配置/项目岗位配置.rd b/Pages/项目/项目首页/项目配置/项目岗位配置.rd similarity index 100% rename from Pages/项目首页/项目配置/项目岗位配置.rd rename to Pages/项目/项目首页/项目配置/项目岗位配置.rd diff --git a/Pages/项目首页/项目配置/项目配置首页.json b/Pages/项目/项目首页/项目配置/项目配置首页.json similarity index 100% rename from Pages/项目首页/项目配置/项目配置首页.json rename to Pages/项目/项目首页/项目配置/项目配置首页.json diff --git a/Pages/项目首页/项目配置/项目配置首页.rd b/Pages/项目/项目首页/项目配置/项目配置首页.rd similarity index 100% rename from Pages/项目首页/项目配置/项目配置首页.rd rename to Pages/项目/项目首页/项目配置/项目配置首页.rd diff --git a/Pages/项目首页/项目首页子页面/任务列表.json b/Pages/项目/项目首页/项目首页-容器页面/任务列表.json similarity index 100% rename from Pages/项目首页/项目首页子页面/任务列表.json rename to Pages/项目/项目首页/项目首页-容器页面/任务列表.json diff --git a/Pages/项目首页/项目首页子页面/任务列表.rd b/Pages/项目/项目首页/项目首页-容器页面/任务列表.rd similarity index 100% rename from Pages/项目首页/项目首页子页面/任务列表.rd rename to Pages/项目/项目首页/项目首页-容器页面/任务列表.rd diff --git a/Pages/项目首页/项目首页子页面/项目工时.json b/Pages/项目/项目首页/项目首页-容器页面/项目工时.json similarity index 60% rename from Pages/项目首页/项目首页子页面/项目工时.json rename to Pages/项目/项目首页/项目首页-容器页面/项目工时.json index d8abbd5e..6e81e6ae 100644 --- a/Pages/项目首页/项目首页子页面/项目工时.json +++ b/Pages/项目/项目首页/项目首页-容器页面/项目工时.json @@ -254,10 +254,6 @@ "Count": 40, "DefaultSize": 32.0 }, - "Values": { - "1,26": "任务详细视图", - "1,35": "查询" - }, "AttachInfos": { "1,1": { "CellType": { @@ -342,47 +338,25 @@ "Style": 3, "Items": [ { - "Value": "", - "DisplayValue": "所有" + "Value": "项目视图", + "DisplayValue": "项目视图" }, { - "Value": "计划", - "DisplayValue": "计划工时" + "Value": "任务视图", + "DisplayValue": "任务视图" }, { - "Value": "实际", - "DisplayValue": "实际工时" + "Value": "人员视图", + "DisplayValue": "人员视图" } - ] - }, - "RulesGuidList": [ - "b6b4b68b-08cc-42ce-a005-d99ef29be911" - ] - }, - "1,26": { - "CssName": "singlebox", - "CellType": { - "$type": "Forguncy.RadioGroupCellType, ServerDesignerCommon", - "Style": 3, - "CellDefaultValue": "任务详细视图", - "Items": [ - { - "Value": "任务详细视图", - "DisplayValue": "任务详细视图" - }, - { - "Value": "人员统计视图", - "DisplayValue": "人员统计视图" - } - ] - } - }, - "1,35": { - "CellType": { - "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", + ], "CommandList": [ { - "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", + "$type": "Notiflix_Forguncy.Block_Command, Notiflix_Forguncy", + "Cell": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目工时!L4" + }, "Title": "加载中" }, { @@ -395,24 +369,96 @@ "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", "cellLocations": [ { - "SerializeProperty": "=项目工时!AA2" + "SerializeProperty": "=项目工时!L2" } ] }, - "value": "任务详细视图" + "value": "项目视图" }, "CommandList": [ { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", "ParameterName": "数据列表", "TableValue": { - "TableName": "任务工时表", + "TableName": "View_任务工时统计", "BindingInfos": [ { "BindingInfo": { - "TableName": "任务工时表", + "TableName": "View_任务工时统计", + "ColumnName": "工时日期", + "GUID": "1eabda85-4590-4a80-97d5-4832f56c1b32" + }, + "ColumnName": "日期" + }, + { + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "总计划工时", + "GUID": "1dba925a-ee48-483a-839c-829d96f135fb" + }, + "ColumnName": "总计划工时" + }, + { + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "总实际工时", + "GUID": "02533bb1-24de-4df8-b6a8-6ceec8a1fcc1" + }, + "ColumnName": "总实际工时" + }, + { + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "总核定工时", + "GUID": "a53312c8-5aa0-4cb1-bcf2-0ff52e4414a0" + }, + "ColumnName": "总核定工时" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "项目ID", + "GUID": "3c681ee0-e2ea-4ac6-8d72-89d3e9363d7a" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目工时!项目ID" + } + }, + "NullFormulaValueQueryPolicy": 0 + }, + "ID": "f9fb593fe9db492e8f528f7016e24b57" + } + ], + "ID": "9c7d6b0d-6129-49d6-987e-b4ac92917421" + }, + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=项目工时!L2" + } + ] + }, + "value": "任务视图" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "数据列表", + "TableValue": { + "TableName": "View_任务工时统计", + "BindingInfos": [ + { + "BindingInfo": { + "TableName": "View_任务工时统计", "ColumnName": "任务ID", - "GUID": "007db99a-0c20-441c-ae48-e2dd7c22e784", + "GUID": "fbc81aaa-b6ce-4250-bbd1-d268b235eac9", "RelationBinding": { "RelatedTable": "任务表", "RelatedColumn": "ID", @@ -423,109 +469,47 @@ }, { "BindingInfo": { - "TableName": "任务工时表", - "ColumnName": "任务ID", - "GUID": "24c769ed-cecc-4444-b539-8bdd01fe1f93", - "RelationBinding": { - "RelatedTable": "任务表", - "RelatedColumn": "ID", - "DisplayColumn": "任务类型" - } + "TableName": "View_任务工时统计", + "ColumnName": "总计划工时", + "GUID": "0594f4a2-0a12-4e0f-a144-a4f331054da7" }, - "ColumnName": "任务类型" + "ColumnName": "总计划工时" }, { "BindingInfo": { - "TableName": "任务工时表", - "ColumnName": "执行人", - "GUID": "724ce8a1-3b00-4021-9147-d30b72d488f1", - "AttachType": { - "$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess", - "UserColumnAttachType": 1 - } + "TableName": "View_任务工时统计", + "ColumnName": "总实际工时", + "GUID": "d7ec7d6d-9b75-417a-8757-a5de515ea460" }, - "ColumnName": "执行人姓名" + "ColumnName": "总实际工时" }, { "BindingInfo": { - "TableName": "任务工时表", - "ColumnName": "工时类型", - "GUID": "0c4cbf0a-50b4-42ea-ab55-abd411093b26" + "TableName": "View_任务工时统计", + "ColumnName": "总核定工时", + "GUID": "a55760ee-f371-4c28-8c88-55d55e896433" }, - "ColumnName": "工时类型" - }, - { - "BindingInfo": { - "TableName": "任务工时表", - "ColumnName": "工时", - "GUID": "530229df-a53e-4a33-8c8f-f4705427b085" - }, - "ColumnName": "工时" - }, - { - "BindingInfo": { - "TableName": "任务工时表", - "ColumnName": "时薪单价", - "GUID": "8451aa5b-630d-4d7d-a19c-33b431c903cb" - }, - "ColumnName": "时薪单价" - }, - { - "BindingInfo": { - "TableName": "任务工时表", - "ColumnName": "计算提成", - "GUID": "666c145c-8f07-4f6f-89ef-7d77e2d24403" - }, - "ColumnName": "计算提成" + "ColumnName": "总核定工时" } ], "SqlCondition": { - "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", - "SubConditions": [ - { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "任务工时表", - "ColumnName": "项目ID", - "GUID": "cdaa64ff-354e-467c-9e69-29a7d05b5035" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目工时!项目ID" - } - }, - { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "任务工时表", - "ColumnName": "工时类型", - "GUID": "34445eb7-1e47-44ae-b29c-f5c3b6785126" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目工时!L2" - } - }, - { - "$type": "ForguncyDataAccess.TextCESqlCondition, ForguncyDataAccess", - "CompareType": 8, - "ColumnBindingInfo": { - "TableName": "任务工时表", - "ColumnName": "执行人", - "GUID": "2bb4e0ec-547b-4431-b4df-47669d4123fe" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目工时!B2" - } - } - ] - } + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "项目ID", + "GUID": "0691f4cb-3b30-4cd0-8103-26736647f472" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目工时!项目ID" + } + }, + "NullFormulaValueQueryPolicy": 0 }, - "ID": "ee1272d3f7d148be98b767adca30f333" + "ID": "ae94acb2e997401fadb422a6f136b747" } ], - "ID": "f9265ab3-1ca7-45c4-ad5b-3b0c874e3d94" + "ID": "49445c83-33ab-40a2-97dc-584e245d7039" }, { "Condition": { @@ -534,11 +518,11 @@ "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", "cellLocations": [ { - "SerializeProperty": "=项目工时!AA2" + "SerializeProperty": "=项目工时!L2" } ] }, - "value": "人员统计视图" + "value": "人员视图" }, "CommandList": [ { @@ -558,7 +542,7 @@ "DisplayColumn": "全名" } }, - "ColumnName": "全名" + "ColumnName": "执行人" }, { "BindingInfo": { @@ -575,43 +559,33 @@ "GUID": "0e51eedc-dab5-4e3f-8ad7-b9d0dd7df5df" }, "ColumnName": "总实际工时" + }, + { + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "总核定工时", + "GUID": "df520f3f-bcab-4504-a8d8-5d3dae914e2a" + }, + "ColumnName": "总核定工时" } ], "SqlCondition": { - "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", - "SubConditions": [ - { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "项目ID", - "GUID": "11161dfd-418d-4b2f-a403-fd3a55983fde" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目工时!项目ID" - } - }, - { - "$type": "ForguncyDataAccess.TextCESqlCondition, ForguncyDataAccess", - "CompareType": 8, - "ColumnBindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "执行人", - "GUID": "c2cccfb9-3431-47bf-8da0-74ff61e27606" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目工时!B2" - } - } - ] + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "项目ID", + "GUID": "11161dfd-418d-4b2f-a403-fd3a55983fde" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目工时!项目ID" + } } }, - "ID": "423975ad0be54effb47397a2063fcba2" + "ID": "0ca30518e0c24ec0868448c038d1ec42" } ], - "ID": "efbec0d0-4663-4a32-a49e-b0da56457fb1" + "ID": "14f05650-e758-47af-a969-3eef58306edc" } ] }, @@ -630,6 +604,28 @@ } } }, + { + "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", + "TargetPageElement": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目工时!L4" + }, + "TargetType": "ElementUI.TableCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", + "MethodName": "SetTableColumnSetting", + "ParameterValues": { + "dataColumnName": "日期", + "columnSetting": { + "$type": "ElementUI.ColumnSettingBase, ElementUI", + "label": "日期", + "formatStr": "yyyy年MM月dd日", + "align": "center", + "headerAlign": "center", + "filter": true, + "multipleFilter": true, + "key": "abc74a0e-25a6-4b9b-9cab-4a4bad475182" + } + } + }, { "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", "TargetPageElement": { @@ -648,25 +644,89 @@ "filter": true, "multipleFilter": true, "showOverflowTooltip": true, - "key": "17497400-e0c4-4366-89d6-33e31abc98b2" + "key": "94ff0a10-99a1-4d26-baf7-7bd7d9d5006d" } } }, { - "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", + "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", + "TargetPageElement": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目工时!L4" + }, + "TargetType": "ElementUI.TableCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", + "MethodName": "SetTableColumnSetting", + "ParameterValues": { + "dataColumnName": "总实际工时", + "columnSetting": { + "$type": "ElementUI.ColumnSettingBase, ElementUI", + "label": "总实际工时", + "formatStr": "0.0", + "align": "center", + "headerAlign": "center", + "filter": true, + "multipleFilter": true, + "showOverflowTooltip": true, + "key": "94ff0a10-99a1-4d26-baf7-7bd7d9d5006d" + } + } + }, + { + "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", + "TargetPageElement": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目工时!L4" + }, + "TargetType": "ElementUI.TableCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", + "MethodName": "SetTableColumnSetting", + "ParameterValues": { + "dataColumnName": "总计划工时", + "columnSetting": { + "$type": "ElementUI.ColumnSettingBase, ElementUI", + "label": "总计划工时", + "formatStr": "0.0", + "align": "center", + "headerAlign": "center", + "filter": true, + "multipleFilter": true, + "showOverflowTooltip": true, + "key": "94ff0a10-99a1-4d26-baf7-7bd7d9d5006d" + } + } + }, + { + "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", + "TargetPageElement": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目工时!L4" + }, + "TargetType": "ElementUI.TableCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", + "MethodName": "SetTableColumnSetting", + "ParameterValues": { + "dataColumnName": "总核定工时", + "columnSetting": { + "$type": "ElementUI.ColumnSettingBase, ElementUI", + "label": "总核定工时", + "formatStr": "0.0", + "align": "center", + "headerAlign": "center", + "filter": true, + "multipleFilter": true, + "showOverflowTooltip": true, + "key": "94ff0a10-99a1-4d26-baf7-7bd7d9d5006d" + } + } + }, + { + "$type": "Notiflix_Forguncy.Block_Command, Notiflix_Forguncy", "FunctionName": "remove", + "Cell": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目工时!L4" + }, "Title": "加载中" } - ], - "Text": "查询", - "TemplateKey": "_RS_Main1", - "Icon": { - "Name": "Application/047_search_8.svg", - "BuiltIn": true, - "Color": "Background 1", - "UseCellTypeForeColor": true - }, - "IconSize": 14.0 + ] } }, "3,1": { @@ -779,7 +839,41 @@ "CellType": { "$type": "ElementUI.TableCellType, ElementUI", "ElTableName": "EL表格1", - "columns": [], + "columns": [ + { + "$type": "ElementUI.ColumnSetting, ElementUI", + "dataColumnName": "日期", + "label": "日期", + "formatStr": "yyyy年MM月dd日", + "align": "left", + "headerAlign": "center", + "key": "e616fdd9-6122-4ac4-ac2c-e7e6f47f11ec" + }, + { + "$type": "ElementUI.ColumnSetting, ElementUI", + "dataColumnName": "总计划工时", + "label": "总计划工时", + "align": "center", + "headerAlign": "center", + "key": "abba2432-3191-47d6-aad5-3555abf1dfa6" + }, + { + "$type": "ElementUI.ColumnSetting, ElementUI", + "dataColumnName": "总实际工时", + "label": "总实际工时", + "align": "center", + "headerAlign": "center", + "key": "9248be33-cd39-4d85-9241-91901ffd7543" + }, + { + "$type": "ElementUI.ColumnSetting, ElementUI", + "dataColumnName": "总核定工时", + "label": "总核定工时", + "align": "center", + "headerAlign": "center", + "key": "d2a0a8cb-6a0f-4dbf-a3b1-165603525ce5" + } + ], "actionButtons": [ { "$type": "ElementUI.ActionButton, ElementUI", @@ -799,13 +893,6 @@ "sumText": "合计", "size": "default" } - }, - "5,1": { - "BindingInfo": { - "TableName": "项目表", - "ColumnName": "工时核定方式", - "GUID": "2c63cef9-3953-4125-9367-3dcca8671612" - } } }, "StyleDatas": { @@ -814,57 +901,35 @@ "FontSize": 13.333333333333332, "Foreground": 0 }, - { - "FontFamily": 1, - "FontSize": 13.333333333333332 - }, - { - "FontSize": 13.333333333333332 - }, { "FontFamily": 1, "FontSize": 13.333333333333332, "HorizontalAlignment": 2 }, { - "FontFamily": 1 - }, - { - "HorizontalAlignment": 3 + "HorizontalAlignment": 2 } ], "Types": { "Strs": [ "black", "Body", - "Right", "Center" ] }, "CellStyles": { "1,1": 0, "1,11": 1, - "1,25": 2, - "1,26": 3, - "1,27": 4, - "1,28": 4, - "1,29": 4, - "1,30": 4, - "1,31": 4, - "1,32": 4, - "1,33": 4, - "1,35": 2, - "3,1": 5, - "4,1": 5, - "4,2": 5, - "4,3": 5, - "4,4": 5, - "4,5": 5, - "4,6": 5, - "4,7": 5, - "4,8": 5, - "4,9": 5, - "5,1": 2 + "3,1": 2, + "4,1": 2, + "4,2": 2, + "4,3": 2, + "4,4": 2, + "4,5": 2, + "4,6": 2, + "4,7": 2, + "4,8": 2, + "4,9": 2 }, "SheetStyle": { "FontFamily": 1 @@ -874,14 +939,23 @@ "1,1,1,9", "3,1,1,9", "3,11,1,28", - "1,11,1,8", - "1,35,1,4", - "1,26,1,8", - "5,1,1,4" + "1,11,1,28" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", "PageLoadedCommandList": [ + { + "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目工时!L2" + }, + "Value": "项目视图" + } + ] + }, { "$type": "Notiflix_Forguncy.Block_Command, Notiflix_Forguncy", "FunctionName": "remove", @@ -914,7 +988,7 @@ "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon", "Formula": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=IF(项目工时!$AA$2=\"任务详细视图\",0,1)" + "SerializeProperty": "=IF(项目工时!$L$2=\"任务详细视图\",0,1)" }, "GUID": "b6b4b68b-08cc-42ce-a005-d99ef29be911", "StyleInfo": { @@ -936,4 +1010,4 @@ "Formula": "项目工时!$B$6" } ] -}//8wiYoF9hDITqXz9OKXZcRiaUEoaCjKRIO5FQHxsHVGTPuqq2UB6M+TrJrXdpSv5E9pwRpLsXOY/ZcapXw9hrGiF0QM+4ZipS6IjPN69XaLXPXPx4s5I1/mgAb1koMoESSosO1mYa2NHhGXLuvUPv8KZtQ/Kxzs7aU4mGf46W7UGa/jPXZGA36eAIQLeHxSCtEOYI0Dn4qD3V5ztLXrOT25enjX9kad7w+jI5RRV/nxnhw5D3vD1nFNOUTtUzzFw6yJO+1j7hn9IoX9jyTZ+24WdNM7rqM36yXqLynXAEd6M5sR3HlvksARNnKROInLEwlvhOCUUFddymVDduwgfFylzrkHk5FjSlWPI0L/RSUSChvtDXs40ug80TL8MTQAJL5U3AZtoHw0le7nhaUACsXJY0NpDyr1U20sK31FrvNKUVtA0fm5ffl1h9z3vLrMq7fM5D5ZR9JBQ/gn4rvlSwSGdyibC5t8UWl+yupJkdBUTn7iuj3T7t3XttjgrVoix95TqBBQEG2UmBxfNnSUuRLVmZ4m4I4NcNompaX20erM2NdBQQss/tRsPTUsI/BuXyinMr0bGlASYBWXk/LoeqmZzjIOK6OHXkU1myW5YvsEM5nGRaSwheLSnUXgMM4BImapecfy6jwtcchAGCeK8mdU8ZgjS8v7InU2gql2ciwxlmcHuqd2RLmeJXM4o7unPDDMzPKRd7FUbMS3dULBIcSDncyDf06e1Dzx4UAtfQHkEr7vj+nyZ1WCvSNWZC73RMDd/07wo6qKZBw2UpvdNYNWaRWLXQ6TChSNzj3qv85xx8AYXdy3b7+vm0KeZfTAygB25F7Z0QBoGUqF0TlywuPxAdcac6N3MiTmeR8pQ+V9OWmsEw+9XmTx7nkTVqd0MmCb4GNc/1GSv7FO+SI0Bpyg==|920 \ No newline at end of file +}//NPdVgn4Sf4GpXH5lImBPxZ1WWVrTMnnKJiEtbtic9cif1FsYmnDOqnp32xDb46hD3su/LLmtZhECNcVQe7xvX7Iaay0VoDe3MVyYjSsEA4qV6+7lCUhJQmfJZNiDaDrqWe2vPixM4LkjYdpcQsy72adLjrR/sa8X2FhcaUCQ/50rxaiqp/LWZ4smGwvtUlUH+WChiPDysjqlUk2LDWEyeeF5CUa4KafHfUb1LS1aiPQ1hZnIRafgCnRa4xwz+DsICFP4Z4b/r5Pm0RG6HBct9daocRm39GB3iQeQMkpPCdF+SfXpxAhRtPBcmQS3HnDdod0lkMROLkSRaaF2aqv0D5oOQyqva52Dj+0qYV/nda+0cPq0NsorIT+PuKToZFUmdbwFIwu/7zApzKTfyxQuSRWmc5N9veo+Dosq6BDqA16mP9IJr7lxxYJTy9PMDEPY3ptU7j5An1Hvl1Bw1xsK/m7JEtrE9e783Ufrmy2W950dzqwnIx/LR6CZ7F0LSfvVih9LwkLPjE7dzsZtoqVFit1PUJi23NoLVx9O/V5U4OHU07uYowA1GpWMzTbnqbMTI1Ubk2Sb3gy2tUmgVScOZ6p3q4t3NwBXrm3oPn/hrzd9RhqIR/eNqnGdoogrSV2j0A8q5VO62dUWoVlN2QK4wlLXRNvyHoZQFsBj9ocDj12ihq0wb7g8eS95gi6pPm7WTd3g/YUpnHQUAV6wsYxGWPRTAB1o/wasbWbsYIsLnp65qmdtK81/efrVoHP2ZqGXC7Qhc1DGlACkFMBbngdOcCvEdvSuTvYM6Q1fUXHzNWuPFEg6HOar1TLqbS6B8yJ+zt/K6snoiPPigx95XkwAR0v9aHmiLP+Vg2qC/Cp9qhnSWqkDoOhqYybtwQS2/1eBJZwQ5630ftZvB7TMRV+hhg==|920 \ No newline at end of file diff --git a/Pages/项目首页/项目首页子页面/项目工时.rd b/Pages/项目/项目首页/项目首页-容器页面/项目工时.rd similarity index 100% rename from Pages/项目首页/项目首页子页面/项目工时.rd rename to Pages/项目/项目首页/项目首页-容器页面/项目工时.rd diff --git a/Pages/项目/项目首页/项目首页-容器页面/项目成员.json b/Pages/项目/项目首页/项目首页-容器页面/项目成员.json new file mode 100644 index 00000000..20329e37 --- /dev/null +++ b/Pages/项目/项目首页/项目首页-容器页面/项目成员.json @@ -0,0 +1,1011 @@ +{ + "Rows": { + "RowColumnAttachedInfos": { + "0": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 24.0 + } + }, + "1": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 35.0 + } + }, + "2": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 24.0 + } + }, + "3": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 24.0 + } + }, + "4": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 642.0, + "Mode": 2, + "MinLength": { + "Unit": 1 + }, + "MaxLength": { + "Value": 1.0 + } + } + }, + "5": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 24.0 + } + }, + "6": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0, + "IsHidden": true + } + } + }, + "InLogicalVisibleIndexes": [ + 6 + ], + "Count": 7, + "DefaultSize": 24.0 + }, + "Cols": { + "RowColumnAttachedInfos": { + "0": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "1": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "2": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "3": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "4": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "5": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "6": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "7": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "8": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "9": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "10": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 24.0 + } + }, + "11": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 24.0 + } + }, + "12": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "13": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "14": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "15": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "16": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "17": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "18": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "19": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "20": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "21": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0, + "Mode": 2, + "MinLength": { + "Unit": 1 + }, + "MaxLength": { + "Value": 1.0 + } + } + }, + "22": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "23": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "24": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "25": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "26": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "27": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "28": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "29": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "30": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "31": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "32": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "33": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "35": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "36": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "37": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "38": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "39": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "40": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 15.0 + } + } + }, + "Count": 41, + "DefaultSize": 32.0 + }, + "Values": { + "1,31": "添加岗位", + "1,36": "添加成员" + }, + "AttachInfos": { + "1,1": { + "CellType": { + "$type": "ElementUI.SelectCellType, ElementUI", + "CommandList": [], + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "useBinding": true, + "options": [ + { + "value": "黄金糕", + "label": "黄金糕" + }, + { + "value": "双皮奶", + "label": "双皮奶" + }, + { + "value": "蚵仔煎", + "label": "蚵仔煎" + }, + { + "value": "龙须面", + "label": "龙须面" + }, + { + "value": "北京烤鸭", + "label": "北京烤鸭" + } + ], + "bindingOptions": { + "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", + "TableName": "项目岗位", + "BindingInfos": [ + { + "BindingInfo": { + "TableName": "项目岗位", + "ColumnName": "ID", + "GUID": "bfcc082d-45d5-4a9d-9ded-1ec7236429a1" + }, + "ColumnName": "value" + }, + { + "BindingInfo": { + "TableName": "项目岗位", + "ColumnName": "岗位名称", + "GUID": "336ad858-d1b3-4e54-897f-89d8c7a54290" + }, + "ColumnName": "label" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "项目岗位", + "ColumnName": "项目ID", + "GUID": "bedfdf40-dcc2-47fd-9b50-9973bd9c0c0c" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目成员!项目ID" + } + }, + "CustomColumns": [] + }, + "placeholder": "筛选岗位", + "noDataText": "无数据", + "multiple": true, + "collapseTags": true, + "filterInServerOptions": { + "matchMethod": "contains", + "loadingText": "加载中" + }, + "noMatchText": "无匹配数据", + "clearable": true + } + }, + "1,31": { + "CellType": { + "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", + "PageName": "项目岗位详情", + "PassValues": [ + { + "Source": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目成员!项目ID" + }, + "TargetCell": { + "SerializeProperty": "=项目岗位详情!项目ID" + } + } + ], + "LoadBindingDataOption": 2 + } + ], + "Text": "添加岗位", + "TemplateKey": "_RS_Success1", + "Icon": { + "Name": "增加.svg", + "Color": "Accent 1", + "UseCellTypeForeColor": true + }, + "IconSize": 14.0 + } + }, + "1,36": { + "CellType": { + "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", + "PageName": "项目成员详情", + "PassValues": [ + { + "Source": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目成员!项目ID" + }, + "TargetCell": { + "SerializeProperty": "=项目成员详情!项目ID" + } + } + ], + "LoadBindingDataOption": 2 + } + ], + "Text": "添加成员", + "TemplateKey": "_RS_Main1", + "Icon": { + "Name": "增加.svg", + "Color": "Accent 1", + "UseCellTypeForeColor": true + }, + "IconSize": 14.0 + } + }, + "4,1": { + "CellType": { + "$type": "Forguncy.RepeaterCellType, ServerDesignerCommon", + "TemplatePageName": "6899a8cead694b3ba00307b6756dbd7", + "Command": { + "$type": "GrapeCity.Forguncy.Commands.CustomCommandObject, Forguncy.Commands", + "Commands": [ + { + "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目成员!B2" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目成员!ID" + } + } + ] + } + ], + "ParamProperties": { + "ID": "ID", + "岗位名称": "岗位名称", + "默认时薪": "默认时薪", + "成员数量": "成员数量" + } + }, + "DblCommand": { + "$type": "GrapeCity.Forguncy.Commands.CustomCommandObject, Forguncy.Commands", + "Commands": [ + { + "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", + "PageName": "项目岗位详情", + "LoadBindingDataOption": 1 + } + ], + "ParamProperties": { + "ID": "ID", + "岗位名称": "岗位名称", + "默认时薪": "默认时薪", + "成员数量": "成员数量" + } + }, + "DataSourceType": 1, + "DataSource": { + "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", + "TableName": "项目岗位", + "BindingInfos": [ + { + "BindingInfo": { + "TableName": "项目岗位", + "ColumnName": "ID", + "GUID": "c7c71cae-ff61-47fa-b1f7-1886fb5eee22" + }, + "ColumnName": "ID" + }, + { + "BindingInfo": { + "TableName": "项目岗位", + "ColumnName": "岗位名称", + "GUID": "457a678c-4210-4418-8bc5-eab7e28bdd4f" + }, + "ColumnName": "岗位名称" + }, + { + "BindingInfo": { + "TableName": "项目岗位", + "ColumnName": "默认时薪", + "GUID": "78670928-d30e-43cf-a473-e9e04ade58b6" + }, + "ColumnName": "默认时薪" + }, + { + "BindingInfo": { + "TableName": "项目岗位", + "ColumnName": "成员数量", + "GUID": "b32d70ac-e239-4649-a6c9-2628b672f3d2" + }, + "ColumnName": "成员数量" + } + ], + "IsListviewDataSource": true, + "CustomColumns": [] + }, + "DataSourceListviewName": "图文列表表格1", + "TopCount": 15, + "IsLoadOnDemand": true, + "LoadOnDemandCount": 15, + "TemplateKey": "竖排无样式", + "DetailTableSetting": { + "$type": "Forguncy.Model.DetailListViewInfo, ServerDesignerCommon", + "ColumnOfDetailTable": "项目ID", + "MasterTable": "项目表", + "ColumnOfMasterTable": "ID", + "DataCommitType": 2 + } + } + }, + "4,12": { + "CellType": { + "$type": "Forguncy.RepeaterCellType, ServerDesignerCommon", + "TemplatePageName": "007ea4aa4c7440478a9a092179dace8", + "DblCommand": { + "$type": "GrapeCity.Forguncy.Commands.CustomCommandObject, Forguncy.Commands", + "Commands": [ + { + "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", + "PopupDisplayMode": 1, + "Placement": { + "SerializeProperty": "=项目成员!Q4" + }, + "ClosePopupCallbackCommand": { + "Commands": [ + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=是否为确定" + } + ] + }, + "value": "1" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=选择项" + } + ] + }, + "value": "编辑" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", + "PageName": "项目成员详情", + "LoadBindingDataOption": 1 + } + ], + "ID": "1e37c9b1-65eb-43c9-8c4b-07b0b16f1d9c" + }, + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=选择项" + } + ] + }, + "value": "删除" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", + "ServerCommandName": "移除项目成员", + "Parameters": [ + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "项目ID", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='007ea4aa4c7440478a9a092179dace8'!项目ID" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "成员用户名", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='007ea4aa4c7440478a9a092179dace8'!C2" + } + } + ], + "ResultErrorCodeTo": { + "SerializeProperty": "code" + }, + "ResultMessageTo": { + "SerializeProperty": "msg" + }, + "RefreshAfterFinish": true, + "CheckDataValidation": true + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=code" + } + ] + }, + "value": "0", + "compareType": 1 + }, + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Report_Command, Notiflix_Forguncy", + "FunctionName": "warning", + "Title": "温馨提示", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='007ea4aa4c7440478a9a092179dace8'!code" + }, + "BtnText": "知道了" + } + ], + "ID": "323013d0-3b34-4464-89cb-e981ae57b7da" + } + ] + } + ], + "ID": "0d01ee0b-c354-41f0-8eff-eecaf8dcd70d" + } + ] + } + ], + "ID": "e159eb72-ff6b-4fd3-b7d5-03b027a0d6ae" + } + ] + } + ], + "ParamProperties": { + "IsOK": "是否为确定", + "选择项": "选择项" + } + }, + "PageName": "编辑删除页面" + } + ], + "ParamProperties": { + "项目成员": "项目成员", + "项目成员_全名": "项目成员_全名", + "岗位名称": "岗位名称", + "默认时薪": "默认时薪" + } + }, + "DataSourceType": 1, + "DataSource": { + "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", + "TableName": "项目成员表", + "BindingInfos": [ + { + "BindingInfo": { + "TableName": "项目成员表", + "ColumnName": "项目成员", + "GUID": "5e6ecc70-0b8c-48c2-ae52-b26c7f580397" + }, + "ColumnName": "项目成员" + }, + { + "BindingInfo": { + "TableName": "项目成员表", + "ColumnName": "项目成员", + "GUID": "eded767c-dd09-4323-a133-72d59d357da6", + "AttachType": { + "$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess", + "UserColumnAttachType": 1 + } + }, + "ColumnName": "项目成员_全名" + }, + { + "BindingInfo": { + "TableName": "项目成员表", + "ColumnName": "岗位ID", + "GUID": "2b7f920d-dae0-4573-8cdd-9595f6750ef5", + "RelationBinding": { + "RelatedTable": "项目岗位", + "RelatedColumn": "ID", + "DisplayColumn": "岗位名称" + } + }, + "ColumnName": "岗位名称" + }, + { + "BindingInfo": { + "TableName": "项目成员表", + "ColumnName": "默认时薪", + "GUID": "15b189a0-94c5-49c8-a051-80060a288837" + }, + "ColumnName": "默认时薪" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "项目成员表", + "ColumnName": "岗位ID", + "GUID": "8cb2ca64-f5fd-4a20-8c22-d69ea1404c95" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目成员!B2" + } + }, + "NullFormulaValueQueryPolicy": 1, + "OrderBySqlCondition": { + "OrderByColumns": [ + { + "ColumnBindingInfo": { + "TableName": "项目成员表", + "ColumnName": "FGC_CreateDate", + "GUID": "0b2d493b-818f-4d46-b6b1-b93a3eb7b4d1" + }, + "Order": 1 + } + ] + }, + "IsListviewDataSource": true, + "CustomColumns": [] + }, + "DataSourceListviewName": "图文列表表格2", + "DisplayMode": 2, + "TemplateKey": "渐变卡片", + "DetailTableSetting": { + "$type": "Forguncy.Model.DetailListViewInfo, ServerDesignerCommon", + "ColumnOfDetailTable": "项目ID", + "MasterTable": "项目表", + "ColumnOfMasterTable": "ID", + "DataCommitType": 2 + } + } + }, + "6,1": { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "工时核定方式", + "GUID": "d6bd5419-1ac2-4273-b273-2ad756ae5ffb" + } + }, + "6,5": { + "BindingInfo": { + "TableName": "项目岗位", + "ColumnName": "ID", + "GUID": "395bd1bb-03c2-4ee2-8335-15164ea4233d" + } + } + }, + "StyleDatas": { + "Styles": [ + { + "FontSize": 13.333333333333332, + "Foreground": 0 + }, + { + "FontFamily": 1, + "FontSize": 13.333333333333332 + }, + { + "FontSize": 13.333333333333332 + }, + { + "FontFamily": 1, + "FontSize": 13.333333333333332, + "HorizontalAlignment": 2 + }, + { + "FontFamily": 1 + }, + { + "FontFamily": 1, + "Formatter": 3 + }, + { + "FontSize": 13.333333333333332, + "Foreground": 0, + "BorderBottom": 0 + }, + { + "BorderBottom": 0 + }, + { + "FontFamily": 1, + "FontSize": 13.333333333333332, + "BorderBottom": 0 + }, + { + "FontSize": 13.333333333333332, + "BorderBottom": 0 + }, + { + "FontFamily": 1, + "FontSize": 13.333333333333332, + "HorizontalAlignment": 2, + "BorderBottom": 0 + }, + { + "FontFamily": 1, + "BorderBottom": 0 + }, + { + "FontFamily": 1, + "Formatter": 3, + "BorderBottom": 0 + }, + { + "BorderLeft": 0 + }, + { + "HorizontalAlignment": 5 + } + ], + "Types": { + "Strs": [ + "black", + "Body", + "Right", + "[AUTO]General", + "Background 2 0", + "Center" + ], + "Borders": [ + { + "Color": 4 + } + ] + }, + "CellStyles": { + "1,1": 0, + "1,10": 0, + "1,12": 1, + "1,26": 2, + "1,27": 3, + "1,28": 4, + "1,29": 4, + "1,30": 4, + "1,31": 5, + "1,32": 4, + "1,33": 4, + "1,34": 4, + "1,36": 5, + "2,1": 6, + "2,2": 6, + "2,3": 6, + "2,4": 6, + "2,5": 6, + "2,6": 6, + "2,7": 6, + "2,8": 6, + "2,9": 6, + "2,10": 6, + "2,11": 7, + "2,12": 8, + "2,13": 7, + "2,14": 7, + "2,15": 7, + "2,16": 7, + "2,17": 7, + "2,18": 7, + "2,19": 7, + "2,20": 7, + "2,21": 7, + "2,22": 7, + "2,23": 7, + "2,24": 7, + "2,25": 7, + "2,26": 9, + "2,27": 10, + "2,28": 11, + "2,29": 11, + "2,30": 11, + "2,31": 12, + "2,32": 12, + "2,33": 12, + "2,34": 12, + "2,35": 7, + "2,36": 12, + "2,37": 12, + "2,38": 12, + "2,39": 5, + "3,11": 13, + "4,1": 14, + "4,10": 14, + "4,11": 13, + "4,12": 14, + "5,1": 14, + "5,2": 14, + "5,3": 14, + "5,4": 14, + "5,5": 14, + "5,6": 14, + "5,7": 14, + "5,8": 14, + "5,9": 14, + "5,10": 14, + "5,11": 13, + "6,1": 2, + "6,5": 2, + "6,10": 2 + }, + "SheetStyle": { + "FontFamily": 1 + } + }, + "Spans": [ + "1,1,1,9", + "4,1,1,9", + "6,1,1,4", + "4,12,1,28", + "6,5,1,5", + "1,36,1,4", + "1,31,1,4" + ], + "PageInfo": { + "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", + "PageLoadedCommandList": [ + { + "$type": "Notiflix_Forguncy.Block_Command, Notiflix_Forguncy", + "FunctionName": "remove", + "Cell": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目成员!项目子页面" + }, + "Title": "加载中" + } + ], + "PermissionData": { + "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionData, Forguncy.RbacPermission.Core", + "permissionResource": { + "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionResource, Forguncy.RbacPermission.Core" + }, + "permissionBindings": [ + { + "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionBinding, Forguncy.RbacPermission.Core", + "roleNames": [ + "FGC_LoginUser" + ] + } + ] + }, + "RowBreakLines": [], + "RepeatRangeSettings": [], + "ConditionFormatRulesCollection": { + "Rules": [ + { + "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon", + "Formula": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=IF(项目成员!$AB$2=\"任务详细视图\",0,1)" + }, + "GUID": "f7355555-9eb3-43e8-8fde-5cecffe691be", + "StyleInfo": { + "Underline": null, + "Strikethrough": null + }, + "IsInvisible": true + } + ] + } + }, + "PrintInfo": { + "PaperSize": {}, + "Margin": {} + }, + "CustomNames": [ + { + "Name": "工时核定方式", + "Formula": "项目成员!$B$7" + }, + { + "Name": "当前岗位ID", + "Formula": "项目成员!$F$7" + } + ] +}//7yB6qjLPffB3B5JkMteLHCK/aDHtZpoZmAKNObPaEuOU7b1CxWUyZvLgWMwpg+Hespf5VagbVyG9ynTwr2BMvDLZFXlOA7cxnOaiGumywwuSFyd+n6ZXSVYhSVzFPXoAqxzjfP8hOVsNSw3eO5rrLXttwSPDTpWH/CsBg1Z5e625IlTJdA5vRYhObeiTjCmxfyBHCqhPvtnyffHI8ruQl3uQt0VUwRoOk8WCBaCWfTgF61nkZKSjDVfm32Utnb6W7lAiPMGeuBcnlz+kRcmJxY1cM7lDQcEJLZBxyZRajSKn3YzREMPsWFNfEHoHtV8JJuw19QRpl3SrBPonCd92TNPt1yZRibR3l2+BZHF2kgMpRzO5x0O94DAZN/SH4cgVbVfMtGYvtpgGpsjQX2C96IW1wvuLZJOhmiLPSx4X52xyNH7X7TB4kjdRMPpDdqKPmBcdoAbGFVWUAAjPdRvCSc0JZjW4yCNbgefhSRgvJ5/5QOr+ZEHTRFhwH4zFIXzgs6ZvhFLskckZk4sKU5OXuUz79oKxX2uMP6lkG9wLBXX5OuqQ4HEDs9K7rCgvu2gVePDKINWnsaQ/ksHhTuM2YDxyoenSx2TfY0ebFyZdO52HKkXXAcdfapksLVfIXKwsKk6manwnpXQaQ6hH593C6mrQDJf5Avc1SrBiflfAZDm4cbZsKqFk8Cw+mpvc7F5QZfxk7xH3wQmfFhlGUb7BIdukrHKFUTnM3i7H77fd8v4p0dq5jhWx3nYCEHBuCPY9yqL4GweGLkUE+zRmjZ3hQcRqcGy0CGqi4cwhJDuEuoL0tGB0NCJGRJ8hax262ZbBCrCrDqX1OkJ5AM8OwVr5vX7eepI5WKXtaOJVAV6HZ1ySPW7WfLlqRo3Xf8/ZtzkJInjYgjfRjfeAb02m9iiGPQ==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/项目成员.rd b/Pages/项目/项目首页/项目首页-容器页面/项目成员.rd new file mode 100644 index 00000000..df8eee82 --- /dev/null +++ b/Pages/项目/项目首页/项目首页-容器页面/项目成员.rd @@ -0,0 +1,15 @@ +{ + "PageType": 0, + "ColumnCount": 41, + "RowCount": 7, + "CustomNames": [ + { + "Name": "工时核定方式", + "Formula": "项目成员!$B$7" + }, + { + "Name": "当前岗位ID", + "Formula": "项目成员!$F$7" + } + ] +} \ No newline at end of file diff --git a/Pages/项目首页/项目首页子页面/项目成员统计.json b/Pages/项目/项目首页/项目首页-容器页面/项目成员统计.json similarity index 64% rename from Pages/项目首页/项目首页子页面/项目成员统计.json rename to Pages/项目/项目首页/项目首页-容器页面/项目成员统计.json index f38ea99a..023c9f00 100644 --- a/Pages/项目首页/项目首页子页面/项目成员统计.json +++ b/Pages/项目/项目首页/项目首页-容器页面/项目成员统计.json @@ -195,7 +195,7 @@ "DefaultSize": 32.0 }, "Values": { - "0,0": "项目成员情况 (实际工时/计划工时)" + "0,0": "项目成员" }, "AttachInfos": { "1,0": { @@ -205,83 +205,55 @@ "DataSourceType": 1, "DataSource": { "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", - "TableName": "View_任务工时统计", + "TableName": "项目成员表", "BindingInfos": [ { "BindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "执行人", - "GUID": "a14f7334-4346-4b3e-ac2a-f3ce7da6bc80" + "TableName": "项目成员表", + "ColumnName": "项目成员", + "GUID": "6f723216-2937-46fe-bbc5-e9b760557f94" }, - "ColumnName": "执行人" + "ColumnName": "项目成员" }, { "BindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "执行人", - "GUID": "ea960229-a6c2-4278-9c58-aa3b7f5f02c5", - "RelationBinding": { - "RelatedTable": "用户信息视图", - "RelatedColumn": "用户名", - "DisplayColumn": "全名" + "TableName": "项目成员表", + "ColumnName": "项目成员", + "GUID": "01e23b43-a539-4397-bc6f-4723ff061640", + "AttachType": { + "$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess", + "UserColumnAttachType": 1 } }, - "ColumnName": "执行人姓名" + "ColumnName": "项目成员_全名" }, { "BindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "总计划工时", - "GUID": "3f3675ae-3007-4159-b793-b9b07e827d35" + "TableName": "项目成员表", + "ColumnName": "岗位ID", + "GUID": "2e6de542-02d4-428e-9177-68802cc9f20b", + "RelationBinding": { + "RelatedTable": "项目岗位", + "RelatedColumn": "ID", + "DisplayColumn": "岗位名称" + } }, - "ColumnName": "计划工时" - }, - { - "BindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "总实际工时", - "GUID": "760c1a1e-2726-4727-b6aa-6138afc61c7a" - }, - "ColumnName": "实际工时" - }, - { - "Formula": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目成员统计!实际工时&\"h/\"&项目成员统计!计划工时&\"h\"" - }, - "ColumnName": "工时情况" + "ColumnName": "岗位名称" } ], - "SqlCondition": { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "项目ID", - "GUID": "36d1a996-4e85-4b9f-8d68-8f694ca5292d" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目成员统计!项目ID" - } - }, - "OrderBySqlCondition": { - "OrderByColumns": [ - { - "ColumnBindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "总实际工时", - "GUID": "099752b6-2bd0-4db8-90a8-e53e53498fef" - }, - "Order": 1 - } - ] - }, "IsListviewDataSource": true, "CustomColumns": [] }, "DataSourceListviewName": "图文列表表格1", "DisplayMode": 2, - "TemplateKey": "渐变卡片" + "TemplateKey": "渐变卡片", + "DetailTableSetting": { + "$type": "Forguncy.Model.DetailListViewInfo, ServerDesignerCommon", + "ColumnOfDetailTable": "项目ID", + "MasterTable": "项目表", + "ColumnOfMasterTable": "ID", + "DataCommitType": 2 + } } } }, @@ -336,4 +308,4 @@ "PaperSize": {}, "Margin": {} } -}//MF5iqTIyb+ULR/fHXQEGdbm0ylNoBDFaBS6oSWF5zONvuCj5uZvbLpiQnH4XqDxv8lcdxKSDzeMiH7dJOVPAbSXi9saB8rOnCRfel7f/DFiESrgnzGyLi4tAiEAmOoezuW+RpnqdKcNfX0cO7sJec1JrUWlyvAFMOG/lbHnnCrJW6IjIpKCIRzwa3So6FlgU4Jp5S3vzRIayWtokE5SKbiZp2tTZ4b41lODekhMtC25C5jToGxR5RsQFo1UZ4BYkLu1Bxib1/jIwtGedW1MuCOXCP1iTxDFHKc9SZi7kFXKo3IXmuP7efUsOIz1SEhv+6fp+Nwo+Ctp7MPe9gP9AT29kvRdjcUPPR/lx/csnLKTwq7N4n0lYq8qXiK0Xjs9ziNnwZNdNC22qhRwj67mwOPFuIzBo74HkUbItYXFVAV8Sw8/B3wtL5GRVbIMlAdh5kzOC12WxyFckSaIp9YZNugDNRf+0AcAL7Bmht++f1rGdjr1YvvZOcy/DdSfEnlu5y4OLCCHJW7gcuqPJoyVI618tn7XVVsgfTjg+aQJEnriMz7liTZiNLPzVj+pvmpzxt2i6s1teLu+LGRI/c9RRp/aaXgeNB3zE/c5Jw9eJL0ouw6ltQdRE0Kq/m0QcdbnqSnunHBYCE0IqvxxFj0jkVjgDUlPY78hmSVrnQT4MFjrVQiwvZ63pQWWzvkwH+zwmVbg6s+F+pzapx0SWnj98Kbw6VGC8G/m3OQ/vUKBue12Qt2QEjK5FL7iXeW3v3PQS1x5oWhuyUHmXC+lyG05F4Cp47Fp+M0fwKZBqMHN5/eDQFeh3B5sw/Q/SHyUaBKkQ7DEAyL7jQ7hXscStvAqfG25HaMMJ4cvnNYVmp/PPM7tNLEzwsmoDXWL70vW0QMcXulV6oDA3zwggX+DOKG/mKA==|920 \ No newline at end of file +}//5gWfhzesbAKK+7iJx725CJzC8m+o+wYQzoAL9dyxYKGUZVdtT4F+N/Ara4AY85y7+77brV7KGy9FfeRJYDHkYQjWf1DZFr7y6SFu+kerGJcQkYFPnSwTgmPy0R7KA/yFO1m6JLgyOrAq7m4YEobso8nO/VhleqfrL/rufLVZOdTb0u6jfVnvl5Sm0JPUVztb87ie+gsdBCjkx6elRnf8hKkRF75XefIOOqTNIJmS+jxk3kAzjjuJr25p1T0PUjXNS4k88jec1nBUUpdUnVvPOzy9/9MkOJe20alF3G19sXmmnRA0qpCT7ObCcqu3VRyQgosBW0YzjCLAwTQ63GLFiGW88bgoSit/FdUEbGC+oc+9XWpuG4qJ9MOYTjsyWHmdrogYEBiP3F4upkR9eVtsuAWc2RN+JChRt4GrAFDaiHKO5w6dyhrtbLVXCEla29v33jYh2pKNtq+dIHaS1GIMv7PT4E74y8vzRkujGqCYXniCHrV0KCC9TWEji0iY+dHRf8CH3K5B4zH2muCUymfIzro4y++RUzM6cqbnViP9IsXu1kXfrFMvXgVDlfFbr/cZuB1RJtTmzYkgdM7hWAjvHcVMH0wB+Rz3T1igRlPbwhNWD00STnIFKYOKdo7EXtnuSBYl0m4S8I8dHzMg0rJSlOVXJnVyF4MIV5SSMChOLZlPOOhlO1axDzL6Be22WLw6xYMywSbPAgP5yAeX3Xf498OK+Gcnz/JhwZTlKzSarjy34fkgdAXw+FaaiJ7MRiaFhqHsdip1T2ibnU/wwWq9ZBnPYuR6WFXMKzvVQNboBGdJyA5J7AzmNmY1s82CzhsG/ddp3B7aaaCxSU1R10KmjsxrQNpaxSpbBrVipjnunEaO/bB/BegFYKPRpapR4TSOM7FtnEJL3VIKcPtM/k47vA==|920 \ No newline at end of file diff --git a/Pages/项目首页/项目首页子页面/项目成员统计.rd b/Pages/项目/项目首页/项目首页-容器页面/项目成员统计.rd similarity index 100% rename from Pages/项目首页/项目首页子页面/项目成员统计.rd rename to Pages/项目/项目首页/项目首页-容器页面/项目成员统计.rd diff --git a/Pages/项目首页/项目首页子页面/项目概况-关键数据.json b/Pages/项目/项目首页/项目首页-容器页面/项目概况-关键数据.json similarity index 84% rename from Pages/项目首页/项目首页子页面/项目概况-关键数据.json rename to Pages/项目/项目首页/项目首页-容器页面/项目概况-关键数据.json index a5f78f7e..942e05dd 100644 --- a/Pages/项目首页/项目首页子页面/项目概况-关键数据.json +++ b/Pages/项目/项目首页/项目首页-容器页面/项目概况-关键数据.json @@ -20,17 +20,9 @@ "GridRowColumnDefinition": { "DesignLengthInPixel": 15.0 } - }, - "4": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 36.0 - } } }, - "InLogicalVisibleIndexes": [ - 4 - ], - "Count": 5, + "Count": 4, "DefaultSize": 15.0 }, "Cols": { @@ -240,20 +232,19 @@ "DefaultSize": 32.0 }, "Values": { - "1,1": "成员数", - "1,11": "任务数", - "1,21": "工时", - "1,31": "费用成本", - "1,41": "工时成本" - }, - "Formulas": { - "1,19": "INT(V5/X5*100)", - "1,9": "INT(L5/N5*100)", - "1,29": "INT(AF5/AH5*100)", - "1,39": "INT(AP5/AR5*100)" + "1,1": "成员", + "1,11": "任务", + "1,21": "计划工时/实际工时", + "1,31": "预算金额", + "1,41": "预算工时" }, "AttachInfos": { "1,9": { + "BindingInfo": { + "TableName": "View_项目统计信息", + "ColumnName": "任务完成比例", + "GUID": "aa558919-f6dc-4a6a-9649-fae4d1d1cf46" + }, "CellType": { "$type": "ElementUI.ProgressCellType, ElementUI", "CommandList": [ @@ -288,7 +279,7 @@ } } ], - "ID": "e58dea71-0c13-4afc-96c8-d7da48a4bfd6" + "ID": "b6668b7a-ee2e-4cbc-8e9f-a7d56be44728" } ] } @@ -298,6 +289,11 @@ } }, "1,19": { + "BindingInfo": { + "TableName": "View_项目统计信息", + "ColumnName": "计划工时使用比例", + "GUID": "99fdb20c-8ab8-4b1b-9fd9-e840512df836" + }, "CellType": { "$type": "ElementUI.ProgressCellType, ElementUI", "CommandList": [ @@ -332,7 +328,7 @@ } } ], - "ID": "288b4725-f3fe-4210-bcf0-d6dff176f16c" + "ID": "e4350bc3-4cb0-429c-a005-5e799772160d" } ] } @@ -342,6 +338,11 @@ } }, "1,29": { + "BindingInfo": { + "TableName": "View_项目统计信息", + "ColumnName": "预算消耗比例", + "GUID": "6e711788-bf86-4561-8bad-cffe6587568b" + }, "CellType": { "$type": "ElementUI.ProgressCellType, ElementUI", "CommandList": [ @@ -376,7 +377,7 @@ } } ], - "ID": "a6063dc1-a2da-4682-ab96-ddeaab9ed183" + "ID": "5a187cb7-516e-49f8-8a91-918bcce57961" } ] } @@ -386,6 +387,11 @@ } }, "1,39": { + "BindingInfo": { + "TableName": "View_项目统计信息", + "ColumnName": "工时消耗比例", + "GUID": "74e00eba-defd-498b-a6dd-fe03ccfb87e8" + }, "CellType": { "$type": "ElementUI.ProgressCellType, ElementUI", "CommandList": [ @@ -420,7 +426,7 @@ } } ], - "ID": "de45fe97-303c-4de6-a2cf-883d28fbb4eb" + "ID": "9c10f9e8-0dca-468b-9581-e026bf9879a2" } ] } @@ -463,62 +469,6 @@ "ColumnName": "工时成本情况", "GUID": "27bf41c1-9428-4320-9df2-9dc4c5275d30" } - }, - "4,11": { - "BindingInfo": { - "TableName": "View_项目统计信息", - "ColumnName": "已完成任务数", - "GUID": "d65a8d37-e524-49ab-bd49-86f13e503225" - } - }, - "4,13": { - "BindingInfo": { - "TableName": "View_项目统计信息", - "ColumnName": "总任务数量", - "GUID": "c2a48ef7-1357-4541-be25-0091b8cebcab" - } - }, - "4,21": { - "BindingInfo": { - "TableName": "View_项目统计信息", - "ColumnName": "总实际工时", - "GUID": "017c57f9-de51-43a4-b62d-0c798a61297b" - } - }, - "4,23": { - "BindingInfo": { - "TableName": "View_项目统计信息", - "ColumnName": "总计划工时", - "GUID": "a34f34a5-44bc-49df-a52b-254f1bf422ca" - } - }, - "4,31": { - "BindingInfo": { - "TableName": "View_项目统计信息", - "ColumnName": "总成本", - "GUID": "2e8448b0-962e-4b42-bfca-93b8a6b5110b" - } - }, - "4,33": { - "BindingInfo": { - "TableName": "View_项目统计信息", - "ColumnName": "项目预算费用", - "GUID": "9648660b-0309-43bc-9ba6-4cc52d9d276d" - } - }, - "4,41": { - "BindingInfo": { - "TableName": "View_项目统计信息", - "ColumnName": "总核定工时", - "GUID": "a831ff86-744a-4fa9-9da1-af1ebc16ae03" - } - }, - "4,43": { - "BindingInfo": { - "TableName": "View_项目统计信息", - "ColumnName": "项目预算工时", - "GUID": "ec9f7b3b-7abe-454b-9f88-6a09f721fcfc" - } } }, "StyleDatas": { @@ -598,32 +548,21 @@ "1,44": 0, "1,45": 0, "2,1": 5, - "2,9": 0, "2,10": 2, "2,11": 6, "2,20": 2, "2,21": 6, - "2,29": 0, "2,30": 2, "2,31": 6, "2,36": 6, "2,37": 6, "2,38": 6, - "2,39": 0, "2,40": 2, "2,41": 6, "3,29": 0, "3,30": 0, "3,39": 0, - "3,40": 0, - "4,21": 0, - "4,22": 0, - "4,23": 0, - "4,24": 0, - "4,29": 0, - "4,30": 0, - "4,39": 0, - "4,40": 0 + "3,40": 0 }, "SheetStyle": { "FontFamily": 0, @@ -637,17 +576,9 @@ "2,31,1,5", "2,41,1,5", "1,19,2,1", - "4,11,1,2", - "4,13,1,2", "1,9,2,1", "1,29,2,1", - "1,39,2,1", - "4,31,1,2", - "4,33,1,2", - "4,23,1,2", - "4,21,1,2", - "4,41,1,2", - "4,43,1,2" + "1,39,2,1" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -744,4 +675,4 @@ "Size": "250,79" } ] -}//iG4j+opImZgua6uF6UN6QM2S23D52I0MxyCq5HyKM/BYsT09lktEmPAjoXnDttqljb6+ZWsPO5Q2CtF72yBgssxSyUue404wJKdk79EzHzmGr8gKoSYyFofD1ve/y9YFNo4Qq6j8DiaEEbfVdXS+r++MYb392a6TfYoVnyXqQO568VcQhEPE9U/8fKhbSL6i87z7B+lnIHS4lYdOdkjonVy9Nl7DPWr99byviKGigG6VjM+vvKkp8FWgJRpLBMIlx5NRvju8i3Ixq4DJ+ltCpt+VgLwVGKSn+MQnOx/EE/oryARYC4ci8djML54hhW4AUhPOoT4OPvsK5SyjxcbhpF4PcKTmotX8KdY+zEdlcjPjDKX+JG98A3keZTKwQmWrtWI4MGGVGkMHNzUdaCWB734gLiiclrkGBsD9YtDNJR355vN2KLKnsGt6RskD9C9//PzwAODzjkBETMQdM4xoRUTvQNYauZvwkV6UzF02pLWscVHH+bq3BHi27cOZk76ZDR5l4rRou7b2PhhAsEibU+jnnbl0Bsn9rt3GdGN6syK0fq4/Y8wp6aHgCd4NZSR9BDS1RlvmszN9vOi5+4Ipk2yx6Wl6sHelZz8rB5bcAKkCwcyZTcIRpL0y5gTDnfyUwKsHVnngN/PqR3bwGBHQrlpjfZEvUvwrKBDB+9BmTmbu/9Fgu/XOpjH0jzsOBKEMrbNCU5FX8PHP42yriLAhJXTErMYcOzof2O91u/1L2uEV/ysUmSgnuqt2JUXwnPFX6PN4AMlBjYhHHQfPO4WY6fPKz2mjBbkHe1fU9ac9LL1BQ/Iu6vuPZHciq4bgVACwnRIR4xIkxPZYBJSd0wftRzFEC/yfe/ZB7BMQSIyVLl3jshFkDqjqqgHj0zix5MWdG0jatNJW9PYZa5Nr1didZg==|920 \ No newline at end of file +}//q0xpeSoqcRrnry0tnkNT0woxqWI6lJZ7zIJWMr+0IO8ADzCGDqsXqKxK13yeWK+3EhFUPM/8R5kH9fEhcdyElh9c+JvKl9USGYsCUIVotMrHirkhupaI33A0vjTUHLSMFJX4Wu1YghqWUid6qju3C8hLClVuaH+Al/qwYQLG6o0j2CxDKYsYFVpm6YI88DgBRDZGOXvOIOtMvJ11/4pZkZAZ9pe7sArspydV/39r+M60QMmIzoEHgt0fc5tu+0YupJlQZmz+mzGdOZmS3W5vGMra882cgQft4/DGEtNzB1yRuT/QNR4lIyyWqpwRUs2dystqLBm4SrMYwPHm3TaaWqKHX80/BWhVgmH8O80BSugLTiDJ75oEAQ5WNQkZSlMRtuxyeiBYfZhB/7WIuwoXN/H1KKwzedY2JoT8jpj+kkznJT/33OkH5jBvH4VQb99+vtAaI3GZH4MD69Mlhh941lZmdHetTwtiO+AjZeTPQuCgEDgFzufJ77cCt32ya4BRHcN8k35lFojHqkiusnLQHLdnEyapcbLo8qMxK7tMiwLaErfAJ4ARvzgskc172pXJ+/1C30KNPyyhcKuiro6ldYIrJmg0U3UVQW9p85+lSCLM8vnpQdnF9zoV0pQMPueyJiIFBa7o10Ye0FBej5DaRccK0YgtRW6ADKPiIkAdJZKhR3A7NMDJPBHehpaqNrS78Th6aHWDrFqP+HR1UmGWj0xPh7PBY1Ghp5y02tToW0zwcjfVYp+jnr9jlJD9754iv7X++fij+5/Up0nnDVSrsC2JiE+61zfdBfX2bEmr2UeHhXz3JJT9jfIQbU5E9uckmHR2Lobk1dCzxaEkhfGvRiM/crioxk3M62cVXDjvp3anp1RY6/Z7kqVq2AfMOXe9b0SLeWK4GRrCzHKCzK2Pxw==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/项目概况-关键数据.rd b/Pages/项目/项目首页/项目首页-容器页面/项目概况-关键数据.rd new file mode 100644 index 00000000..4cc0f485 --- /dev/null +++ b/Pages/项目/项目首页/项目首页-容器页面/项目概况-关键数据.rd @@ -0,0 +1,5 @@ +{ + "PageType": 0, + "ColumnCount": 47, + "RowCount": 4 +} \ No newline at end of file diff --git a/Pages/项目首页/项目首页子页面/项目概况.json b/Pages/项目/项目首页/项目首页-容器页面/项目概况.json similarity index 95% rename from Pages/项目首页/项目首页子页面/项目概况.json rename to Pages/项目/项目首页/项目首页-容器页面/项目概况.json index 02352451..71b36012 100644 --- a/Pages/项目首页/项目首页子页面/项目概况.json +++ b/Pages/项目/项目首页/项目首页-容器页面/项目概况.json @@ -351,10 +351,9 @@ "HorizontalAlignment": 2 }, { - "Background": 3, "FontFamily": 1, "FontSize": 13.333333333333332, - "Foreground": 4, + "Foreground": 3, "HorizontalAlignment": 2 }, { @@ -366,7 +365,6 @@ "Background 2 -10", "Body", "Center", - "Background 2 0", "Text 1 50" ], "Borders": [ @@ -801,4 +799,4 @@ "Formula": "项目概况!$AG$2" } ] -}//W4MSBUkpsYNxSG/XwsyNxf/qJG2UlOzC357gW76w0N8i0T0TfIBkaLhDxvWDzQuaUKBONkN91VmnY9uA7VWKam0TakpEoDCUiyDyX//R2m6vueWw6sHG71SmdeW5k/ls29NETiIrCAdMpxy04/ZZtLkz4l0CIzzh3HZIneaLGx5Btyk5Zv7gJwxQvb89ZFtszIEk9vLcjDzitKPrahudSjGYMoi5YHhYRxhsbluanicxhNp5XB5cSeq5bLNAPGtULHBP15ci2luvzHMkQg9QcRC2T0kTXaiAjENKO4RDA9CYjLsQjOkQdNs5YSehXzvtSHE9CCK2KeCDTrG6xf9uL3lQ4ZRlYAd0awcaU3Br41FMY+Ry90LOty6DiaOuht1I035YPZM94C33EWhulnWDCMlouBiJ0qrUWDoI8KToKLm7DqSka8d5QFjlLih/71zjMbVafAe/RDl3kmhqGVvo65ytLcZ8C4VOWi1nbvfyza6wOF+L/BwMjWNWCCohKKcxqo+bpxMnfpsUCOERZxX5cl99hxDGpme9/xrekWiscibhM8/A36UXW9UgHq997prqX+Y8LpFqMQMKlnihH5rBsgDyQeCfvKfd3tGfG6k1mWtm4C2q/xk8peYcBW8FabNZmUcCHojLWFTCW+wBc1l51KWQp9gJxoGA9Zrhim6ksRpu87RxK+XAn6fjdk97qPhc/8InRXXqSgJvjvLSey2dpopqTsF3EsvKZE6eEG5Zw2/szCVjHikB94LMtCe7qjvlWE0EnOb0lo3AdHYQjE6m8dZAEKXWRx16kBDK8mNn878gX/thhxdgtNnZhWxboTGv+r6hyixjfT2FiTiZ5ihspiFCdtf38OfB0PKZFnfVuuaius6kaAxdG/YIsMKWSM4URn6LBhQvEJmjQUubw0isOg==|920 \ No newline at end of file +}//MF04xyaPCj0TV0GFm5hdq+QePRcJbTstf5K6K47zTNTP7sBZ7pT7jnGlsG8rfv3wJk/lXRaGKVtn/X/Usn5XF9WVuCS4y5TvxVNEm8Aoc7optgsGv8IkYwdd1ngjr69p7tax9fMzMN3aFXevVjZkMQ2fOsEjdL+8uuVqQrm+tphokvU1SvH5PYNAaOEdnnih7Gomy5pknu+r8UmOL4RpJPj6YOrnJ7SNPf44+Tv+HWKnAvM9sz5vCiQ+wLUC6iOVapewu+ChBaSqhBXu3/Hf8Mr0Lcesp+f62LvnkdPxDCNJTOiCof/N6NbsyRIRfu9wGyprJODo7JSQlBZSMDnL0qggb5UHOu/MM2RRiAtWGP0pX0LA6M6ZSYrXup7hIddsRLhnnwVUEl4BiPXC0ImSZuu5BJ6jxOx2VwZSsluq7TQk8mWdAmvfG0Ylge18kvOOvIc0/4QceooNDvw2kl9WUn11i78a8Dqy2Os+vsxQgPuDDKsalHHkmDgU/P+RCnHZPBpPBQBQ1zwdBYsUnH0z/tyQ1p/ZYHLX85CM0O56m18Etcov9k6p+fnqrUn1HJUxq8qc+dYGCuu2y9OB6880dGT9vHDYGoFT/2bSlakhzvxO+hTz0swNTNok7tx5h2Ra3hS4d56vGFcxE7rR13Q88XBiv0MtCkQndPTbk5qKZVFo0dI0+9ZqGyQpXD+QzOKHZgZVj0wd0HUsBZ33AZ6wMgT6XREirZhGRY/AxSqf0xeuqAT4HYI27HTkF2LBfKLuJAE1JuV7v5UTYZxSXAtc+6yNKFdBiKmVBZOn0Gvf1EzNws/TuSpBWD5lSGxL8lmdPu1uT8jlhAToe6UrrOmRwzF4LMo18ARqAtCc1u61JfA0o0XAqKW0UrwMMU2pyBOMS69qMF2osLF5peL0KbebtQ==|920 \ No newline at end of file diff --git a/Pages/项目首页/项目首页子页面/项目概况.rd b/Pages/项目/项目首页/项目首页-容器页面/项目概况.rd similarity index 100% rename from Pages/项目首页/项目首页子页面/项目概况.rd rename to Pages/项目/项目首页/项目首页-容器页面/项目概况.rd diff --git a/Pages/项目首页/项目首页子页面/项目甘特图.json b/Pages/项目/项目首页/项目首页-容器页面/项目甘特图.json similarity index 83% rename from Pages/项目首页/项目首页子页面/项目甘特图.json rename to Pages/项目/项目首页/项目首页-容器页面/项目甘特图.json index 6046026a..e27bb00f 100644 --- a/Pages/项目首页/项目首页子页面/项目甘特图.json +++ b/Pages/项目/项目首页/项目首页-容器页面/项目甘特图.json @@ -1,7 +1,7 @@ { "Rows": { "RowColumnAttachedInfos": { - "0": { + "1": { "GridRowColumnDefinition": { "DesignLengthInPixel": 347.0, "Mode": 2, @@ -13,12 +13,6 @@ } } }, - "1": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0, - "IsHidden": true - } - }, "2": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0, @@ -48,17 +42,23 @@ "DesignLengthInPixel": 32.0, "IsHidden": true } + }, + "7": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0, + "IsHidden": true + } } }, "InLogicalVisibleIndexes": [ - 1, 2, 3, 4, 5, - 6 + 6, + 7 ], - "Count": 7, + "Count": 8, "DefaultSize": 32.0 }, "Cols": { @@ -209,8 +209,11 @@ "Count": 31, "DefaultSize": 32.0 }, + "Values": { + "0,0": "任务甘特图" + }, "AttachInfos": { - "0,0": { + "1,0": { "CellType": { "$type": "Gantt.GanttCellType, Gantt", "GanttListViewInfo": { @@ -246,11 +249,11 @@ "InitialCalculationMode": 1 } }, - "1,0": { + "2,0": { "ListViewInfo": { "Name": "表格1", "TableName": "任务表", - "RowIndex": 1, + "RowIndex": 2, "RowCount": 6, "ColumnCount": 31, "DetailListViewInfo": { @@ -268,7 +271,7 @@ "CommitType": 1 } }, - "2,0": { + "3,0": { "NameUsedInJavaScript": "ID", "BindingInfo": { "TableName": "任务表", @@ -276,7 +279,7 @@ "GUID": "506ec052-affb-4a50-b311-5dde9f2beee7" } }, - "2,2": { + "3,2": { "NameUsedInJavaScript": "父任务ID", "BindingInfo": { "TableName": "任务表", @@ -284,7 +287,7 @@ "GUID": "2d5608c0-bb3a-4545-bbcf-e12ae87f05e8" } }, - "2,3": { + "3,3": { "NameUsedInJavaScript": "次序", "BindingInfo": { "TableName": "任务表", @@ -292,7 +295,7 @@ "GUID": "7e12b30b-d178-4323-8528-d6630e90260d" } }, - "2,4": { + "3,4": { "NameUsedInJavaScript": "层级", "BindingInfo": { "TableName": "任务表", @@ -300,7 +303,7 @@ "GUID": "7575addd-67fb-4698-bcc2-260a37f54188" } }, - "2,6": { + "3,6": { "NameUsedInJavaScript": "任务名称", "BindingInfo": { "TableName": "任务表", @@ -308,7 +311,7 @@ "GUID": "e3f7ae08-9356-4a2a-8e6c-15eac159a32f" } }, - "2,8": { + "3,8": { "NameUsedInJavaScript": "执行者.全名", "BindingInfo": { "TableName": "任务表", @@ -320,7 +323,7 @@ } } }, - "2,10": { + "3,10": { "NameUsedInJavaScript": "开始时间", "BindingInfo": { "TableName": "任务表", @@ -328,7 +331,7 @@ "GUID": "26bfe21e-4d4b-4803-8282-478c95388b92" } }, - "2,12": { + "3,12": { "NameUsedInJavaScript": "结束时间", "BindingInfo": { "TableName": "任务表", @@ -336,7 +339,7 @@ "GUID": "9f4b71ba-d1cc-43d0-a361-9ea102f869f7" } }, - "2,15": { + "3,15": { "NameUsedInJavaScript": "分组名称", "BindingInfo": { "TableName": "任务表", @@ -349,7 +352,7 @@ } } }, - "2,17": { + "3,17": { "NameUsedInJavaScript": "版本名称", "BindingInfo": { "TableName": "任务表", @@ -362,7 +365,7 @@ } } }, - "2,19": { + "3,19": { "NameUsedInJavaScript": "任务状态", "BindingInfo": { "TableName": "任务表", @@ -370,7 +373,7 @@ "GUID": "ed3ad060-12e8-4be1-9310-ce9710779316" } }, - "2,21": { + "3,21": { "NameUsedInJavaScript": "前置任务", "BindingInfo": { "TableName": "任务表", @@ -378,7 +381,7 @@ "GUID": "62ca8ff5-a0a6-44d9-be23-e4d86597b233" } }, - "2,23": { + "3,23": { "NameUsedInJavaScript": "工期", "BindingInfo": { "TableName": "任务表", @@ -386,7 +389,7 @@ "GUID": "d5312461-f026-419f-9a68-7361b0102da9" } }, - "2,25": { + "3,25": { "NameUsedInJavaScript": "开始报工日期", "BindingInfo": { "TableName": "任务表", @@ -394,7 +397,7 @@ "GUID": "b5ea2af6-9c4d-4470-a8c7-e4cd92ac4ef9" } }, - "2,27": { + "3,27": { "NameUsedInJavaScript": "最后报工日期", "BindingInfo": { "TableName": "任务表", @@ -402,7 +405,7 @@ "GUID": "d19371c7-f344-4910-8d73-f549b694d0b7" } }, - "2,28": { + "3,28": { "NameUsedInJavaScript": "任务说明", "BindingInfo": { "TableName": "任务表", @@ -410,7 +413,7 @@ "GUID": "4b41dacd-aa78-4b93-8c3b-699f38f56e35" } }, - "2,29": { + "3,29": { "NameUsedInJavaScript": "里程碑", "BindingInfo": { "TableName": "任务表", @@ -418,7 +421,7 @@ "GUID": "6c233bf4-7a1d-427c-8ac3-e212f6b5813e" } }, - "2,30": { + "3,30": { "NameUsedInJavaScript": "进度", "BindingInfo": { "TableName": "任务表", @@ -430,63 +433,80 @@ "StyleDatas": { "Styles": [ { - "FontFamily": 0 + "FontSize": 13.333333333333332, + "Foreground": 0 + }, + { + "FontFamily": 1 } ], "Types": { "Strs": [ + "Text 1 50", "Body" ] }, "CellStyles": { - "1,2": 0, - "1,3": 0, - "1,6": 0, - "1,7": 0, - "1,8": 0, - "1,10": 0, - "1,12": 0, - "1,13": 0, - "1,14": 0, - "1,15": 0, - "1,16": 0, - "1,17": 0, - "1,18": 0, - "1,19": 0, - "1,20": 0, - "1,21": 0, - "1,23": 0, - "1,24": 0, - "1,28": 0, - "1,29": 0, - "2,2": 0, - "2,3": 0, - "2,6": 0, - "2,7": 0, - "2,8": 0, - "2,10": 0, - "2,12": 0, - "2,13": 0, - "2,14": 0, - "2,15": 0, - "2,16": 0, - "2,17": 0, - "2,18": 0, - "2,19": 0, - "2,20": 0, - "2,21": 0, - "2,23": 0, - "2,24": 0, - "2,28": 0, - "2,29": 0 + "0,0": 0, + "2,2": 1, + "2,3": 1, + "2,6": 1, + "2,7": 1, + "2,8": 1, + "2,10": 1, + "2,12": 1, + "2,13": 1, + "2,14": 1, + "2,15": 1, + "2,16": 1, + "2,17": 1, + "2,18": 1, + "2,19": 1, + "2,20": 1, + "2,21": 1, + "2,23": 1, + "2,24": 1, + "2,28": 1, + "2,29": 1, + "3,2": 1, + "3,3": 1, + "3,6": 1, + "3,7": 1, + "3,8": 1, + "3,10": 1, + "3,12": 1, + "3,13": 1, + "3,14": 1, + "3,15": 1, + "3,16": 1, + "3,17": 1, + "3,18": 1, + "3,19": 1, + "3,20": 1, + "3,21": 1, + "3,23": 1, + "3,24": 1, + "3,28": 1, + "3,29": 1 }, "SheetStyle": { - "FontFamily": 0 + "FontFamily": 1 } }, "Spans": [ - "0,0,1,31", - "3,0,4,31", + "1,0,1,31", + "3,0,1,2", + "3,4,1,2", + "3,6,1,2", + "3,8,1,2", + "3,10,1,2", + "3,12,1,3", + "3,15,1,2", + "3,17,1,2", + "3,19,1,2", + "3,23,1,2", + "3,25,1,2", + "3,21,1,2", "2,0,1,2", "2,4,1,2", "2,6,1,2", @@ -496,21 +516,10 @@ "2,15,1,2", "2,17,1,2", "2,19,1,2", + "2,21,1,2", "2,23,1,2", "2,25,1,2", - "2,21,1,2", - "1,0,1,2", - "1,4,1,2", - "1,6,1,2", - "1,8,1,2", - "1,10,1,2", - "1,12,1,3", - "1,15,1,2", - "1,17,1,2", - "1,19,1,2", - "1,21,1,2", - "1,23,1,2", - "1,25,1,2" + "4,0,4,31" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -536,4 +545,4 @@ "PaperSize": {}, "Margin": {} } -}//MLIiD24S25Cde+unqusndsLatl7AGmgpndf8QEYJah6+W13T+1PFUTOcynXj1EKoZZro7Pcwcx3YStijS2yVMLwuZmMxEyWWcAFlwwVO/UmjWS9LqNS68zDs76XDzNr9yTAgL/XyadmoOi08fUXij+O0AgvDg5nVpXfjMMTDZWLTQUqKZGa2uVEonUGRejhyn6pMbap0pdELPSm7d11w+t6Gy04GeHP81rOkR8+qv1y+sdW9URqmz8Rp3wSGyiKDEh7cOWGhCbh6c8Jag9AdlBFvSihnwsIZmzNRMY756WpgdbU3R+zFo5vNZFtfm2opAE6Vd53fCfKYI+dcXNP+8NRh5cqKJkhx7UMj+vPPObjGqJjGzDH4QofiulMR38AXLbmmhfDmfn1MnO15XQcHyszBggRPOE05VGbEj3oByVM8FN9DLVOLup28nP61DblDLl6w89/PHdwhjzuXe43GUBPRqUkBGrzFXSl9PmClHQF0IoTA/skIpNLYRclVxbe5YjMVeFR4VG69OPfI2FD1SzssGQ8d2O+p1ojl3vJCkJktYwoPRjP0jebU8Ao9aahDMy/j51Vk4M1UT/fO7V7zujBfKEvojktaUaEQT3b3iNWVOPUDjiwkBkFtBVtQV2fkCzigbekcKReAL7KMnvYsLEssZ2zJ5YoDzC6iegXTGhLWHGxdV1fB/cb70Q1pqYYrtxD80nn67kdKOLuoxXeuo7n0/2POs6oimbFmXn1Eu7PE1yKqLUO87pKhB5H4boe8YFL8fkzwMuKIQr1BX7LFPBXR0Hn13yNFrkpzz37CcUBCOWKlw9VMgdc6OCbcvQcTa/jFJvBYTHSdZ47karXrZ2q8u0c4HJyAHj0wa8eOZLVWSxYn8E5/VKtw7yBWfk/E9nibu/LyjtoT5A2huqTysA==|920 \ No newline at end of file +}//jUkYGZPw78tOTc/hV7Lr4Y+Qcj1U3oUbWR2ghxzVxOtYY4KmKFQX7ap9U/dzkWj6vOyGEKZp8HXMR3OwEWMa+6Tmnyhjybnic6koGX+MXkUdS+09O9UE7mlkBHUgXOp8qjb4KxG65P77QBwDWtTOooARe64txM67vYmNJMnnfSSeMj6Mhw9rtajcJnmcQGwe+l7wP6dkIwqI6CWyOMNammaCgnIaT7Da/eB0BICG/1eO5XcK5Frejbo3JT1/1pGGjjPp/+O4PuUjQW5hUxucJe0GjTHjJelOvAp0S9DDzZ9DCo+s3dtEl/aLLGQ74OKE2fNqMtiZQDtYIObVgcN0WmFNvxvKk9kAX2raTwkqJVGEU/A73FeZaGn6ubJUX1tETtvan4MQigytLNwPLAd6xPyWpMkW68yvF2c0cE1cHXoYQip+rRPootOuTpL19Bg2kQNkN8s3s3B+hnbsIZn/7hGmZJCIliZwwAWAaa27X8+1yASJulVUf4THPkvwBenlZPBK+G1hWD/4iwVAAAwBYzlpXLbbqgQ2Lox5FNxyjcZQX3WKBnLtCM86ONbpAgVxNxonfFSd7pbPgYKMBhC04StZcBRl/Y7/Pbh3gF8sL6anNBJaOIfKnWXtl71EEbDLEaA/r0tr4+dvosV5o2/XkApUFJnPXpVSyZPRMs8y7/2Y3HJ2089FAQBjao2D8zWEXxcc6jVicCFsrLxCJcLeSCo7K7Of8sq4aK+tS8dUW0/JT68TSYoiYUYrk2seiQgod/ve90L1+V23qo1HFbNqbrOAz8Qwpzb/Yg1kvsphcTKO8eRzqlywN/3NO8+W5/ENtzdL3S/VIMoeOulnM52nR0/xfuxYaNE1qNGfeqCWoko9b6hAZuPFT3x86qMp7HVySuNwYMNdijoSjZvhHGCVRw==|920 \ No newline at end of file diff --git a/Pages/项目首页/项目首页子页面/项目甘特图.rd b/Pages/项目/项目首页/项目首页-容器页面/项目甘特图.rd similarity index 71% rename from Pages/项目首页/项目首页子页面/项目甘特图.rd rename to Pages/项目/项目首页/项目首页-容器页面/项目甘特图.rd index 0f485edb..33192dce 100644 --- a/Pages/项目首页/项目首页子页面/项目甘特图.rd +++ b/Pages/项目/项目首页/项目首页-容器页面/项目甘特图.rd @@ -1,5 +1,5 @@ { "PageType": 0, "ColumnCount": 31, - "RowCount": 7 + "RowCount": 8 } \ No newline at end of file diff --git a/Pages/项目首页/项目首页.json b/Pages/项目/项目首页/项目首页.json similarity index 91% rename from Pages/项目首页/项目首页.json rename to Pages/项目/项目首页/项目首页.json index cda3a13b..56cf3028 100644 --- a/Pages/项目首页/项目首页.json +++ b/Pages/项目/项目首页/项目首页.json @@ -329,7 +329,7 @@ "$type": "LoadingCommand.EndLoadingCommand, LoadingCommand" } ], - "ID": "38a728e4-94c2-4754-b08c-5659adb4030f" + "ID": "771b3289-6a3c-43fa-b8ec-0aca843ea1e0" } ] } @@ -471,4 +471,4 @@ "Formula": "项目首页!$E$3" } ] -}//XxW/2Ca/K9P3Pc05xUQsZ74NrBXrckOEB/auOvsNexBYh8IMEt8kbi3PjbW9w5a1PvVIq00FLrhCZVs1WxYYPb5NoQfClwwjnP7orpXlSFywrnVzLI9NHrawJBGFOQlVZc1e2+Ud68/pUonifzbigGyHnlhBj19LR5MuKSZXzxsdDPWPFl1Jzd/I7J3AwbbjY8Rixs67tSqriDQn30jrfXwIQ0nSXahodf/B5fMsOmMtR85wHLH8kbZ1P/lpHgInbI8TF2x31SMRLIo8jbD84jNFry+sE7xLMyTUx9XjnfFPZZk5kALx0UOsxoq96ksI3i76ayyIgsj764ZS8hf8FeEfw8vrtdrZ59Gpje75xHnyDVgCjKLXiZVRW9zryBoTQJfV4kewYHv9TXNabjxHc+ZF/LJiWxbca5w1SfwfLzPkrvMjg3nCwap8PSGb90PHvxIhKXowE6Q96qsTMq52MkRmziYh+phaYDYkIiEQxq6sWzwuR+gA7/bsyjSnV1W3AMwrjEMmFGpmX7a0Lat4//GClzKR6KTGmNFNJBavlVOzc8Ell0VTRsvUMW4ym7CtsllzYse5Kb24G8lc9mL6x3G8bFgSPu2nRyl4a+6FuByg/qhsF9ioU85xEjIoiMOhsZMiJamzb5fmggkN/uKf4/ips7JHQATf5o9ybAP1KrPFTuWx4V2PQSE+X8yMVRitPeYBRp7ZlZtUL3nXpC2yR1KQS/YAtJ78GCemnyZatVHIabVcxOi9M5qMon2bFg6vTgucBknRJQirlKfGidBFmfkU0tdS+p9YEXqd4WP71smRPIYbrPRGGZQ86Tz1EyOF9reh9XTy2ERpvKTgaByePq1ZT8NiyPYjkNaP4geaScWiN3+aSvGe6kC9UW/wiuq7r455pnCUGY5N8wTupWApeg==|920 \ No newline at end of file +}//I4rGP0S8mvCRAr50ZPGaHD687WYojUVW+Q3dknGj8xipMKg+REZibmaRdhqtF3UshYF2PJOhhli7unmwNpcRkchuVVtyQvvLdyBdolcjYzqyvEW7xjN7owDdc/74o8ZZgux6Q4mDWnS3+J0ctYZMQlY67y7FW5o02W9lKQTPrH+DlR1pJ9wOFdR8hvaM6m091AqInXSVd5Nc95bx+znmQ2kXh8YCY739VZWVkRUHnO53nOKX12D2Zjvgsb2Ijrp6pn/FAVaM7hN87y/yNEjDN3I9XptGrgRmlHDu6CqNyOI8GTvuJL4Rx+JB+uRhF0xf6DDtTNYLY7JtyHCkH9VjtoX3c2F/V/AH21drvRW/0eEr9NGVL5OBzVtJUepQylLhQT9DE0XO6JHr7+vdoOhHs7xrhKyp1PnYk0MGAbLtiAgRGrYStsrv/lHgLNeRnSI3klmfk5mhx3qzgtuZIGv4HW6uxJ6s3CAUHs1iHIR8eVXHCnKCEOug8/HDWFBPJo97OjTbkoDJcmf4jHI1VqJjev+Jme8EK7Vie52p8yacV4ItxDl6wxJVpYJt1n4KSqnrXXtT+qTe/igAtSld4dkHCCvI6HvN1VGT2hTjUKmueDo7asGLMnN807m8k1JzWIckRZlGxGcK30ntC9Hrjutk8mVagecm71mA02Z8Vd06QumZum+YozoQlV/zDKtZIB0+DyegrmdHxqTsEkENueNajQsqSgOSiLju34OBjjFoo8q3AovV3ogFBEhUr6Pk0Cc+NdAjvNL7UljEgaEH9ZOfQQiRvs8s4M0ZPQmtfLnlUDVZkYq89Kqb/EHPoRL6+I5i114jxL4FYSjsnuBdUcEMCv3EDKB0ConakjO8Nzhszc4lNDOJvEk7tYEOvr1jarfdpboM4lBbogiqHLuZDE50wQ==|920 \ No newline at end of file diff --git a/Pages/项目首页/项目首页.rd b/Pages/项目/项目首页/项目首页.rd similarity index 100% rename from Pages/项目首页/项目首页.rd rename to Pages/项目/项目首页/项目首页.rd diff --git a/Pages/项目首页/预算申请/预算申请.json b/Pages/项目/项目首页/预算申请/预算申请.json similarity index 100% rename from Pages/项目首页/预算申请/预算申请.json rename to Pages/项目/项目首页/预算申请/预算申请.json diff --git a/Pages/项目首页/预算申请/预算申请.rd b/Pages/项目/项目首页/预算申请/预算申请.rd similarity index 100% rename from Pages/项目首页/预算申请/预算申请.rd rename to Pages/项目/项目首页/预算申请/预算申请.rd diff --git a/Pages/项目首页/预算申请/预算申请审批.json b/Pages/项目/项目首页/预算申请/预算申请审批.json similarity index 100% rename from Pages/项目首页/预算申请/预算申请审批.json rename to Pages/项目/项目首页/预算申请/预算申请审批.json diff --git a/Pages/项目首页/预算申请/预算申请审批.rd b/Pages/项目/项目首页/预算申请/预算申请审批.rd similarity index 100% rename from Pages/项目首页/预算申请/预算申请审批.rd rename to Pages/项目/项目首页/预算申请/预算申请审批.rd diff --git a/Pages/项目首页/项目首页子页面/项目成员.json b/Pages/项目首页/项目首页子页面/项目成员.json deleted file mode 100644 index 0e138f21..00000000 --- a/Pages/项目首页/项目首页子页面/项目成员.json +++ /dev/null @@ -1,720 +0,0 @@ -{ - "Rows": { - "RowColumnAttachedInfos": { - "0": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 24.0 - } - }, - "1": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 35.0 - } - }, - "2": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0 - } - }, - "3": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 642.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } - } - }, - "4": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 24.0 - } - }, - "5": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0, - "IsHidden": true - } - } - }, - "InLogicalVisibleIndexes": [ - 5 - ], - "Count": 6, - "DefaultSize": 24.0 - }, - "Cols": { - "RowColumnAttachedInfos": { - "0": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "1": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "2": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "3": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "4": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "5": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "6": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "7": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "8": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "9": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "10": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0 - } - }, - "11": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "12": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "13": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "14": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "15": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "16": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "17": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "18": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "19": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "20": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } - } - }, - "21": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "22": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "23": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "24": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "25": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "26": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "27": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "28": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "29": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "30": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "31": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "32": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "34": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "35": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "36": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "37": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "38": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "39": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0 - } - } - }, - "Count": 40, - "DefaultSize": 32.0 - }, - "Values": { - "1,26": "任务详细视图", - "1,35": "查询" - }, - "AttachInfos": { - "1,1": { - "CellType": { - "$type": "ElementUI.SelectCellType, ElementUI", - "CommandList": [], - "UIPermissions": [ - { - "Scope": 2, - "AllowRoles": [ - "FGC_Anonymous" - ] - }, - { - "Scope": 1, - "AllowRoles": [ - "FGC_Anonymous" - ] - } - ], - "useBinding": true, - "options": [ - { - "value": "黄金糕", - "label": "黄金糕" - }, - { - "value": "双皮奶", - "label": "双皮奶" - }, - { - "value": "蚵仔煎", - "label": "蚵仔煎" - }, - { - "value": "龙须面", - "label": "龙须面" - }, - { - "value": "北京烤鸭", - "label": "北京烤鸭" - } - ], - "bindingOptions": { - "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", - "TableName": "用户信息视图", - "BindingInfos": [ - { - "BindingInfo": { - "TableName": "用户信息视图", - "ColumnName": "用户名", - "GUID": "af5f9c93-4159-42bb-89f1-4f5ba75e361b" - }, - "ColumnName": "value" - }, - { - "BindingInfo": { - "TableName": "用户信息视图", - "ColumnName": "全名", - "GUID": "16a5f8b7-9cc4-42cf-8e38-2056e5657781" - }, - "ColumnName": "label" - } - ], - "CustomColumns": [] - }, - "placeholder": "请选择成员", - "noDataText": "无数据", - "multiple": true, - "collapseTags": true, - "filterInServerOptions": { - "matchMethod": "contains", - "loadingText": "加载中" - }, - "noMatchText": "无匹配数据", - "clearable": true - } - }, - "1,11": { - "CssName": "singlebox", - "CellType": { - "$type": "Forguncy.RadioGroupCellType, ServerDesignerCommon", - "Style": 3, - "Items": [ - { - "Value": "", - "DisplayValue": "所有" - }, - { - "Value": "计划", - "DisplayValue": "计划工时" - }, - { - "Value": "实际", - "DisplayValue": "实际工时" - } - ] - }, - "RulesGuidList": [ - "f7355555-9eb3-43e8-8fde-5cecffe691be" - ] - }, - "1,26": { - "CssName": "singlebox", - "CellType": { - "$type": "Forguncy.RadioGroupCellType, ServerDesignerCommon", - "Style": 3, - "CellDefaultValue": "任务详细视图", - "Items": [ - { - "Value": "任务详细视图", - "DisplayValue": "任务详细视图" - }, - { - "Value": "人员统计视图", - "DisplayValue": "人员统计视图" - } - ] - } - }, - "1,35": { - "CellType": { - "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", - "Text": "查询", - "TemplateKey": "_RS_Main1", - "Icon": { - "Name": "Application/047_search_8.svg", - "BuiltIn": true, - "Color": "Background 1", - "UseCellTypeForeColor": true - }, - "IconSize": 14.0 - } - }, - "3,1": { - "CellType": { - "$type": "Forguncy.RepeaterCellType, ServerDesignerCommon", - "TemplatePageName": "6899a8cead694b3ba00307b6756dbd7", - "Command": { - "$type": "GrapeCity.Forguncy.Commands.CustomCommandObject, Forguncy.Commands", - "Commands": [ - { - "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", - "PropertyItemsList": [ - { - "TargetCells": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目成员!B2" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目成员!执行人" - } - } - ] - } - ], - "ParamProperties": { - "执行人": "执行人", - "总工时": "总工时", - "平均时薪": "平均时薪", - "总提成": "总提成" - } - }, - "DataSourceType": 1, - "DataSource": { - "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", - "TableName": "任务工时表", - "BindingInfos": [ - { - "BindingInfo": { - "TableName": "任务工时表", - "ColumnName": "执行人", - "GUID": "97421878-8c3f-4e42-9ba8-7637d317a933" - }, - "ColumnName": "执行人" - }, - { - "BindingInfo": { - "TableName": "任务工时表", - "ColumnName": "执行人", - "GUID": "ff3a5ee6-cb60-4bf0-b312-d3a72c68fb40", - "AttachType": { - "$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess", - "UserColumnAttachType": 1 - } - }, - "ColumnName": "执行人姓名" - }, - { - "BindingInfo": { - "TableName": "任务工时表", - "ColumnName": "总工时", - "GUID": "551e6832-5c1a-4028-a9fa-5f4c72f32d44" - }, - "ColumnName": "总工时" - }, - { - "BindingInfo": { - "TableName": "任务工时表", - "ColumnName": "平均时薪", - "GUID": "ed933549-a5c9-4e1b-be65-8bcc2b1b35da" - }, - "ColumnName": "平均时薪" - }, - { - "BindingInfo": { - "TableName": "任务工时表", - "ColumnName": "总提成", - "GUID": "05ad4c59-a92a-4d57-8113-0488921b56a6" - }, - "ColumnName": "总提成" - } - ], - "OrderBySqlCondition": { - "OrderByColumns": [ - { - "ColumnBindingInfo": { - "TableName": "任务工时表", - "ColumnName": "总工时", - "GUID": "f93371a2-2e00-42a2-9cef-134287c59879" - }, - "Order": 1 - } - ] - }, - "IsListviewDataSource": true, - "CustomColumns": [] - }, - "DataSourceListviewName": "图文列表表格1", - "TemplateKey": "BlackWhite", - "DetailTableSetting": { - "$type": "Forguncy.Model.DetailListViewInfo, ServerDesignerCommon", - "ColumnOfDetailTable": "项目ID", - "MasterTable": "项目表", - "ColumnOfMasterTable": "ID", - "DataCommitType": 2 - } - } - }, - "3,11": { - "CellType": { - "$type": "Forguncy.RepeaterCellType, ServerDesignerCommon", - "TemplatePageName": "007ea4aa4c7440478a9a092179dace8", - "DataSourceType": 1, - "DataSource": { - "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", - "TableName": "项目成员表", - "BindingInfos": [ - { - "BindingInfo": { - "TableName": "项目成员表", - "ColumnName": "项目成员", - "GUID": "5e6ecc70-0b8c-48c2-ae52-b26c7f580397" - }, - "ColumnName": "项目成员" - }, - { - "BindingInfo": { - "TableName": "项目成员表", - "ColumnName": "项目成员", - "GUID": "eded767c-dd09-4323-a133-72d59d357da6", - "AttachType": { - "$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess", - "UserColumnAttachType": 1 - } - }, - "ColumnName": "项目成员_全名" - }, - { - "BindingInfo": { - "TableName": "项目成员表", - "ColumnName": "岗位ID", - "GUID": "2b7f920d-dae0-4573-8cdd-9595f6750ef5", - "RelationBinding": { - "RelatedTable": "项目岗位", - "RelatedColumn": "ID", - "DisplayColumn": "岗位名称" - } - }, - "ColumnName": "岗位名称" - }, - { - "BindingInfo": { - "TableName": "项目成员表", - "ColumnName": "默认时薪", - "GUID": "15b189a0-94c5-49c8-a051-80060a288837" - }, - "ColumnName": "默认时薪" - } - ], - "SqlCondition": { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "项目成员表", - "ColumnName": "项目ID", - "GUID": "88127190-fc5f-4ae1-8278-2114953e59bb" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目成员!项目ID" - } - }, - "OrderBySqlCondition": { - "OrderByColumns": [ - { - "ColumnBindingInfo": { - "TableName": "项目成员表", - "ColumnName": "FGC_CreateDate", - "GUID": "0b2d493b-818f-4d46-b6b1-b93a3eb7b4d1" - }, - "Order": 1 - } - ] - }, - "IsListviewDataSource": true, - "CustomColumns": [] - }, - "DataSourceListviewName": "图文列表表格2", - "DisplayMode": 2, - "TemplateKey": "渐变卡片" - } - }, - "5,1": { - "BindingInfo": { - "TableName": "项目表", - "ColumnName": "工时核定方式", - "GUID": "d6bd5419-1ac2-4273-b273-2ad756ae5ffb" - } - } - }, - "StyleDatas": { - "Styles": [ - { - "FontSize": 13.333333333333332, - "Foreground": 0 - }, - { - "FontFamily": 1, - "FontSize": 13.333333333333332 - }, - { - "FontSize": 13.333333333333332 - }, - { - "FontFamily": 1, - "FontSize": 13.333333333333332, - "HorizontalAlignment": 2 - }, - { - "FontFamily": 1 - }, - { - "HorizontalAlignment": 3 - } - ], - "Types": { - "Strs": [ - "black", - "Body", - "Right", - "Center" - ] - }, - "CellStyles": { - "1,1": 0, - "1,11": 1, - "1,25": 2, - "1,26": 3, - "1,27": 4, - "1,28": 4, - "1,29": 4, - "1,30": 4, - "1,31": 4, - "1,32": 4, - "1,33": 4, - "1,35": 2, - "3,1": 5, - "3,11": 5, - "4,1": 5, - "4,2": 5, - "4,3": 5, - "4,4": 5, - "4,5": 5, - "4,6": 5, - "4,7": 5, - "4,8": 5, - "4,9": 5, - "5,1": 2 - }, - "SheetStyle": { - "FontFamily": 1 - } - }, - "Spans": [ - "1,1,1,9", - "3,1,1,9", - "1,11,1,8", - "1,35,1,4", - "1,26,1,8", - "5,1,1,4", - "3,11,1,28" - ], - "PageInfo": { - "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", - "PageLoadedCommandList": [ - { - "$type": "Notiflix_Forguncy.Block_Command, Notiflix_Forguncy", - "FunctionName": "remove", - "Cell": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目成员!项目子页面" - }, - "Title": "加载中" - } - ], - "PermissionData": { - "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionData, Forguncy.RbacPermission.Core", - "permissionResource": { - "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionResource, Forguncy.RbacPermission.Core" - }, - "permissionBindings": [ - { - "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionBinding, Forguncy.RbacPermission.Core", - "roleNames": [ - "FGC_LoginUser" - ] - } - ] - }, - "RowBreakLines": [], - "RepeatRangeSettings": [], - "ConditionFormatRulesCollection": { - "Rules": [ - { - "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon", - "Formula": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=IF(项目成员!$AA$2=\"任务详细视图\",0,1)" - }, - "GUID": "f7355555-9eb3-43e8-8fde-5cecffe691be", - "StyleInfo": { - "Underline": null, - "Strikethrough": null - }, - "IsInvisible": true - } - ] - } - }, - "PrintInfo": { - "PaperSize": {}, - "Margin": {} - }, - "CustomNames": [ - { - "Name": "工时核定方式", - "Formula": "项目成员!$B$6" - } - ] -}///4AEQp7JwohyriN94PsUJvKaiUz2+J0CNY4CbFBkoipsuHOCW95vcBMKSGyVqP+Ciw3VJRV3enLPe4OH9JCpgicrEVkzzF31FYJlM0hgBmzFjXqykEDDjaiSxhgR7Bv+X01UTx6zVzjSm3cvs1cwgjSN56u7UvOKo3KZz/Z/oh0OurC1rAOszpvaLaxOeWrSeWwwT+Cf4t+iEhpPPQaRaIU3NAEtlA5JiW16tKpwRBo3AcFkIgPwBPXAp+QYIa1UQd7Q26rcXYSUICUY1XFp+BL3xlLneh90d+paEIHK0vXh25NX4piZ0bNYNnnCRiEUKsap+OFdIDjlYvupClklCJSMC8fh3fjP/q0IUpJREIo85AjGKlHiCOGlrtcEPnoPoxagXTogwU58FK+2gZrsc4wPxG9Tb7GIsLHh3H4uEAkCVsk0mEtfj0OF9ocGXudaUUfjGx/IqnQ1PgJlHa30d9Be9QPmpdxbmW4xewrUrKpq5zvM5fb6OW+fvK2kWOk0H64dBIvgbuPl/ggOTMjXjhY3nlZcHt5aRpNTMRStnfQ+SSpk1ciD7NNL1E6CAcHqwpxj7GNdEeBu0CUkrk0b5xDrn+FJn4NNkBV7CidCFpe8KrQfVmdR7Owglm4Bh5x/3l3cSGpbXf700+Htb0ahvBhJ+TrNIj04DJ5yMrz9O989Cqcy7HQZxZv4Oyh5yn36EYM8h5uCHw3zkSzLg8kqmrcDQA0/NnRMfSetjzQzqlvllEAbHGZOaIHgUyW+EiS4sEmBHJ1pDxcU4UrlICfou6V5f/BHPDYnvG+e8qBG2xix3EcgDmulHyTSos1AVKqo4sNGhEctXOyrCT5Okbk0BjGs71ITVxIey2kf9p7voPrWQnZy6/napi/erBOH1j/qO7z2h0fds0vucPe7guZyjw==|920 \ No newline at end of file diff --git a/Pages/项目首页/项目首页子页面/项目成员.rd b/Pages/项目首页/项目首页子页面/项目成员.rd deleted file mode 100644 index 35e45c39..00000000 --- a/Pages/项目首页/项目首页子页面/项目成员.rd +++ /dev/null @@ -1,11 +0,0 @@ -{ - "PageType": 0, - "ColumnCount": 40, - "RowCount": 6, - "CustomNames": [ - { - "Name": "工时核定方式", - "Formula": "项目成员!$B$6" - } - ] -} \ No newline at end of file diff --git a/Pages/项目首页/项目首页子页面/项目概况-关键数据.rd b/Pages/项目首页/项目首页子页面/项目概况-关键数据.rd deleted file mode 100644 index 02dcfb01..00000000 --- a/Pages/项目首页/项目首页子页面/项目概况-关键数据.rd +++ /dev/null @@ -1,11 +0,0 @@ -{ - "PageType": 0, - "ColumnCount": 47, - "RowCount": 5, - "Formulas": { - "1,19": "INT(V5/X5*100)", - "1,9": "INT(L5/N5*100)", - "1,29": "INT(AF5/AH5*100)", - "1,39": "INT(AP5/AR5*100)" - } -} \ No newline at end of file diff --git a/Plugin/用户管理命令 V2-10_0_0_0.zip b/Plugin/用户管理命令 V2-10_0_0_0.zip new file mode 100644 index 00000000..b5bcf35b Binary files /dev/null and b/Plugin/用户管理命令 V2-10_0_0_0.zip differ diff --git a/ServerCommands/任务/修改任务预算工时.json b/ServerCommands/任务/修改任务预算工时.json new file mode 100644 index 00000000..aa250702 --- /dev/null +++ b/ServerCommands/任务/修改任务预算工时.json @@ -0,0 +1,389 @@ +{ + "Name": "修改任务预算工时", + "Enabled": true, + "Triggers": [ + { + "$type": "Forguncy.SaveLoad.PostRequestTriggerSaveData, ServerDesignerCommon", + "Permission": { + "PermissionData": { + "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionData, Forguncy.RbacPermission.Core", + "permissionResource": { + "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionResource, Forguncy.RbacPermission.Core" + }, + "permissionBindings": [ + { + "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionBinding, Forguncy.RbacPermission.Core", + "roleNames": [ + "FGC_LoginUser" + ] + } + ] + } + }, + "Parameters": [ + { + "Name": "任务ID", + "DataValidationInfo": { + "IgnoreBlank": false + } + }, + { + "Name": "新预算工时", + "DataValidationInfo": { + "IgnoreBlank": false + } + } + ] + } + ], + "Commands": [ + { + "$type": "Forguncy.Model.CatchExceptionCommand, ServerDesignerCommon", + "TryCommandPart": { + "CommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "任务表", + "TableValue": { + "TableName": "任务表", + "TableValueType": 1, + "BindingInfos": [ + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "项目ID", + "GUID": "8fc75aad-be22-4706-bfc1-5d2a9e34ee8c" + }, + "ColumnName": "项目ID" + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "任务名称", + "GUID": "efdec58c-5625-4843-a75d-ff21aec11dff" + }, + "ColumnName": "任务名称" + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "任务预算工时", + "GUID": "3db7c756-c246-409a-abb4-19c211e4658e" + }, + "ColumnName": "任务预算工时" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务表", + "ColumnName": "ID", + "GUID": "23383ca7-120e-436c-8f7b-3b828003fcfe" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务ID" + } + }, + "TopCount": "1" + }, + "ID": "96d547bb2a2a49d7a8c7dc2c2df503c5" + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务表" + } + }, + "value": "%Null%", + "compareType": 1 + }, + "CommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "项目统计", + "TableValue": { + "TableName": "View_项目统计信息", + "TableValueType": 1, + "BindingInfos": [ + { + "BindingInfo": { + "TableName": "View_项目统计信息", + "ColumnName": "项目ID", + "GUID": "8be465f9-1173-4551-ba9c-8077e9e1068a", + "RelationBinding": { + "RelatedTable": "项目表", + "RelatedColumn": "ID", + "DisplayColumn": "严格模式" + } + }, + "ColumnName": "严格模式" + }, + { + "BindingInfo": { + "TableName": "View_项目统计信息", + "ColumnName": "工时核定方式", + "GUID": "ec3b7b01-920d-4ad5-9a6b-6360afbada2a" + }, + "ColumnName": "工时核定方式" + }, + { + "BindingInfo": { + "TableName": "View_项目统计信息", + "ColumnName": "项目预算工时", + "GUID": "c3f88088-ff8f-4ba4-b4b8-0b9b680f51b1" + }, + "ColumnName": "项目预算工时" + }, + { + "BindingInfo": { + "TableName": "View_项目统计信息", + "ColumnName": "总核定工时", + "GUID": "7c0f01a0-76c6-4b67-85f4-4c0e4455503e" + }, + "ColumnName": "总核定工时" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "View_项目统计信息", + "ColumnName": "项目ID", + "GUID": "f6308398-2aec-4b4a-9e2a-ec524facb605" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务表.项目ID" + } + }, + "TopCount": "1" + }, + "ID": "bf2f70f520974b768143f5c166040550" + }, + { + "$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": "1" + }, + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新预算工时" + } + }, + "value": "0", + "compareType": 2 + }, + { + "$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 + } + ] + }, + "CommandList": [ + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "400", + "Message": "任务预算工时超标，请修改或申请新的预算。", + "CustomReturns": [ + { + "ReturnPropertyName": "新工时", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务表.任务预算工时" + } + } + ] + } + ], + "ID": "e9f67ed4-f44a-4bd7-b04a-4b3d8ee43eff" + }, + { + "CommandList": [ + { + "$type": "Forguncy.Model.ServerTransactionCommand, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "任务表", + "ShowConfirm": false, + "RowsToUpdate": 1, + "RowsToUpdateCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务表", + "ColumnName": "ID", + "GUID": "36cde956-3506-4020-942d-ca6bb7016a8e" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务ID" + } + }, + "UpdateBindingValues": [ + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "任务预算工时", + "GUID": "340f9b02-8f8d-47f0-9111-01fd2d7f4357" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新预算工时" + } + } + ], + "ParamNameToSaveNewRowValue": "新任务" + }, + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "项目动态", + "UpdateType": "add", + "ShowConfirm": false, + "UpdateBindingValues": [ + { + "BindingInfo": { + "TableName": "项目动态", + "ColumnName": "项目ID", + "GUID": "b391f334-49fe-4abd-944a-382c49fa21d0" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目ID" + } + }, + { + "BindingInfo": { + "TableName": "项目动态", + "ColumnName": "项目动态", + "GUID": "fdbb3ead-fef4-4513-bb19-98b174e3a225" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=\"调整了任务[\"&任务表.任务名称&\"]的预算工时\"" + } + }, + { + "BindingInfo": { + "TableName": "项目动态", + "ColumnName": "执行人", + "GUID": "bc64b248-4605-441a-a2fe-02fffb13b8d6" + }, + "Value": "%CurrentUser%" + } + ] + } + ] + }, + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "0", + "Message": "新增成功", + "CustomReturns": [ + { + "ReturnPropertyName": "新工时", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新预算工时" + } + } + ] + } + ], + "ID": "4b6538ad-e137-43ed-a0bd-db5e924474df" + } + ], + "Comments": "如果任务设置了预算工时，则检测是否超标" + } + ], + "ID": "431d1fc4-4a40-414f-a32c-c06768da0400" + }, + { + "CommandList": [ + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "400", + "Message": "任务不存在", + "CustomReturns": [ + { + "ReturnPropertyName": "新工时", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务表.任务预算工时" + } + } + ] + } + ], + "ID": "7828a711-c408-40ed-91a2-1035bd9e90f2" + } + ] + } + ] + }, + "CatchCommandPart": { + "CommandList": [ + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=ExceptionCode" + }, + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=ExceptionMessage" + }, + "CustomReturns": [ + { + "ReturnPropertyName": "新工时", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务表.任务预算工时" + } + } + ] + } + ] + } + } + ], + "ReturnProperties": [ + { + "Name": "新工时" + } + ] +} \ No newline at end of file diff --git a/ServerCommands/任务/新增任务.json b/ServerCommands/任务/新增任务.json index 3ed990f4..cfd61171 100644 --- a/ServerCommands/任务/新增任务.json +++ b/ServerCommands/任务/新增任务.json @@ -62,7 +62,7 @@ "DataValidationInfo": {} }, { - "Name": "参与人", + "Name": "预算工时", "DataValidationInfo": {} }, { @@ -83,50 +83,64 @@ "CommandList": [ { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "参与人", + "ParameterName": "项目统计", "TableValue": { - "TableName": "用户信息视图", + "TableName": "View_项目统计信息", + "TableValueType": 1, "BindingInfos": [ { "BindingInfo": { - "TableName": "用户信息视图", - "ColumnName": "用户名", - "GUID": "de3bcaa7-aa75-4d79-9231-4da30533b74a" + "TableName": "View_项目统计信息", + "ColumnName": "项目ID", + "GUID": "8be465f9-1173-4551-ba9c-8077e9e1068a", + "RelationBinding": { + "RelatedTable": "项目表", + "RelatedColumn": "ID", + "DisplayColumn": "严格模式" + } }, - "ColumnName": "用户名" + "ColumnName": "严格模式" }, { "BindingInfo": { - "TableName": "用户信息视图", - "ColumnName": "全名", - "GUID": "6917ca2f-a4c8-4e6e-83a1-da8d327f145c" + "TableName": "View_项目统计信息", + "ColumnName": "工时核定方式", + "GUID": "ec3b7b01-920d-4ad5-9a6b-6360afbada2a" }, - "ColumnName": "全名" + "ColumnName": "工时核定方式" }, { "BindingInfo": { - "TableName": "用户信息视图", - "ColumnName": "默认时薪", - "GUID": "32e094df-b3d7-41fb-b64a-bedb6e0dbd3b" + "TableName": "View_项目统计信息", + "ColumnName": "项目预算工时", + "GUID": "c3f88088-ff8f-4ba4-b4b8-0b9b680f51b1" }, - "ColumnName": "默认时薪" + "ColumnName": "项目预算工时" + }, + { + "BindingInfo": { + "TableName": "View_项目统计信息", + "ColumnName": "总核定工时", + "GUID": "7c0f01a0-76c6-4b67-85f4-4c0e4455503e" + }, + "ColumnName": "总核定工时" } ], "SqlCondition": { - "$type": "ForguncyDataAccess.TextCESqlCondition, ForguncyDataAccess", - "CompareType": 8, + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", "ColumnBindingInfo": { - "TableName": "用户信息视图", - "ColumnName": "用户名", - "GUID": "92e828b4-ed0b-4537-8274-16bfe9f17ad7" + "TableName": "View_项目统计信息", + "ColumnName": "项目ID", + "GUID": "f6308398-2aec-4b4a-9e2a-ec524facb605" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=参与人" + "SerializeProperty": "=项目ID" } - } + }, + "TopCount": "1" }, - "ID": "f6ffae1d6c224289b79d71d3369d42e2" + "ID": "4068a409eade48e59173917d96d60bf8" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -138,319 +152,372 @@ "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", "ParamObject": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=父任务ID" + "SerializeProperty": "=项目统计" } }, - "value": "%Null%" + "value": "%Null%", + "compareType": 1 }, "CommandList": [ { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "层级", - "ParameterValue": "1", - "ID": "c54f363fdd1243ab9ebb70c447e54aa0" - } - ], - "ID": "1fbb1887-5dc0-47d8-82bd-93ba11b19585" - }, - { - "CommandList": [ - { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "父任务", - "TableValue": { - "TableName": "任务表", - "TableValueType": 1, - "BindingInfos": [ - { - "BindingInfo": { - "TableName": "任务表", - "ColumnName": "层级", - "GUID": "71447dd9-ed15-40d3-8c95-35af02be1228" + "$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": "1" + }, + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=预算工时" + } + }, + "value": "0", + "compareType": 2 + }, + { + "$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 + } + ] + }, + "CommandList": [ + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "400", + "Message": "任务预算工时超标，请修改或申请新的预算。" + } + ], + "ID": "53f4187a-3af5-4705-9047-e23ca8c51a4e" + }, + { + "CommandList": [ + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=父任务ID" + } + }, + "value": "%Null%" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "层级", + "ParameterValue": "1", + "ID": "fc1c177d0f8146fe971c98817bc9a68d" + } + ], + "ID": "8621eda5-c90a-4e21-bc4e-fe7f3cf5bb76" + }, + { + "CommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "父任务", + "TableValue": { + "TableName": "任务表", + "TableValueType": 1, + "BindingInfos": [ + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "层级", + "GUID": "71447dd9-ed15-40d3-8c95-35af02be1228" + }, + "ColumnName": "层级" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务表", + "ColumnName": "ID", + "GUID": "a11173ee-ce04-46d5-a2fe-57bac8f3d19f" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=父任务ID" + } + }, + "TopCount": "1" + }, + "ID": "a739bad14f7e43d0bfa3c64950d43eed" + }, + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "层级", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=父任务.层级+1" + }, + "ID": "578a03f2bc28443291e158813a67f853" + } + ], + "ID": "608074a6-c246-4740-b2b9-22d68cbfa8d9" + } + ] }, - "ColumnName": "层级" - } - ], - "SqlCondition": { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "任务表", - "ColumnName": "ID", - "GUID": "a11173ee-ce04-46d5-a2fe-57bac8f3d19f" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=父任务ID" - } - }, - "TopCount": "1" - }, - "ID": "b61ebbfdb99e4ab4b532f442c4ccf95c" - }, - { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "层级", - "ParameterValue": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=父任务.层级+1" - }, - "ID": "50af90520fcd4a5aa3def7f06c79bf0d" + { + "$type": "Forguncy.Model.ServerTransactionCommand, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "任务表", + "UpdateType": "add", + "ShowConfirm": false, + "UpdateBindingValues": [ + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "项目ID", + "GUID": "08af72b6-edaf-4d60-a5b9-9a416fa340e6" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目ID" + } + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "父任务ID", + "GUID": "b67853cb-e11a-45e7-a157-a39f2ed30957" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=父任务ID" + } + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "任务名称", + "GUID": "ae0e9518-a034-41fc-915c-77240b405ea6" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务标题" + } + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "执行者", + "GUID": "c982c67a-6248-442a-a585-f64fe62d2680" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=执行人" + } + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "开始时间", + "GUID": "32733259-ed48-485c-855b-b773522f34b7" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=开始日期" + } + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "结束时间", + "GUID": "190579b6-d2d8-4b11-a61c-84831351451e" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=结束日期" + } + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "任务类型", + "GUID": "7814d8a0-4316-4e3d-a2fb-1419c4820881" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务类型" + } + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "分组ID", + "GUID": "de35ab3e-835d-4cc3-b8dc-fa36e5212b69" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务分组" + } + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "版本", + "GUID": "4e7e93dd-43ef-4a30-ac01-6884fb764d4e" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务版本" + } + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "任务说明", + "GUID": "60673be5-8743-4376-a620-0710929824eb" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务说明" + } + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "备注", + "GUID": "e22df11a-00e2-43d3-b91f-709f94649021" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=备注" + } + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "层级", + "GUID": "4cd5444f-2718-4baf-aa2e-f9d6915f4e46" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=层级" + } + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "任务预算工时", + "GUID": "d3098515-dcd2-4140-9f49-4c1434e6f61c" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=预算工时" + } + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "任务状态", + "GUID": "5dd1d998-9b31-437b-acf4-6f039fb1e101" + }, + "Value": "0" + } + ], + "ParamNameToSaveNewRowValue": "新任务" + }, + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "项目动态", + "UpdateType": "add", + "ShowConfirm": false, + "UpdateBindingValues": [ + { + "BindingInfo": { + "TableName": "项目动态", + "ColumnName": "项目ID", + "GUID": "2e28aac6-1fb2-46fc-a19d-ab41520eead3" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目ID" + } + }, + { + "BindingInfo": { + "TableName": "项目动态", + "ColumnName": "项目动态", + "GUID": "f8082e24-0691-48e8-a425-32659221befd" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=\"新增任务[\"&任务标题&\"]\"" + } + }, + { + "BindingInfo": { + "TableName": "项目动态", + "ColumnName": "执行人", + "GUID": "b83be749-881b-42fc-ac00-1f4a7e4004fe" + }, + "Value": "%CurrentUser%" + } + ] + } + ] + }, + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "0", + "Message": "新增成功" + } + ], + "ID": "42ba3bd5-cbbe-4b9d-b1ad-4d3c7fddfbce" + } + ], + "Comments": "如果任务设置了预算工时，则检测是否超标" } ], - "ID": "542b405b-d3b4-425a-88aa-f2085e26ef9b" - } - ] - }, - { - "$type": "Forguncy.Model.ServerTransactionCommand, ServerDesignerCommon", - "CommandList": [ - { - "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", - "TableName": "任务表", - "UpdateType": "add", - "ShowConfirm": false, - "UpdateBindingValues": [ - { - "BindingInfo": { - "TableName": "任务表", - "ColumnName": "项目ID", - "GUID": "b04306d4-7201-4eb8-948a-4e21ccd3c19b" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目ID" - } - }, - { - "BindingInfo": { - "TableName": "任务表", - "ColumnName": "父任务ID", - "GUID": "78b4a98e-eac4-47aa-aa4e-1fc168873d15" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=父任务ID" - } - }, - { - "BindingInfo": { - "TableName": "任务表", - "ColumnName": "任务名称", - "GUID": "9236bf4b-f458-443b-9d42-b22de80d2623" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务标题" - } - }, - { - "BindingInfo": { - "TableName": "任务表", - "ColumnName": "执行者", - "GUID": "7de19a46-9ff6-41eb-b644-bd6fc0022884" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=执行人" - } - }, - { - "BindingInfo": { - "TableName": "任务表", - "ColumnName": "开始时间", - "GUID": "12545857-1a69-491a-afe2-69d52ba3adb1" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=开始日期" - } - }, - { - "BindingInfo": { - "TableName": "任务表", - "ColumnName": "结束时间", - "GUID": "f9d9e102-8ddc-430a-83c9-6759918c3bf7" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=结束日期" - } - }, - { - "BindingInfo": { - "TableName": "任务表", - "ColumnName": "任务类型", - "GUID": "74a0db34-6116-4c14-9275-820e0e7bedf1" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务类型" - } - }, - { - "BindingInfo": { - "TableName": "任务表", - "ColumnName": "分组ID", - "GUID": "afa4c154-4cf6-497b-b55f-799bf4d3782a" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务分组" - } - }, - { - "BindingInfo": { - "TableName": "任务表", - "ColumnName": "版本", - "GUID": "1aa2c146-4c85-4bf1-afef-f5ed637646fc" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务版本" - } - }, - { - "BindingInfo": { - "TableName": "任务表", - "ColumnName": "任务说明", - "GUID": "18b091f5-71e5-452e-9a52-7a608c1de521" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务说明" - } - }, - { - "BindingInfo": { - "TableName": "任务表", - "ColumnName": "备注", - "GUID": "4bd247ec-5f3c-410a-86ac-5f5900174fa2" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=备注" - } - }, - { - "BindingInfo": { - "TableName": "任务表", - "ColumnName": "任务状态", - "GUID": "bfd5eced-642a-4fa0-a515-d004107749c3" - }, - "Value": "0" - }, - { - "BindingInfo": { - "TableName": "任务表", - "ColumnName": "层级", - "GUID": "745dab60-5ec4-45f1-b77a-4547247937af" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=层级" - } - } - ], - "ParamNameToSaveNewRowValue": "新任务" + "ID": "159e6b8d-e674-41dd-97a9-0722693f416f" }, { - "$type": "Forguncy.Model.LoopCommand, ServerDesignerCommon", - "LoopInfo": { - "$type": "Forguncy.Model.CountLoopInfo, ServerDesignerCommon", - "LoopCount": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=参与人" - }, - "LoopItemParamName": "Item" - }, "CommandList": [ { - "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", - "TableName": "任务成员表", - "UpdateType": "add", - "ShowConfirm": false, - "UpdateBindingValues": [ - { - "BindingInfo": { - "TableName": "任务成员表", - "ColumnName": "任务ID", - "GUID": "f7aff15e-7a00-4c45-bb96-2c3fda9c9640" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=新任务.ID" - } - }, - { - "BindingInfo": { - "TableName": "任务成员表", - "ColumnName": "参与人", - "GUID": "e616fd0b-0315-4818-be45-20c6cf69073c" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=Item.用户名" - } - }, - { - "BindingInfo": { - "TableName": "任务成员表", - "ColumnName": "任务时薪", - "GUID": "61bbc717-8d82-45cf-8176-8e06d009bf30" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=Item.默认时薪" - } - } - ] + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "400", + "Message": "项目不存在" } - ] - }, - { - "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", - "TableName": "项目动态", - "UpdateType": "add", - "ShowConfirm": false, - "UpdateBindingValues": [ - { - "BindingInfo": { - "TableName": "项目动态", - "ColumnName": "项目ID", - "GUID": "e39baf44-b9b5-4142-800d-78993fb0d0a6" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目ID" - } - }, - { - "BindingInfo": { - "TableName": "项目动态", - "ColumnName": "项目动态", - "GUID": "5d49127d-ef06-420e-ab9c-66b073739b36" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=\"新增任务[\"&任务标题&\"]\"" - } - }, - { - "BindingInfo": { - "TableName": "项目动态", - "ColumnName": "执行人", - "GUID": "1957de38-d49e-4123-a364-b267cd6ff3c5" - }, - "Value": "%CurrentUser%" - } - ] + ], + "ID": "9de2f0ca-80c4-4f6c-a3c9-772972beef5c" } ] - }, - { - "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", - "ErrorCode": "0", - "Message": "新增成功" } ] }, diff --git a/ServerCommands/任务/移除任务成员.json b/ServerCommands/任务/移除任务成员.json index 44040d2b..493561d9 100644 --- a/ServerCommands/任务/移除任务成员.json +++ b/ServerCommands/任务/移除任务成员.json @@ -39,42 +39,44 @@ "Commands": [ { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "报工数量", + "ParameterName": "任务信息", "TableValue": { - "TableName": "任务工时表", - "TableValueType": 3, - "SqlCondition": { - "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", - "SubConditions": [ - { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "任务工时表", - "ColumnName": "任务ID", - "GUID": "bf631fc5-2aea-4f67-8c3e-5687fcd17db1" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务ID" - } + "TableName": "任务表", + "TableValueType": 1, + "BindingInfos": [ + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "项目ID", + "GUID": "f86b2436-5824-47c8-80e9-7deaa1385b6b" }, - { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "任务工时表", - "ColumnName": "执行人", - "GUID": "2a652f1e-a4f3-4c21-83cf-0e8546ac250c" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=成员用户名" - } - } - ] + "ColumnName": "项目ID" + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "任务名称", + "GUID": "85d6de7c-6adf-4725-bfea-d450b404f74e" + }, + "ColumnName": "任务名称" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务表", + "ColumnName": "ID", + "GUID": "5f9bb9c4-f177-4206-9975-eaeb99acc1de" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务ID" + } }, - "NullFormulaValueQueryPolicy": 0 + "NullFormulaValueQueryPolicy": 0, + "TopCount": "1" }, - "ID": "779d1a620e1f4c5fb9e69747944b537b" + "ID": "a0db2ab08aca46578fc299c091dccadf" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -86,214 +88,143 @@ "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", "ParamObject": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=报工数量" + "SerializeProperty": "=任务信息" } }, - "value": "0" + "value": "%Null%", + "compareType": 1 }, "CommandList": [ { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "任务信息", + "ParameterName": "成员全名", "TableValue": { - "TableName": "任务表", - "TableValueType": 1, + "TableName": "用户信息视图", + "OnlyGetValue": true, + "TableValueType": 0, "BindingInfos": [ { "BindingInfo": { - "TableName": "任务表", - "ColumnName": "项目ID", - "GUID": "f86b2436-5824-47c8-80e9-7deaa1385b6b" + "TableName": "用户信息视图", + "ColumnName": "全名", + "GUID": "9dd6b21a-caef-4226-9747-b359dea02e9b" }, - "ColumnName": "项目ID" - }, - { - "BindingInfo": { - "TableName": "任务表", - "ColumnName": "任务名称", - "GUID": "85d6de7c-6adf-4725-bfea-d450b404f74e" - }, - "ColumnName": "任务名称" + "ColumnName": "全名" } ], "SqlCondition": { "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", "ColumnBindingInfo": { - "TableName": "任务表", - "ColumnName": "ID", - "GUID": "5f9bb9c4-f177-4206-9975-eaeb99acc1de" + "TableName": "用户信息视图", + "ColumnName": "用户名", + "GUID": "d91c3fdb-7b4a-4a6c-81e5-2e83e3d1f3b9" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务ID" + "SerializeProperty": "=成员用户名" } }, "TopCount": "1" }, - "ID": "8174cfc9dc9c4c6e990ea8a6e0cc7dd4" + "ID": "fe3fe24e8d3b43c1aa94c775b600d985" }, { - "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", - "ConditionAndCommandPairList": [ + "$type": "Forguncy.Model.ServerTransactionCommand, ServerDesignerCommon", + "CommandList": [ { - "Condition": { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", - "ParamObject": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务信息" - } - }, - "value": "%Null%", - "compareType": 1 - }, - "CommandList": [ - { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "成员全名", - "TableValue": { - "TableName": "用户信息视图", - "OnlyGetValue": true, - "TableValueType": 0, - "BindingInfos": [ - { - "BindingInfo": { - "TableName": "用户信息视图", - "ColumnName": "全名", - "GUID": "9dd6b21a-caef-4226-9747-b359dea02e9b" - }, - "ColumnName": "全名" - } - ], - "SqlCondition": { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "用户信息视图", - "ColumnName": "用户名", - "GUID": "d91c3fdb-7b4a-4a6c-81e5-2e83e3d1f3b9" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=成员用户名" - } - }, - "TopCount": "1" - }, - "ID": "c3a79e37337f461e92466b13d96434af" - }, - { - "$type": "Forguncy.Model.ServerTransactionCommand, ServerDesignerCommon", - "CommandList": [ - { - "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "任务成员表", + "UpdateType": "delete", + "ShowConfirm": true, + "ConfirmText": "您确定要删除吗？", + "RowsToUpdate": 1, + "RowsToUpdateCondition": { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { "TableName": "任务成员表", - "UpdateType": "delete", - "ShowConfirm": true, - "ConfirmText": "您确定要删除吗？", - "RowsToUpdate": 1, - "RowsToUpdateCondition": { - "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", - "SubConditions": [ - { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "任务成员表", - "ColumnName": "任务ID", - "GUID": "17bed3eb-36f7-46c3-b030-c125facc33ec" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务ID" - } - }, - { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "任务成员表", - "ColumnName": "参与人", - "GUID": "a66e269f-657c-4cd7-b545-5b61dc9ed8c8" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=成员用户名" - } - } - ] - } + "ColumnName": "任务ID", + "GUID": "17bed3eb-36f7-46c3-b030-c125facc33ec" }, - { - "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", - "TableName": "项目动态", - "UpdateType": "add", - "ShowConfirm": false, - "UpdateBindingValues": [ - { - "BindingInfo": { - "TableName": "项目动态", - "ColumnName": "项目ID", - "GUID": "16af2943-b274-4526-a1a1-1d0b184df4e5" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务信息.项目ID" - } - }, - { - "BindingInfo": { - "TableName": "项目动态", - "ColumnName": "项目动态", - "GUID": "00834ae4-957a-482a-91f9-fdd15fef7b25" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=\"任务[\"&任务信息.任务名称&\"]将\"&成员全名&\"移除\"" - } - }, - { - "BindingInfo": { - "TableName": "项目动态", - "ColumnName": "执行人", - "GUID": "1b67fbcf-23b4-4e5b-a3a0-c9a49cb17903" - }, - "Value": "%CurrentUser%" - } - ] + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务ID" } - ] - }, - { - "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", - "ErrorCode": "0", - "Message": "移除成功" - } - ], - "ID": "ab21317f-2506-4fe8-a7ec-d09f9f61b041" + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务成员表", + "ColumnName": "参与人", + "GUID": "a66e269f-657c-4cd7-b545-5b61dc9ed8c8" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=成员用户名" + } + } + ] + } }, { - "CommandList": [ + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "项目动态", + "UpdateType": "add", + "ShowConfirm": false, + "UpdateBindingValues": [ { - "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", - "ErrorCode": "400", - "Message": "任务不存在" + "BindingInfo": { + "TableName": "项目动态", + "ColumnName": "项目ID", + "GUID": "ae633e9d-0f9e-44ce-b747-40c862d1d724" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务信息.项目ID" + } + }, + { + "BindingInfo": { + "TableName": "项目动态", + "ColumnName": "项目动态", + "GUID": "63a3c6b1-ee94-4a1d-b425-354ee5c13492" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=\"任务[\"&任务信息.任务名称&\"]将\"&成员全名&\"移除\"" + } + }, + { + "BindingInfo": { + "TableName": "项目动态", + "ColumnName": "执行人", + "GUID": "41d80804-ee0e-4f3e-8de1-449186002d68" + }, + "Value": "%CurrentUser%" } - ], - "ID": "e4ab9b0e-5575-4b8a-84af-d39b4b83a0cc" + ] } ] + }, + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "0", + "Message": "移除成功" } ], - "ID": "f7660baa-d639-445f-9930-b1e5f9302742" + "ID": "0f6d22da-338b-4926-932c-a486ef40a5f8" }, { "CommandList": [ { "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", "ErrorCode": "400", - "Message": "该成员存在报工记录，无法移除！" + "Message": "任务不存在" } ], - "ID": "2fb8372f-1918-45c1-b98a-ac005a8081f5" + "ID": "15636350-a0ee-41fe-8b53-615843115301" } ] } diff --git a/ServerCommands/工时/修改工时.json b/ServerCommands/工时/修改工时.json index f6440a68..57abb434 100644 --- a/ServerCommands/工时/修改工时.json +++ b/ServerCommands/工时/修改工时.json @@ -198,7 +198,7 @@ }, { "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "成员ID", + "ParamName": "执行人", "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=成员ID" diff --git a/ServerCommands/工时/新增工时.json b/ServerCommands/工时/新增工时.json index 3d23598d..48460919 100644 --- a/ServerCommands/工时/新增工时.json +++ b/ServerCommands/工时/新增工时.json @@ -43,7 +43,7 @@ "TestData": "2024-03-10" }, { - "Name": "成员ID", + "Name": "执行人", "DataValidationInfo": { "IgnoreBlank": false }, @@ -83,133 +83,6 @@ "$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": "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": "项目ID", - "GUID": "17b7e0ce-f6c5-4095-93e6-637aa62440a7", - "RelationBinding": { - "RelatedTable": "项目表", - "RelatedColumn": "ID", - "DisplayColumn": "工时核定方式" - } - }, - "ColumnName": "工时核定方式" - }, - { - "BindingInfo": { - "TableName": "任务表", - "ColumnName": "任务类型", - "GUID": "f6fb60c7-0ba6-450b-9cda-28eb2412e296", - "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": "65eeed85453c408b9c335f8ac4e85d28" - }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", "ParameterName": "任务成员", @@ -274,21 +147,38 @@ } ], "SqlCondition": { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "任务成员表", - "ColumnName": "ID", - "GUID": "c3e31a28-6692-46cf-a097-e63289906379" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=成员ID" - } + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务成员表", + "ColumnName": "任务ID", + "GUID": "7d139430-ab2a-40df-98d0-38bc039435e2" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务ID" + } + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务成员表", + "ColumnName": "参与人", + "GUID": "2b46a973-8db3-40e7-b10b-93ddb666b812" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=执行人" + } + } + ] }, "NullFormulaValueQueryPolicy": 0, "TopCount": "1" }, - "ID": "6ca889a1800540019e98e291149fc59b" + "ID": "28feaa57524d4b629c887584e8943b68" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -300,56 +190,164 @@ "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", "ParamObject": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=指定时薪单价" + "SerializeProperty": "=任务成员" } }, - "value": "%Null%" + "value": "%Null%", + "compareType": 1 }, "CommandList": [ { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "计算时薪", - "ParameterValue": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=IF(任务成员.任务默认时薪>0,任务成员.任务默认时薪,IF(任务成员.岗位默认时薪>0,任务成员.岗位默认时薪,IF(任务成员.参与人默认时薪>0,任务成员.参与人默认时薪,0)))" + "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": "项目ID", + "GUID": "17b7e0ce-f6c5-4095-93e6-637aa62440a7", + "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": "总实际工时" + } + ], + "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": "ce6cf79cab824510adc4dc16a3bcd8e4" - } - ], - "ID": "5e4f37e7-68da-4c37-b158-504dde3310cd" - }, - { - "CommandList": [ - { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "计算时薪", - "ParameterValue": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=指定时薪单价" - }, - "ID": "42acba22a57f436eabba47314ae73ffb" - } - ], - "ID": "ad856a50-2718-4e43-9e32-74739c0de1e6" - } - ] - }, - { - "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", - "ConditionAndCommandPairList": [ - { - "Condition": { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", - "ParamObject": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务信息.任务状态" - } + "ID": "fd009643b2374e2fbc54775cf4ebe137" }, - "value": "1" - }, - "CommandList": [ { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", "ConditionAndCommandPairList": [ @@ -360,7 +358,60 @@ "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", "ParamObject": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务信息.严格模式" + "SerializeProperty": "=指定时薪单价" + } + }, + "value": "%Null%" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "计算时薪", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=IF(任务成员.任务默认时薪>0,任务成员.任务默认时薪,IF(任务成员.岗位默认时薪>0,任务成员.岗位默认时薪,IF(任务成员.参与人默认时薪>0,任务成员.参与人默认时薪,0)))" + }, + "ID": "03fde63189d94667ae6d5c6a1979a5bb" + } + ], + "ID": "1be0fa3d-4226-478b-9916-63423673dea2" + }, + { + "CommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "计算时薪", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=指定时薪单价" + }, + "ID": "6fc649ddfae843caa1f555278ace195d" + } + ], + "ID": "ae194b64-06f0-4113-8c61-89b159094f8a" + } + ] + }, + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "预测本次产生成本", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目统计信息.总成本+(计算时薪*工时数*任务信息.提成系数)" + }, + "ID": "1663c0564426454cb4d8f6337bec5d02" + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务信息.任务状态" } }, "value": "1" @@ -376,65 +427,12 @@ "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", "ParamObject": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=工时类型" + "SerializeProperty": "=任务信息.严格模式" } }, - "value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务信息.工时核定方式" - } + "value": "1" }, "CommandList": [ - { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "总统计工时", - "TableValue": { - "TableName": "任务工时表", - "OnlyGetValue": true, - "TableValueType": 0, - "BindingInfos": [ - { - "BindingInfo": { - "TableName": "任务工时表", - "ColumnName": "总工时", - "GUID": "0e13d951-a44b-40e4-8ab7-50409bfa7785" - }, - "ColumnName": "总工时" - } - ], - "SqlCondition": { - "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", - "SubConditions": [ - { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "任务工时表", - "ColumnName": "ID", - "GUID": "574064e4-3b8f-49d2-a025-1f94902658b5" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务ID" - } - }, - { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "任务工时表", - "ColumnName": "工时类型", - "GUID": "57c95084-14b9-46ba-86f0-c80a7b6a1126" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务信息.工时核定方式" - } - } - ] - } - }, - "ID": "fecda59716454e74ae70599e1629520a", - "Comments": "检查工时是否超支" - }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", "ConditionAndCommandPairList": [ @@ -445,464 +443,291 @@ "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", "ParamObject": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=总统计工时+工时数" + "SerializeProperty": "=工时类型" } }, "value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务信息.项目预算工时" - }, - "compareType": 2 + "SerializeProperty": "=任务信息.工时核定方式" + } }, "CommandList": [ { - "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", - "ErrorCode": "400", - "Message": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=\"计划工时总时长(\"&工时数&\"h)超过项目预算工时时长(\"&任务信息.项目预算工时&\"h)，请修改后提交！\"" - } + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "项目统计信息", + "TableValue": { + "TableName": "View_项目统计信息", + "TableValueType": 1, + "BindingInfos": [ + { + "BindingInfo": { + "TableName": "View_项目统计信息", + "ColumnName": "项目预算费用", + "GUID": "1f23c586-e318-41f8-9e2c-f9fc47949199" + }, + "ColumnName": "项目预算费用" + }, + { + "BindingInfo": { + "TableName": "View_项目统计信息", + "ColumnName": "总成本", + "GUID": "7c3a493f-d2ac-49b3-957f-7a772d5138bf" + }, + "ColumnName": "总成本" + }, + { + "BindingInfo": { + "TableName": "View_项目统计信息", + "ColumnName": "项目预算工时", + "GUID": "45110ee2-aa57-4a49-bea6-a94586f164ba" + }, + "ColumnName": "项目预算工时" + }, + { + "BindingInfo": { + "TableName": "View_项目统计信息", + "ColumnName": "总核定工时", + "GUID": "a4773f83-2817-4be0-9e7d-4b5b3cd36ed5" + }, + "ColumnName": "总核定工时" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "View_项目统计信息", + "ColumnName": "项目ID", + "GUID": "0aa2d908-82fb-4233-a1e8-eb5a36cecaa2" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务信息.项目ID" + } + }, + "TopCount": "1" + }, + "ID": "9a972b19262c4b819a666d6c442c6d6b", + "Comments": "从视图统计项目的信息" + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目统计信息.总核定工时+工时数" + } + }, + "value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目统计信息.项目预算工时" + }, + "compareType": 2 + }, + "CommandList": [ + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "400", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=\"计划工时总时长(\"&工时数&\"h)超过项目预算工时时长(\"&项目统计信息.项目预算工时&\"h)，请修改后提交！\"" + } + } + ], + "Comments": "如果加上本次提交的工时>预算的工时，则拦截", + "ID": "18583b21-d2a0-428e-996a-3cfc62fd4887" + }, + { + "Condition": { + "$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 + }, + "CommandList": [ + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "400", + "Message": "预算超过项目限制，请申请预算后再尝试提交！" + } + ], + "Comments": "先算出本次提交产生的成本，如果>预算的费用，则拦截", + "ID": "d4cd3b02-8a6f-41dc-bf86-9773da9f0fb4" + }, + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务信息.任务预算工时" + } + }, + "value": "0", + "compareType": 2 + }, + "CommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "任务统计信息", + "TableValue": { + "TableName": "View_任务工时统计", + "TableValueType": 1, + "BindingInfos": [ + { + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "总核定工时", + "GUID": "30e9fee2-cc98-4ce8-954a-4694deb3225d" + }, + "ColumnName": "总核定工时" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "任务ID", + "GUID": "4ef81414-5f02-4242-a14a-3c0762e72e33" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务ID" + } + } + }, + "ID": "9d97ee1dd7d0410b9602c3373d41759c" + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务统计信息.总核定工时+工时数" + } + }, + "value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务信息.任务预算工时" + }, + "compareType": 2 + }, + "CommandList": [ + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "400", + "Message": "此次报工超过任务工时限制，请修改后提交！" + } + ], + "Comments": "如果任务当前工时+本次报工工时大于预算，则拦截", + "ID": "c3edd061-47b0-48f1-924e-f0b3a7250f6a" + } + ] + } + ], + "Comments": "如果上面两条项目都没超标，就检查是否设置了任务预算工时。", + "ID": "b3bfc6b0-689a-45a4-99ca-7b07d8b03653" + } + ] } ], - "ID": "280489d7-50c5-4b70-ae88-430315e96eca" - } - ] - }, - { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "计划消耗列表", - "TableValue": { - "TableName": "任务工时表", - "BindingInfos": [ - { - "BindingInfo": { - "TableName": "任务工时表", - "ColumnName": "成员ID", - "GUID": "43c04868-12c7-4e9d-b126-070d0e426dc6", - "RelationBinding": { - "RelatedTable": "任务成员表", - "RelatedColumn": "ID", - "DisplayColumn": "参与人" - } - }, - "ColumnName": "参与人" - }, - { - "BindingInfo": { - "TableName": "任务工时表", - "ColumnName": "成员ID", - "GUID": "2a0d738b-1e15-4fc1-835f-1a191e17f002", - "RelationBinding": { - "RelatedTable": "任务成员表", - "RelatedColumn": "ID", - "DisplayColumn": "任务时薪" - } - }, - "ColumnName": "任务时薪" - }, - { - "BindingInfo": { - "TableName": "任务工时表", - "ColumnName": "总工时", - "GUID": "366dc09c-6a7e-4c9c-9bae-48e1d9eab780" - }, - "ColumnName": "总工时" - } - ], - "SqlCondition": { - "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", - "SubConditions": [ - { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "任务工时表", - "ColumnName": "ID", - "GUID": "f9e17555-63a1-4c0f-8b80-06b4297cbbb5" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务ID" - } - }, - { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "任务工时表", - "ColumnName": "工时类型", - "GUID": "9512823f-431d-4f44-9cab-ba2d773d3a44" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务信息.工时核定方式" - } - } - ] - }, - "NullFormulaValueQueryPolicy": 0 - }, - "ID": "bae0ed2a25ca4484be3ddf991fcda719", - "Comments": "检查预算是否超支" - }, - { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "总消耗金额", - "ParameterValue": "0", - "ID": "04a622af684046f7adf496cc660cde6f" - }, - { - "$type": "Forguncy.Model.LoopCommand, ServerDesignerCommon", - "LoopInfo": { - "$type": "Forguncy.Model.CountLoopInfo, ServerDesignerCommon", - "LoopCount": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=计划消耗列表" - }, - "LoopItemParamName": "Item" - }, - "CommandList": [ - { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "总消耗金额", - "ParameterValue": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=总消耗金额+(Item.任务时薪*Item.总工时)" - }, - "ID": "cde704fd082f4796baeda7390f2f1be0" - } - ] - }, - { - "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", - "ConditionAndCommandPairList": [ - { - "Condition": { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", - "ParamObject": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=总消耗金额" - } - }, - "value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务信息.项目预算费用" - }, - "compareType": 2 - }, - "CommandList": [ - { - "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", - "ErrorCode": "400", - "Message": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=\"计划工时总预算超过项目预算金额(\"&任务信息.项目预算费用&\"元)，请修改后提交！\"" - } - } - ], - "ID": "4d8bf5b9-6b77-49d6-b683-e8f5a8f415da" + "Comments": "如果提交的工时类型等于项目工时的核定方式", + "ID": "5c34c921-a5f1-434e-a589-050799038608" } ] } ], - "Comments": "如果提交的工时类型等于项目工时的核定方式", - "ID": "6cc0e897-9692-457d-9628-93bbe7890afc" + "Comments": "严格模式下，需要校验工时和费用是否超标", + "ID": "dae3bbb7-7b4e-48d3-8b08-fecf28a357c1" } ] - } - ], - "ID": "14cdf349-de7b-49de-9e4f-0bec56189e2d" - } - ] - }, - { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "待分配工时", - "ParameterValue": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=工时数" - }, - "ID": "c47706cfdef74a61943d8b52147e01e3" - }, - { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "分配天数", - "ParameterValue": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=DATEDIF(开始日期,结束日期,\"d\")+1" - }, - "ID": "e9869319ddf04a8395ae0b9cb8c5d2c4" - }, - { - "$type": "Forguncy.Model.ServerTransactionCommand, ServerDesignerCommon", - "CommandList": [ - { - "$type": "Forguncy.Model.LoopCommand, ServerDesignerCommon", - "LoopInfo": { - "$type": "Forguncy.Model.CountLoopInfo, ServerDesignerCommon", - "LoopCount": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=分配天数" }, - "LoopIndexParamName": "index", - "LoopItemParamName": "Item" - }, - "CommandList": [ { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "当前日期", + "ParameterName": "待分配工时", "ParameterValue": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=开始日期+(index-1)" + "SerializeProperty": "=工时数" }, - "ID": "6e7b4d4141a24bac944dedf38ee89b94" + "ID": "9fa5a1b21c574f1a8b59a42611442fd7" }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "统计工时", - "TableValue": { - "TableName": "任务工时表", - "TableValueType": 1, - "BindingInfos": [ - { - "BindingInfo": { - "TableName": "任务工时表", - "ColumnName": "总工时", - "GUID": "a0006a9d-3fba-4cf5-a20a-d2a0909d5175" - }, - "ColumnName": "总工时" - } - ], - "SqlCondition": { - "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", - "SubConditions": [ - { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "任务工时表", - "ColumnName": "工时日期", - "GUID": "98f3f236-67bc-4db2-9af7-407e52bdcd74" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=当前日期" - } - }, - { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "任务工时表", - "ColumnName": "执行人", - "GUID": "9a1d5408-9353-4ab0-bef4-91af355df584" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=成员ID" - } - }, - { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "任务工时表", - "ColumnName": "工时类型", - "GUID": "6fae6e04-e2b8-4d6c-b594-3bd02c5883d2" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=工时类型" - } - } - ] - }, - "NullFormulaValueQueryPolicy": 0 + "ParameterName": "分配天数", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=DATEDIF(开始日期,结束日期,\"d\")+1" }, - "ID": "2292424aae1d4f5591ddd78ce5ac22ab" + "ID": "e9869319ddf04a8395ae0b9cb8c5d2c4" }, { - "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", - "ConditionAndCommandPairList": [ + "$type": "Forguncy.Model.ServerTransactionCommand, ServerDesignerCommon", + "CommandList": [ { - "Condition": { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", - "ParamObject": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=index" - } - }, - "value": { + "$type": "Forguncy.Model.LoopCommand, ServerDesignerCommon", + "LoopInfo": { + "$type": "Forguncy.Model.CountLoopInfo, ServerDesignerCommon", + "LoopCount": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=分配天数" }, - "compareType": 4 + "LoopIndexParamName": "index", + "LoopItemParamName": "Item" }, "CommandList": [ { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "计算本次分配工时", + "ParameterName": "当前日期", "ParameterValue": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=ROUNDUP(工时数/分配天数,1)" + "SerializeProperty": "=开始日期+(index-1)" }, - "ID": "44b51db4c6be470dbc468d4a9abfa061" - } - ], - "ID": "d3def141-eff7-41db-9f93-544d9b935b2a" - }, - { - "CommandList": [ + "ID": "579061b5cf414774a2af1aaa9c04b29b" + }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "计算本次分配工时", - "ParameterValue": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=ROUNDUP(待分配工时,1)" - }, - "ID": "de7c26c08e4e4086bfa6f4d8dbcaa4fe" - } - ], - "ID": "f77ff10b-6ba5-4900-b43a-3d022ebf6b35" - } - ] - }, - { - "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", - "ConditionAndCommandPairList": [ - { - "Condition": { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", - "ParamObject": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=工时类型" - } - }, - "value": "计划" - }, - "CommandList": [ - { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "执行人负荷", - "ParameterValue": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=IF(OR(任务成员.参与人负荷=\"\",任务成员.参与人负荷=0,任务成员.参与人负荷>24),24,任务成员.参与人负荷)" - }, - "ID": "03f94c6a676740b799eddd0aafce2fe5" - } - ], - "ID": "8470a624-72fe-42e2-9c23-508d5dbce61f" - }, - { - "Condition": { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", - "ParamObject": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=工时类型" - } - }, - "value": "实际" - }, - "CommandList": [ - { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "执行人负荷", - "ParameterValue": "24", - "ID": "f998993f4e8f4778a448ca19dc771a2b" - } - ], - "ID": "3ea6a35e-aca0-4da0-96a2-827961614cda" - } - ] - }, - { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "预计增加后工时", - "ParameterValue": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=IF(统计工时.总工时=\"\",0,统计工时.总工时)+计算本次分配工时" - }, - "ID": "36354abf29e44a4e9790b6db43c12fa9" - }, - { - "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", - "ConditionAndCommandPairList": [ - { - "Condition": { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", - "ParamObject": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=预计增加后工时" - } - }, - "value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=执行人负荷" - }, - "compareType": 5 - }, - "CommandList": [ - { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "待分配工时", - "ParameterValue": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=ROUNDUP(待分配工时-计算本次分配工时,1)" - }, - "ID": "8e34730a7bb547b880d26b1e4d60fc06" - }, - { - "$type": "Forguncy.Model.ServerTransactionCommand, ServerDesignerCommon", - "CommandList": [ - { - "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", - "TableName": "任务工时表", - "UpdateType": "add", - "ShowConfirm": false, - "UpdateBindingValues": [ - { - "BindingInfo": { - "TableName": "任务工时表", - "ColumnName": "成员ID", - "GUID": "8266eb64-4b8a-4afd-9759-13f1f82196ce" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=成员ID" - } + "ParameterName": "统计工时", + "TableValue": { + "TableName": "任务工时表", + "TableValueType": 1, + "BindingInfos": [ + { + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "总工时", + "GUID": "a0006a9d-3fba-4cf5-a20a-d2a0909d5175" }, + "ColumnName": "总工时" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ { - "BindingInfo": { - "TableName": "任务工时表", - "ColumnName": "项目ID", - "GUID": "ee34836d-306f-42a0-bde4-0a2bc7694a53" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务信息.项目ID" - } - }, - { - "BindingInfo": { - "TableName": "任务工时表", - "ColumnName": "任务ID", - "GUID": "a67924a7-4ca8-4222-9e98-ca876183acd0" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务ID" - } - }, - { - "BindingInfo": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { "TableName": "任务工时表", "ColumnName": "工时日期", - "GUID": "ff819755-816a-43ad-aead-2d444ab8aa54" + "GUID": "98f3f236-67bc-4db2-9af7-407e52bdcd74" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -910,155 +735,380 @@ } }, { - "BindingInfo": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务工时表", + "ColumnName": "执行人", + "GUID": "9a1d5408-9353-4ab0-bef4-91af355df584" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=执行人" + } + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { "TableName": "任务工时表", "ColumnName": "工时类型", - "GUID": "f00ff5d6-4fcc-4e2c-88e7-f819d60b9cdb" + "GUID": "6fae6e04-e2b8-4d6c-b594-3bd02c5883d2" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=工时类型" } - }, - { - "BindingInfo": { - "TableName": "任务工时表", - "ColumnName": "执行人", - "GUID": "01ab262b-fbde-4b83-821e-2f15525cca71" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务成员.参与人" - } - }, - { - "BindingInfo": { - "TableName": "任务工时表", - "ColumnName": "执行内容", - "GUID": "056d35e2-7717-4c08-8d4e-e490f094a187" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=进展内容" - } - }, - { - "BindingInfo": { - "TableName": "任务工时表", - "ColumnName": "工时", - "GUID": "b05891a8-766c-4818-9a2e-25c84c0b091e" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=计算本次分配工时" - } - }, - { - "BindingInfo": { - "TableName": "任务工时表", - "ColumnName": "时薪单价", - "GUID": "249e9008-82d0-488e-81b0-bf68cf697e06" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=计算时薪" - } - }, - { - "BindingInfo": { - "TableName": "任务工时表", - "ColumnName": "提成系数", - "GUID": "977fd2b4-c778-44f7-911f-ee60bbcd4f45" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务信息.提成系数" - } } ] }, + "NullFormulaValueQueryPolicy": 0 + }, + "ID": "fbb132d33b854e1aaf0d772bc3a8dbef" + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ { - "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", - "TableName": "项目动态", - "UpdateType": "add", - "ShowConfirm": false, - "UpdateBindingValues": [ - { - "BindingInfo": { - "TableName": "项目动态", - "ColumnName": "项目ID", - "GUID": "1dce04a1-51d2-410b-9115-53e1589784cb" - }, - "Value": { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务信息.项目ID" + "SerializeProperty": "=index" } }, - { - "BindingInfo": { - "TableName": "项目动态", - "ColumnName": "项目动态", - "GUID": "21b4a9e2-8067-4aec-9dc9-8fcbfa5eef37" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=\"任务[\"&任务信息.任务名称&\"]增加\"&工时类型&\"工时\"&工时数&\"小时\"" - } + "value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=分配天数" }, + "compareType": 4 + }, + "CommandList": [ { - "BindingInfo": { - "TableName": "项目动态", - "ColumnName": "执行人", - "GUID": "786a9666-0199-4ef9-a809-a706cc48c49a" + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "计算本次分配工时", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=ROUNDUP(工时数/分配天数,1)" }, - "Value": "%CurrentUser%" + "ID": "44b51db4c6be470dbc468d4a9abfa061" } - ] + ], + "ID": "6bdf772f-22a4-4f5b-b055-9f6536541fd0" + }, + { + "CommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "计算本次分配工时", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=ROUNDUP(待分配工时,1)" + }, + "ID": "de7c26c08e4e4086bfa6f4d8dbcaa4fe" + } + ], + "ID": "69e6f7b6-a80f-4d1e-907c-e6a189bd95f7" + } + ] + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=工时类型" + } + }, + "value": "计划" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "执行人负荷", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=IF(OR(任务成员.参与人负荷=\"\",任务成员.参与人负荷=0,任务成员.参与人负荷>24),24,任务成员.参与人负荷)" + }, + "ID": "03f94c6a676740b799eddd0aafce2fe5" + } + ], + "ID": "cd001833-22d4-4525-bcf3-0692f8a4164f" + }, + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=工时类型" + } + }, + "value": "实际" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "执行人负荷", + "ParameterValue": "24", + "ID": "f998993f4e8f4778a448ca19dc771a2b" + } + ], + "ID": "2c656595-72a8-4019-b45a-26b2f75d103c" + } + ] + }, + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "预计增加后工时", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=IF(统计工时.总工时=\"\",0,统计工时.总工时)+计算本次分配工时" + }, + "ID": "36354abf29e44a4e9790b6db43c12fa9" + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=预计增加后工时" + } + }, + "value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=执行人负荷" + }, + "compareType": 5 + }, + "CommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "待分配工时", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=ROUNDUP(待分配工时-计算本次分配工时,1)" + }, + "ID": "8e34730a7bb547b880d26b1e4d60fc06" + }, + { + "$type": "Forguncy.Model.ServerTransactionCommand, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "任务工时表", + "UpdateType": "add", + "ShowConfirm": false, + "UpdateBindingValues": [ + { + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "项目ID", + "GUID": "48030a9d-d571-48e1-ba20-5a07fde2d76d" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务信息.项目ID" + } + }, + { + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "任务ID", + "GUID": "f560a7a1-56da-43f4-81ed-4fcbd46e74b0" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务ID" + } + }, + { + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "工时日期", + "GUID": "f75337d0-3045-47db-b89f-91e723bb678b" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=当前日期" + } + }, + { + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "工时类型", + "GUID": "5eaa88d9-791e-429d-b63a-a33127b143d6" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=工时类型" + } + }, + { + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "执行人", + "GUID": "c0a03cd6-8949-45ab-b55a-112f8350a866" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务成员.参与人" + } + }, + { + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "执行内容", + "GUID": "7a34035c-a6c0-4c86-9ee2-ffce0a7ecd21" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=进展内容" + } + }, + { + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "工时", + "GUID": "26d2cda5-0221-4f00-bbf3-af07b8a1fa39" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=计算本次分配工时" + } + }, + { + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "时薪单价", + "GUID": "59ceb364-5bae-44c0-8ad5-c6a86452cb45" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=计算时薪" + } + }, + { + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "提成系数", + "GUID": "f8051ee9-3d0a-4ca2-930b-118a5f359c71" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务信息.提成系数" + } + } + ] + }, + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "项目动态", + "UpdateType": "add", + "ShowConfirm": false, + "UpdateBindingValues": [ + { + "BindingInfo": { + "TableName": "项目动态", + "ColumnName": "项目ID", + "GUID": "93679277-9641-47dd-819f-ac3571a21ae5" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务信息.项目ID" + } + }, + { + "BindingInfo": { + "TableName": "项目动态", + "ColumnName": "项目动态", + "GUID": "8f465c29-ba82-4212-bd94-bfe43ac0fa42" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=\"任务[\"&任务信息.任务名称&\"]增加\"&工时类型&\"工时\"&工时数&\"小时\"" + } + }, + { + "BindingInfo": { + "TableName": "项目动态", + "ColumnName": "执行人", + "GUID": "a754f2cb-3bfd-439f-99fc-ace8f8510b11" + }, + "Value": "%CurrentUser%" + } + ] + } + ] + } + ], + "ID": "dfad8684-4662-48c9-a44b-d8c82d1ce252" + }, + { + "CommandList": [ + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "400", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=TEXT(当前日期,\"yyyy年mm月dd\")&\"的最大工作负荷超出限制的\"&执行人负荷&\"小时，请重新提交！\"" + } + } + ], + "ID": "f238fec4-27aa-4f24-b2b6-3096a1e12d58" } ] } - ], - "ID": "e65c0886-121e-4277-9459-a00b33d9ab8f" - }, - { - "CommandList": [ - { - "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", - "ErrorCode": "400", - "Message": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=TEXT(当前日期,\"yyyy年mm月dd\")&\"的最大工作负荷超出限制的\"&执行人负荷&\"小时，请重新提交！\"" - } - } - ], - "ID": "048b4b2c-8173-4467-ad18-5dce727bf6c9" + ] } ] + }, + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "0", + "Message": "提交工时成功" } - ] + ], + "ID": "70d852be-8d93-43a3-a7b5-edcab6981caf" + }, + { + "CommandList": [ + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "400", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=\"当前任务状态为[\"&任务信息.任务状态文本&\"]，无法提交工时！\"" + } + } + ], + "ID": "01558a83-dd2d-4cfe-90af-5bf8d94845be" } ] - }, - { - "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", - "ErrorCode": "0", - "Message": "提交工时成功" } ], - "ID": "35a1fea2-2a6d-4ee5-b820-0f4a72042b94" + "ID": "82029e6a-99c0-49a5-9646-0fc534133b8b" }, { "CommandList": [ { "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", "ErrorCode": "400", - "Message": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=\"当前任务状态为[\"&任务信息.任务状态文本&\"]，无法提交工时！\"" - } + "Message": "成员不在任务内，无法报工！" } ], - "ID": "69b99b00-b9f6-48e1-b362-1376f6b0c7d2" + "ID": "58aede58-95c2-47ac-a465-d08f0a32da5c" } ] } diff --git a/ServerCommands/用户/更新用户配置.json b/ServerCommands/用户/更新用户配置.json new file mode 100644 index 00000000..f4206732 --- /dev/null +++ b/ServerCommands/用户/更新用户配置.json @@ -0,0 +1,145 @@ +{ + "Name": "更新用户配置", + "Enabled": true, + "Triggers": [ + { + "$type": "Forguncy.SaveLoad.PostRequestTriggerSaveData, ServerDesignerCommon", + "Permission": { + "PermissionData": { + "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionData, Forguncy.RbacPermission.Core", + "permissionResource": { + "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionResource, Forguncy.RbacPermission.Core" + }, + "permissionBindings": [ + { + "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionBinding, Forguncy.RbacPermission.Core", + "roleNames": [ + "FGC_LoginUser" + ] + } + ] + } + }, + "Parameters": [ + { + "Name": "用户名", + "DataValidationInfo": { + "IgnoreBlank": false + } + }, + { + "Name": "负荷", + "DataValidationInfo": {} + }, + { + "Name": "默认时薪", + "DataValidationInfo": {} + } + ] + } + ], + "Commands": [ + { + "$type": "Forguncy.Model.CatchExceptionCommand, ServerDesignerCommon", + "TryCommandPart": { + "CommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "用户", + "TableValue": { + "TableName": "用户信息视图", + "TableValueType": 1, + "BindingInfos": [ + { + "BindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "邮件", + "GUID": "62e678a5-f9ee-410d-bd98-e5a95556d6ed" + }, + "ColumnName": "邮件" + }, + { + "BindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "全名", + "GUID": "2226f68b-3c3c-4d6c-a5eb-aac00b02c951" + }, + "ColumnName": "全名" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "用户名", + "GUID": "e7c9e67f-4354-448f-a5b8-0df81d27d6be" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=用户名" + } + }, + "TopCount": "1" + }, + "ID": "4d7d73e4d30f4a8eb1017158c0e2adac" + }, + { + "$type": "UserManagementCommandsV2.UserManagementCommand, UserManagementCommandsV2", + "OperationType": "202", + "CommandOperator": { + "$type": "UserManagementCommandsV2.UpdateUserOperator, UserManagementCommandsV2", + "UserName": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=用户名" + }, + "FullName": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=用户.全名" + }, + "Email": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=用户.邮件" + }, + "ExtendedProperties": [ + { + "Name": "负荷", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=负荷" + } + }, + { + "Name": "默认时薪", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=默认时薪" + } + } + ] + } + }, + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "0", + "Message": "保存成功" + } + ] + }, + "CatchCommandPart": { + "CommandList": [ + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=ExceptionCode" + }, + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=ExceptionMessage" + } + } + ] + } + } + ] +} \ No newline at end of file diff --git a/ServerCommands/项目/同步项目成员.json b/ServerCommands/项目/同步项目成员.json index dcc4b578..be8a1f0a 100644 --- a/ServerCommands/项目/同步项目成员.json +++ b/ServerCommands/项目/同步项目成员.json @@ -84,7 +84,7 @@ } } }, - "ID": "26c5cca1321e4452a0571822eda70f9d" + "ID": "5a0ad3f6027f47d6b62484d516aa2e03" }, { "$type": "Forguncy.Model.LoopCommand, ServerDesignerCommon", @@ -205,11 +205,12 @@ ] } ], - "ID": "747cdcdd-8f33-49f2-bac1-c05fc36b2602" + "ID": "afcc2411-1b9d-4211-9b98-d668eb09da45" } ] } - ] + ], + "Comments": "查找任务成员表里的成员" }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", @@ -247,7 +248,8 @@ } } }, - "ID": "b61a6630f13f4d60a260243f7ba8d01e" + "ID": "e06003e76e034598b3a4059476852ba3", + "Disabled": true }, { "$type": "Forguncy.Model.LoopCommand, ServerDesignerCommon", @@ -340,11 +342,13 @@ } } ], - "ID": "472d8e9e-a7a8-4def-bdbd-c74cb220ddd4" + "ID": "09ec1c75-f0a0-4ffa-a4b0-a5049f63561c" } ] } - ] + ], + "Comments": "将多余的项目成员剔除", + "Disabled": true }, { "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", diff --git a/ServerCommands/项目/移除项目成员.json b/ServerCommands/项目/移除项目成员.json new file mode 100644 index 00000000..d0d6bb43 --- /dev/null +++ b/ServerCommands/项目/移除项目成员.json @@ -0,0 +1,215 @@ +{ + "Name": "移除项目成员", + "Enabled": true, + "Triggers": [ + { + "$type": "Forguncy.SaveLoad.PostRequestTriggerSaveData, ServerDesignerCommon", + "Permission": { + "PermissionData": { + "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionData, Forguncy.RbacPermission.Core", + "permissionResource": { + "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionResource, Forguncy.RbacPermission.Core" + }, + "permissionBindings": [ + { + "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionBinding, Forguncy.RbacPermission.Core", + "roleNames": [ + "FGC_LoginUser" + ] + } + ] + } + }, + "Parameters": [ + { + "Name": "项目ID", + "DataValidationInfo": { + "IgnoreBlank": false + } + }, + { + "Name": "成员用户名", + "DataValidationInfo": { + "IgnoreBlank": false + } + } + ] + } + ], + "Commands": [ + { + "$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": "cb481729-447b-4d73-9329-6985ed0428e8" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目ID" + } + }, + { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务成员表", + "ColumnName": "参与人", + "GUID": "51726e62-6255-4e23-9bb4-498d1b063d3f" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=成员用户名" + }, + "LeftBracket": 1 + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务成员表", + "ColumnName": "任务ID", + "GUID": "463af416-af9e-43ba-91cd-5b3f7771b538", + "RelationBinding": { + "RelatedTable": "任务表", + "RelatedColumn": "ID", + "DisplayColumn": "执行者" + } + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=成员用户名" + }, + "RightBracket": 1 + } + ], + "RelationType": 1 + } + ] + } + }, + "ID": "2cffba6c6bea4272bc627c5f7455e410" + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=是否参与任务" + } + }, + "value": "0" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "项目成员表", + "UpdateType": "delete", + "ShowConfirm": true, + "ConfirmText": "您确定要删除吗？", + "RowsToUpdate": 1, + "RowsToUpdateCondition": { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "项目成员表", + "ColumnName": "ID", + "GUID": "442c8862-a026-4267-9d73-bce2152a982d" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目ID" + } + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "项目成员表", + "ColumnName": "ID", + "GUID": "fb204421-bf1a-4021-9b8b-1237c01a1fa7" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=成员用户名" + } + } + ] + } + }, + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "项目动态", + "UpdateType": "add", + "ShowConfirm": false, + "UpdateBindingValues": [ + { + "BindingInfo": { + "TableName": "项目动态", + "ColumnName": "项目ID", + "GUID": "1136590a-6f78-4586-8611-9c3a0ee7b2a2" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目ID" + } + }, + { + "BindingInfo": { + "TableName": "项目动态", + "ColumnName": "项目动态", + "GUID": "54034bbd-5b74-4ea9-9411-1b4646b2b513" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=\"将成员\"&成员用户名&\"从项目里移出\"" + } + }, + { + "BindingInfo": { + "TableName": "项目动态", + "ColumnName": "执行人", + "GUID": "60fa8f7a-e378-431e-b287-01e5b8f9a1bf" + }, + "Value": "%CurrentUser%" + } + ] + }, + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "0", + "Message": "删除成功" + } + ], + "ID": "c893eeab-d955-4c20-9127-4a65b34bdfda" + }, + { + "CommandList": [ + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "400", + "Message": "该成员已参与到具体任务，请先从任务中剔除后再进行删除！" + } + ], + "ID": "0cfa5973-d6d6-4c62-9e7f-b6d92248dd52" + } + ] + } + ] +} \ No newline at end of file diff --git a/Tables/任务/任务成员表.json b/Tables/任务/任务成员表.json index 76a824e8..296270b3 100644 --- a/Tables/任务/任务成员表.json +++ b/Tables/任务/任务成员表.json @@ -11,6 +11,13 @@ "Name": "ID", "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "DatabaseColumnType": "bigint", + "MaxLength": -1, + "Name": "项目ID", + "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, { "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", "DatabaseColumnType": "bigint", @@ -84,6 +91,13 @@ "ForeignTable": "任务成员表", "ForeignColumn": "岗位ID", "IsDetailTableRelation": true + }, + { + "PrimaryTable": "项目表", + "PrimaryColumn": "ID", + "ForeignTable": "任务成员表", + "ForeignColumn": "项目ID", + "IsDetailTableRelation": true } ], "Indexes": [] diff --git a/Tables/任务/任务表.json b/Tables/任务/任务表.json index bb3b2e25..82d57b1a 100644 --- a/Tables/任务/任务表.json +++ b/Tables/任务/任务表.json @@ -197,6 +197,19 @@ "Name": "开始报工日期", "ColumnType": "System.DateTime, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, + { + "$type": "Forguncy.SaveLoad.StatisticColumnSaveData, ServerDesignerCommon", + "BindingInfo": { + "TableName": "任务成员表", + "ColumnName": "参与人", + "GUID": "b5f07f2a-ddac-4747-84cd-bbdef039f1c1" + }, + "AggregateFunction": 5, + "DataColumnName": "参与人", + "DetailTableName": "任务成员表", + "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", diff --git a/Tables/工时/View_任务工时统计.json b/Tables/工时/View_任务工时统计.json index e1e2156b..30805da1 100644 --- a/Tables/工时/View_任务工时统计.json +++ b/Tables/工时/View_任务工时统计.json @@ -43,6 +43,14 @@ "Name": "实际工时", "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "Required": true, + "DatabaseColumnType": "float", + "MaxLength": -1, + "Name": "核定工时", + "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, { "$type": "Forguncy.SaveLoad.StatisticColumnSaveData, ServerDesignerCommon", "AggregateFunction": 4, @@ -56,6 +64,18 @@ "DataColumnName": "实际工时", "Name": "总实际工时", "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.SaveLoad.StatisticColumnSaveData, ServerDesignerCommon", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "核定工时", + "GUID": "6a8d98f3-25ad-4c5b-9a82-e032d9ae9638" + }, + "AggregateFunction": 4, + "DataColumnName": "核定工时", + "Name": "总核定工时", + "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" } ], "ExternalDatabaseInfo": { @@ -63,7 +83,7 @@ "ConnectionId": "业务表", "SourceTableName": "View_任务工时统计", "SourceTableSchema": "dbo", - "CreateViewSql": "SELECT \r\n [项目ID],\r\n [任务ID],\r\n [执行人],\r\n [工时日期],\r\n SUM(CASE WHEN [工时类型] = '计划' THEN [工时] ELSE 0 END) AS [计划工时],\r\n SUM(CASE WHEN [工时类型] = '实际' THEN [工时] ELSE 0 END) AS [实际工时]\r\nFROM \r\n [dbo].[任务工时表]\r\nGROUP BY \r\n [项目ID],\r\n [任务ID],\r\n [执行人],\r\n [工时日期];", + "CreateViewSql": "SELECT \r\n [项目ID],\r\n [任务ID],\r\n [执行人],\r\n [工时日期],\r\n SUM(CASE WHEN [工时类型] = '计划' THEN [工时] ELSE 0 END) AS [计划工时],\r\n SUM(CASE WHEN [工时类型] = '实际' THEN [工时] ELSE 0 END) AS [实际工时],\r\n\t(CASE p.[工时核定方式]\r\n\tWHEN '计划' THEN ISNULL(SUM(CASE WHEN [工时类型] = '计划' THEN [工时] ELSE 0 END), 0)\r\n\tELSE ISNULL(SUM(CASE WHEN [工时类型] = '计划' THEN [工时] ELSE 0 END), 0)\r\nEND) as 核定工时\r\nFROM \r\n [dbo].[任务工时表] t\r\nLEFT JOIN [项目表] p ON t.项目ID = p.ID\r\nGROUP BY \r\n [项目ID],\r\n\t[工时核定方式],\r\n [任务ID],\r\n [执行人],\r\n [工时日期];", "ViewInfo": { "ViewName": "View_任务工时统计", "IsUpdatable": true, diff --git a/Tables/工时/任务工时表.json b/Tables/工时/任务工时表.json index 607b1e53..09adde5b 100644 --- a/Tables/工时/任务工时表.json +++ b/Tables/工时/任务工时表.json @@ -48,16 +48,16 @@ }, { "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", - "DatabaseColumnType": "bigint", + "DatabaseColumnType": "nvarchar", "MaxLength": -1, - "Name": "成员ID", - "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + "Name": "执行内容", + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, { "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", "DatabaseColumnType": "nvarchar", "MaxLength": -1, - "Name": "执行内容", + "Name": "时薪来源", "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, { @@ -152,13 +152,6 @@ "ForeignTable": "任务工时表", "ForeignColumn": "任务ID", "IsDetailTableRelation": true - }, - { - "PrimaryTable": "任务成员表", - "PrimaryColumn": "ID", - "ForeignTable": "任务工时表", - "ForeignColumn": "成员ID", - "IsDetailTableRelation": true } ], "Indexes": [] diff --git a/Tables/项目任务/View_项目统计信息.json b/Tables/项目/View_项目统计信息.json similarity index 84% rename from Tables/项目任务/View_项目统计信息.json rename to Tables/项目/View_项目统计信息.json index a4c4e48f..fa59d943 100644 --- a/Tables/项目任务/View_项目统计信息.json +++ b/Tables/项目/View_项目统计信息.json @@ -130,6 +130,30 @@ "Formula": "[总核定工时]&\"/\"&[项目预算工时]", "Name": "工时成本情况", "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.SaveLoad.FormulaColumnSaveData, ServerDesignerCommon", + "Formula": "IF([已完成任务数]=0,0,INT([已完成任务数]/[总任务数量]*100))", + "Name": "任务完成比例", + "ColumnType": "System.Int32, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.SaveLoad.FormulaColumnSaveData, ServerDesignerCommon", + "Formula": "IF([总核定工时]=0,0,INT([总核定工时]/[项目预算工时]*100))", + "Name": "工时消耗比例", + "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.SaveLoad.FormulaColumnSaveData, ServerDesignerCommon", + "Formula": "IF([总成本]=0,0,INT([总成本]/[项目预算费用]*100))", + "Name": "预算消耗比例", + "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.SaveLoad.FormulaColumnSaveData, ServerDesignerCommon", + "Formula": "IF([总实际工时]=0,0,INT([总实际工时]/[总计划工时]*100))", + "Name": "计划工时使用比例", + "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" } ], "ExternalDatabaseInfo": { @@ -146,6 +170,14 @@ ] } }, - "Relations": [], + "Relations": [ + { + "PrimaryTable": "项目表", + "PrimaryColumn": "ID", + "ForeignTable": "View_项目统计信息", + "ForeignColumn": "项目ID", + "IsDetailTableRelation": false + } + ], "Indexes": [] } \ No newline at end of file diff --git a/Tables/项目任务/项目任务分组.json b/Tables/项目/项目任务分组.json similarity index 100% rename from Tables/项目任务/项目任务分组.json rename to Tables/项目/项目任务分组.json diff --git a/Tables/项目任务/项目分组.json b/Tables/项目/项目分组.json similarity index 100% rename from Tables/项目任务/项目分组.json rename to Tables/项目/项目分组.json diff --git a/Tables/项目任务/项目动态.json b/Tables/项目/项目动态.json similarity index 100% rename from Tables/项目任务/项目动态.json rename to Tables/项目/项目动态.json diff --git a/Tables/项目任务/项目岗位.json b/Tables/项目/项目岗位.json similarity index 84% rename from Tables/项目任务/项目岗位.json rename to Tables/项目/项目岗位.json index 149f71be..06b39228 100644 --- a/Tables/项目任务/项目岗位.json +++ b/Tables/项目/项目岗位.json @@ -32,6 +32,19 @@ "Name": "默认时薪", "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, + { + "$type": "Forguncy.SaveLoad.StatisticColumnSaveData, ServerDesignerCommon", + "BindingInfo": { + "TableName": "项目成员表", + "ColumnName": "ID", + "GUID": "026a2026-8276-4057-8852-c76f4ac0a1e8" + }, + "AggregateFunction": 1, + "DataColumnName": "ID", + "DetailTableName": "项目成员表", + "Name": "成员数量", + "ColumnType": "System.Int32, 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", diff --git a/Tables/项目任务/项目成员表.json b/Tables/项目/项目成员表.json similarity index 100% rename from Tables/项目任务/项目成员表.json rename to Tables/项目/项目成员表.json diff --git a/Tables/项目任务/项目版本.json b/Tables/项目/项目版本.json similarity index 100% rename from Tables/项目任务/项目版本.json rename to Tables/项目/项目版本.json diff --git a/Tables/项目任务/项目表.json b/Tables/项目/项目表.json similarity index 92% rename from Tables/项目任务/项目表.json rename to Tables/项目/项目表.json index 6d836e99..c2539420 100644 --- a/Tables/项目任务/项目表.json +++ b/Tables/项目/项目表.json @@ -179,7 +179,9 @@ "计划工期": 5, "项目方案": 5, "预算方案": 5, - "网络资源": 5 + "网络资源": 5, + "项目成员": 5, + "参与人": 5 }, "subTableOperations": { "View_任务工时统计": 5, @@ -189,7 +191,9 @@ "项目动态": 5, "项目岗位": 5, "项目版本": 5, - "项目预算变动表": 5 + "项目预算变动表": 5, + "项目成员表": 5, + "任务成员表": 5 }, "dataFilter": { "$type": "Forguncy.RbacPermission.Core.Impl.Data.FieldFilter, Forguncy.RbacPermission.Core" @@ -226,7 +230,9 @@ "计划工期": 5, "项目方案": 5, "预算方案": 5, - "网络资源": 5 + "网络资源": 5, + "项目成员": 5, + "参与人": 5 }, "subTableOperations": { "View_任务工时统计": 5, @@ -236,7 +242,9 @@ "项目动态": 5, "项目岗位": 5, "项目版本": 5, - "项目预算变动表": 5 + "项目预算变动表": 5, + "项目成员表": 5, + "任务成员表": 5 }, "dataFilter": { "$type": "Forguncy.RbacPermission.Core.Impl.Data.FieldFilter, Forguncy.RbacPermission.Core" @@ -273,7 +281,9 @@ "计划工期": 5, "项目方案": 5, "预算方案": 5, - "网络资源": 5 + "网络资源": 5, + "项目成员": 5, + "参与人": 5 }, "subTableOperations": { "View_任务工时统计": 5, @@ -283,7 +293,9 @@ "项目动态": 5, "项目岗位": 5, "项目版本": 5, - "项目预算变动表": 5 + "项目预算变动表": 5, + "项目成员表": 5, + "任务成员表": 5 }, "dataFilter": { "$type": "Forguncy.RbacPermission.Core.Impl.Data.FieldFilter, Forguncy.RbacPermission.Core" @@ -460,6 +472,32 @@ "Name": "删除", "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, + { + "$type": "Forguncy.SaveLoad.StatisticColumnSaveData, ServerDesignerCommon", + "BindingInfo": { + "TableName": "项目成员表", + "ColumnName": "项目成员", + "GUID": "04a57004-15e7-4437-beae-2abfa17d2d60" + }, + "AggregateFunction": 5, + "DataColumnName": "项目成员", + "DetailTableName": "项目成员表", + "Name": "项目成员", + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.SaveLoad.StatisticColumnSaveData, ServerDesignerCommon", + "BindingInfo": { + "TableName": "任务成员表", + "ColumnName": "参与人", + "GUID": "d7436014-d17a-4780-82ce-bbfe46a7a23b" + }, + "AggregateFunction": 5, + "DataColumnName": "参与人", + "DetailTableName": "任务成员表", + "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", diff --git a/Tables/项目任务/项目预算变动表.json b/Tables/项目/项目预算变动表.json similarity index 100% rename from Tables/项目任务/项目预算变动表.json rename to Tables/项目/项目预算变动表.json