{"Message":"1. 简化成员时薪的来源，删除任务时薪概念，按项目定义。\r\n2. 优化任务参与人和项目成员的逻辑，任务成员必须来源于项目成员。","MessageType":2,"Modules":[{"State":1,"Type":7,"Name":"Table/项目表"},{"State":1,"Type":7,"Name":"Table/项目成员表"},{"State":1,"Type":7,"Name":"Table/任务成员表"},{"State":1,"Type":1,"Name":"PCPage/项目列表"},{"State":1,"Type":1,"Name":"PCPage/任务列表"},{"State":1,"Type":1,"Name":"PCPage/项目信息"},{"State":1,"Type":1,"Name":"PCPage/任务首页"},{"State":1,"Type":1,"Name":"PCPage/任务-基本信息"},{"State":1,"Type":1,"Name":"PCPage/任务-任务信息"},{"State":1,"Type":1,"Name":"PCPage/任务-关联资源"},{"State":1,"Type":1,"Name":"PCPage/任务-子任务列表"},{"State":1,"Type":1,"Name":"PCPage/任务-工时"},{"State":1,"Type":1,"Name":"PCPage/任务-进展"},{"State":1,"Type":1,"Name":"PCPage/新增任务"},{"State":1,"Type":1,"Name":"PCPage/参与成员管理"},{"State":1,"Type":1,"Name":"PCPage/任务成员详情"},{"State":1,"Type":1,"Name":"PCPage/新增报工"},{"State":1,"Type":1,"Name":"PCPage/分配计划工时"},{"State":1,"Type":1,"Name":"PCPage/MD编辑器"},{"State":1,"Type":1,"Name":"PCPage/客户管理"},{"State":1,"Type":1,"Name":"PCPage/汇报管理"},{"State":1,"Type":1,"Name":"PCPage/工时首页"},{"State":1,"Type":1,"Name":"PCPage/个人中心"},{"State":2,"Type":1,"Name":"PCPage/财务中心"},{"State":1,"Type":1,"Name":"PCPage/收益中心"},{"State":1,"Type":3,"Name":"MasterPCPage/FGC_母版页"},{"State":1,"Type":15,"Name":"ServerCommand/新增任务"},{"State":1,"Type":15,"Name":"ServerCommand/移除任务成员"},{"State":1,"Type":15,"Name":"ServerCommand/更新任务参与人"},{"State":1,"Type":15,"Name":"ServerCommand/上报实际工时"},{"State":1,"Type":15,"Name":"ServerCommand/分配任务工时"},{"State":1,"Type":15,"Name":"ServerCommand/移除项目成员"},{"State":1,"Type":15,"Name":"ServerCommand/同步项目成员"},{"State":2,"Type":15,"Name":"ServerCommand/同步项目参与人字段"},{"State":1,"Type":40,"Name":"Plugin"},{"State":1,"Type":1,"Name":"PCPage/首页"},{"State":1,"Type":31,"Name":"UserControlPage/聊天列表"},{"State":3,"Type":1,"Name":"PCPage/工时总览"},{"State":3,"Type":15,"Name":"ServerCommand/同步项目参与人列表"}],"Version":"v1"}

.collaboration

@@ -28,16 +28,7 @@
   },
   {
     "ModuleName": "Table/项目表",
-    "State": 1,
+    "ModuleType": 7
-    "LockedBy": {
-      "UserName": "SHAMUSPC\\NINGMEI",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-04-24T15:48:56.9547532+08:00",
-    "ModuleType": 7,
-    "ToRemoveFiles": [
-      "Tables\\项目\\项目表.json"
-    ]
   },
   {
     "ModuleName": "TableView/View_项目统计信息",
@@ -45,16 +36,7 @@
   },
   {
     "ModuleName": "Table/项目成员表",
-    "State": 1,
+    "ModuleType": 7
-    "LockedBy": {
-      "UserName": "SHAMUSPC\\NINGMEI",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-04-24T15:48:04.3978494+08:00",
-    "ModuleType": 7,
-    "ToRemoveFiles": [
-      "Tables\\项目\\项目成员表.json"
-    ]
   },
   {
     "ModuleName": "Table/项目任务分组",
@@ -90,16 +72,7 @@
   },
   {
     "ModuleName": "Table/任务成员表",
-    "State": 1,
+    "ModuleType": 7
-    "LockedBy": {
-      "UserName": "SHAMUSPC\\NINGMEI",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-04-24T14:54:25.7290337+08:00",
-    "ModuleType": 7,
-    "ToRemoveFiles": [
-      "Tables\\任务\\任务成员表.json"
-    ]
   },
   {
     "ModuleName": "Table/任务状态",
@@ -512,21 +485,7 @@
   },
   {
     "ModuleName": "PCPage/项目列表",
-    "State": 1,
+    "ModuleType": 1
-    "LockedBy": {
-      "UserName": "SHAMUSPC\\NINGMEI",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-04-24T12:56:05.1927782+08:00",
-    "ModuleType": 1,
-    "ToRemoveFiles": [
-      "Pages\\项目\\项目列表.json",
-      "Pages\\项目\\项目列表.rd",
-      "Pages\\8ee6eff0b74d43ef8e54cd3ef782f76.json",
-      "Pages\\8ee6eff0b74d43ef8e54cd3ef782f76.rd",
-      "Pages\\b90932e038f94707b54e571ff7cd84d.json",
-      "Pages\\b90932e038f94707b54e571ff7cd84d.rd"
-    ]
   },
   {
     "ModuleName": "PCPage/项目成员详情",
@@ -558,19 +517,7 @@
   },
   {
     "ModuleName": "PCPage/任务列表",
-    "State": 1,
+    "ModuleType": 1
-    "LockedBy": {
-      "UserName": "SHAMUSPC\\NINGMEI",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-04-24T15:28:55.3744243+08:00",
-    "ModuleType": 1,
-    "ToRemoveFiles": [
-      "Pages\\项目\\项目首页\\项目首页-容器页面\\任务列表.json",
-      "Pages\\项目\\项目首页\\项目首页-容器页面\\任务列表.rd",
-      "Pages\\a3c94948c8a24e6a9d63fc05ebfd71f.json",
-      "Pages\\a3c94948c8a24e6a9d63fc05ebfd71f.rd"
-    ]
   },
   {
     "ModuleName": "PCPage/项目工时",
@@ -610,17 +557,7 @@
   },
   {
     "ModuleName": "PCPage/项目信息",
-    "State": 1,
+    "ModuleType": 1
-    "LockedBy": {
-      "UserName": "SHAMUSPC\\NINGMEI",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-04-24T15:44:01.4644475+08:00",
-    "ModuleType": 1,
-    "ToRemoveFiles": [
-      "Pages\\项目\\项目首页\\项目配置\\项目信息.json",
-      "Pages\\项目\\项目首页\\项目配置\\项目信息.rd"
-    ]
   },
   {
     "ModuleName": "PCPage/项目岗位配置",
@@ -672,17 +609,7 @@
   },
   {
     "ModuleName": "PCPage/任务首页",
-    "State": 1,
+    "ModuleType": 1
-    "LockedBy": {
-      "UserName": "SHAMUSPC\\NINGMEI",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-04-24T13:30:51.9392413+08:00",
-    "ModuleType": 1,
-    "ToRemoveFiles": [
-      "Pages\\任务\\任务首页.json",
-      "Pages\\任务\\任务首页.rd"
-    ]
   },
   {
     "ModuleName": "PCPage/任务部分",
@@ -694,93 +621,27 @@
   },
   {
     "ModuleName": "PCPage/任务-基本信息",
-    "State": 1,
+    "ModuleType": 1
-    "LockedBy": {
-      "UserName": "SHAMUSPC\\NINGMEI",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-04-24T13:31:48.776262+08:00",
-    "ModuleType": 1,
-    "ToRemoveFiles": [
-      "Pages\\任务\\任务-基本信息.json",
-      "Pages\\任务\\任务-基本信息.rd"
-    ]
   },
   {
     "ModuleName": "PCPage/任务-任务信息",
-    "State": 1,
+    "ModuleType": 1
-    "LockedBy": {
-      "UserName": "SHAMUSPC\\NINGMEI",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-04-24T15:35:34.9479682+08:00",
-    "ModuleType": 1,
-    "ToRemoveFiles": [
-      "Pages\\任务\\任务-任务信息.json",
-      "Pages\\任务\\任务-任务信息.rd"
-    ]
   },
   {
     "ModuleName": "PCPage/任务-关联资源",
-    "State": 1,
+    "ModuleType": 1
-    "LockedBy": {
-      "UserName": "SHAMUSPC\\NINGMEI",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-04-24T15:35:43.9072019+08:00",
-    "ModuleType": 1,
-    "ToRemoveFiles": [
-      "Pages\\任务\\任务-关联资源.json",
-      "Pages\\任务\\任务-关联资源.rd"
-    ]
   },
   {
     "ModuleName": "PCPage/任务-子任务列表",
-    "State": 1,
+    "ModuleType": 1
-    "LockedBy": {
-      "UserName": "SHAMUSPC\\NINGMEI",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-04-24T15:28:55.3741785+08:00",
-    "ModuleType": 1,
-    "ToRemoveFiles": [
-      "Pages\\任务\\任务-子任务列表.json",
-      "Pages\\任务\\任务-子任务列表.rd",
-      "Pages\\558ca610fafc4ffd8884b819161bfd6.json",
-      "Pages\\558ca610fafc4ffd8884b819161bfd6.rd"
-    ]
   },
   {
     "ModuleName": "PCPage/任务-工时",
-    "State": 1,
+    "ModuleType": 1
-    "LockedBy": {
-      "UserName": "SHAMUSPC\\NINGMEI",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-04-24T15:35:57.2775465+08:00",
-    "ModuleType": 1,
-    "ToRemoveFiles": [
-      "Pages\\任务\\任务-工时.json",
-      "Pages\\任务\\任务-工时.rd",
-      "Pages\\94f8bae36aee4ae7aec2a063ca731b1.json",
-      "Pages\\94f8bae36aee4ae7aec2a063ca731b1.rd"
-    ]
   },
   {
     "ModuleName": "PCPage/任务-进展",
-    "State": 1,
+    "ModuleType": 1
-    "LockedBy": {
-      "UserName": "SHAMUSPC\\NINGMEI",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-04-24T15:36:03.5139043+08:00",
-    "ModuleType": 1,
-    "ToRemoveFiles": [
-      "Pages\\任务\\任务-进展.json",
-      "Pages\\任务\\任务-进展.rd",
-      "Pages\\77fae08dfbac4664a299aa7ec207218.json",
-      "Pages\\77fae08dfbac4664a299aa7ec207218.rd"
-    ]
   },
   {
     "ModuleName": "PCPage/工时详情-列头",
@@ -792,17 +653,7 @@
   },
   {
     "ModuleName": "PCPage/新增任务",
-    "State": 1,
+    "ModuleType": 1
-    "LockedBy": {
-      "UserName": "SHAMUSPC\\NINGMEI",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-04-24T15:30:14.3360397+08:00",
-    "ModuleType": 1,
-    "ToRemoveFiles": [
-      "Pages\\任务\\新增任务.json",
-      "Pages\\任务\\新增任务.rd"
-    ]
   },
   {
     "ModuleName": "PCPage/新增进展",
@@ -810,31 +661,11 @@
   },
   {
     "ModuleName": "PCPage/参与成员管理",
-    "State": 1,
+    "ModuleType": 1
-    "LockedBy": {
-      "UserName": "SHAMUSPC\\NINGMEI",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-04-24T15:26:06.7008806+08:00",
-    "ModuleType": 1,
-    "ToRemoveFiles": [
-      "Pages\\任务\\参与成员管理.json",
-      "Pages\\任务\\参与成员管理.rd"
-    ]
   },
   {
     "ModuleName": "PCPage/任务成员详情",
-    "State": 1,
+    "ModuleType": 1
-    "LockedBy": {
-      "UserName": "SHAMUSPC\\NINGMEI",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-04-24T15:25:50.1748869+08:00",
-    "ModuleType": 1,
-    "ToRemoveFiles": [
-      "Pages\\任务\\任务成员详情.json",
-      "Pages\\任务\\任务成员详情.rd"
-    ]
   },
   {
     "ModuleName": "Pages/任务/工时",
@@ -846,31 +677,11 @@
   },
   {
     "ModuleName": "PCPage/新增报工",
-    "State": 1,
+    "ModuleType": 1
-    "LockedBy": {
-      "UserName": "SHAMUSPC\\NINGMEI",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-04-24T15:25:50.1750503+08:00",
-    "ModuleType": 1,
-    "ToRemoveFiles": [
-      "Pages\\任务\\工时\\新增报工.json",
-      "Pages\\任务\\工时\\新增报工.rd"
-    ]
   },
   {
     "ModuleName": "PCPage/分配计划工时",
-    "State": 1,
+    "ModuleType": 1
-    "LockedBy": {
-      "UserName": "SHAMUSPC\\NINGMEI",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-04-24T15:37:15.2914771+08:00",
-    "ModuleType": 1,
-    "ToRemoveFiles": [
-      "Pages\\任务\\工时\\分配计划工时.json",
-      "Pages\\任务\\工时\\分配计划工时.rd"
-    ]
   },
   {
     "ModuleName": "Pages/共用",
@@ -878,17 +689,7 @@
   },
   {
     "ModuleName": "PCPage/MD编辑器",
-    "State": 1,
+    "ModuleType": 1
-    "LockedBy": {
-      "UserName": "SHAMUSPC\\NINGMEI",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-04-24T15:40:24.353205+08:00",
-    "ModuleType": 1,
-    "ToRemoveFiles": [
-      "Pages\\共用\\MD编辑器.json",
-      "Pages\\共用\\MD编辑器.rd"
-    ]
   },
   {
     "ModuleName": "PCPage/切换任务状态",
@@ -916,17 +717,7 @@
   },
   {
     "ModuleName": "PCPage/客户管理",
-    "State": 1,
+    "ModuleType": 1
-    "LockedBy": {
-      "UserName": "SHAMUSPC\\NINGMEI",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-04-24T12:56:18.5511358+08:00",
-    "ModuleType": 1,
-    "ToRemoveFiles": [
-      "Pages\\客户\\客户管理.json",
-      "Pages\\客户\\客户管理.rd"
-    ]
   },
   {
     "ModuleName": "PCPage/客户信息子页面",
@@ -950,17 +741,7 @@
   },
   {
     "ModuleName": "PCPage/汇报管理",
-    "State": 1,
+    "ModuleType": 1
-    "LockedBy": {
-      "UserName": "SHAMUSPC\\NINGMEI",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-04-24T12:56:26.0527973+08:00",
-    "ModuleType": 1,
-    "ToRemoveFiles": [
-      "Pages\\汇报\\汇报管理.json",
-      "Pages\\汇报\\汇报管理.rd"
-    ]
   },
   {
     "ModuleName": "PCPage/汇报详情",
@@ -980,17 +761,7 @@
   },
   {
     "ModuleName": "PCPage/工时首页",
-    "State": 1,
+    "ModuleType": 1
-    "LockedBy": {
-      "UserName": "SHAMUSPC\\NINGMEI",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-04-24T12:56:34.9215361+08:00",
-    "ModuleType": 1,
-    "ToRemoveFiles": [
-      "Pages\\工时\\工时首页.json",
-      "Pages\\工时\\工时首页.rd"
-    ]
   },
   {
     "ModuleName": "PCPage/任务工时统计",
@@ -1006,17 +777,7 @@
   },
   {
     "ModuleName": "PCPage/个人中心",
-    "State": 1,
+    "ModuleType": 1
-    "LockedBy": {
-      "UserName": "SHAMUSPC\\NINGMEI",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-04-24T12:56:43.0777354+08:00",
-    "ModuleType": 1,
-    "ToRemoveFiles": [
-      "Pages\\个人中心\\个人中心.json",
-      "Pages\\个人中心\\个人中心.rd"
-    ]
   },
   {
     "ModuleName": "PCPage/个人中心-基本信息",
@@ -1034,37 +795,13 @@
     "ModuleName": "Pages/财务",
     "ModuleType": 6
   },
-  {
-    "ModuleName": "PCPage/财务中心",
-    "State": 2,
-    "LockedBy": {
-      "UserName": "SHAMUSPC\\NINGMEI",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-04-24T12:59:59.3659883+08:00",
-    "ModuleType": 1,
-    "ToRemoveFiles": [
-      "Pages\\财务\\财务中心.json",
-      "Pages\\财务\\财务中心.rd"
-    ]
-  },
   {
     "ModuleName": "Pages/收益",
     "ModuleType": 6
   },
   {
     "ModuleName": "PCPage/收益中心",
-    "State": 1,
+    "ModuleType": 1
-    "LockedBy": {
-      "UserName": "SHAMUSPC\\NINGMEI",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-04-24T12:57:01.6030958+08:00",
-    "ModuleType": 1,
-    "ToRemoveFiles": [
-      "Pages\\收益\\收益中心.json",
-      "Pages\\收益\\收益中心.rd"
-    ]
   },
   {
     "ModuleName": "PCPage/收益中心-收益请款记录",
@@ -1092,17 +829,7 @@
   },
   {
     "ModuleName": "MasterPCPage/FGC_母版页",
-    "State": 1,
+    "ModuleType": 3
-    "LockedBy": {
-      "UserName": "SHAMUSPC\\NINGMEI",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-04-24T12:59:59.3661791+08:00",
-    "ModuleType": 3,
-    "ToRemoveFiles": [
-      "MasterPages\\FGC_母版页.json",
-      "MasterPages\\FGC_母版页.rd"
-    ]
   },
   {
     "ModuleName": "MasterPages/流程母版页面文件夹",
@@ -1142,42 +869,15 @@
   },
   {
     "ModuleName": "ServerCommand/新增任务",
-    "State": 1,
+    "ModuleType": 15
-    "LockedBy": {
-      "UserName": "SHAMUSPC\\NINGMEI",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-04-24T15:30:14.335691+08:00",
-    "ModuleType": 15,
-    "ToRemoveFiles": [
-      "ServerCommands\\任务\\新增任务.json"
-    ]
   },
   {
     "ModuleName": "ServerCommand/移除任务成员",
-    "State": 1,
+    "ModuleType": 15
-    "LockedBy": {
-      "UserName": "SHAMUSPC\\NINGMEI",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-04-24T15:55:08.5338885+08:00",
-    "ModuleType": 15,
-    "ToRemoveFiles": [
-      "ServerCommands\\任务\\移除任务成员.json"
-    ]
   },
   {
     "ModuleName": "ServerCommand/更新任务参与人",
-    "State": 1,
+    "ModuleType": 15
-    "LockedBy": {
-      "UserName": "SHAMUSPC\\NINGMEI",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-04-24T14:53:31.9879594+08:00",
-    "ModuleType": 15,
-    "ToRemoveFiles": [
-      "ServerCommands\\任务\\更新任务参与人.json"
-    ]
   },
   {
     "ModuleName": "ServerCommand/同步任务参与人字段",
@@ -1201,29 +901,11 @@
   },
   {
     "ModuleName": "ServerCommand/上报实际工时",
-    "State": 1,
+    "ModuleType": 15
-    "LockedBy": {
-      "UserName": "SHAMUSPC\\NINGMEI",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-04-24T14:56:23.1874433+08:00",
-    "ModuleType": 15,
-    "ToRemoveFiles": [
-      "ServerCommands\\工时\\上报实际工时.json"
-    ]
   },
   {
     "ModuleName": "ServerCommand/分配任务工时",
-    "State": 1,
+    "ModuleType": 15
-    "LockedBy": {
-      "UserName": "SHAMUSPC\\NINGMEI",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-04-24T15:02:04.5685691+08:00",
-    "ModuleType": 15,
-    "ToRemoveFiles": [
-      "ServerCommands\\工时\\分配任务工时.json"
-    ]
   },
   {
     "ModuleName": "ServerCommands/项目",
@@ -1247,42 +929,11 @@
   },
   {
     "ModuleName": "ServerCommand/移除项目成员",
-    "State": 1,
+    "ModuleType": 15
-    "LockedBy": {
-      "UserName": "SHAMUSPC\\NINGMEI",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-04-24T15:45:57.9850881+08:00",
-    "ModuleType": 15,
-    "ToRemoveFiles": [
-      "ServerCommands\\项目\\移除项目成员.json"
-    ]
   },
   {
     "ModuleName": "ServerCommand/同步项目成员",
-    "State": 1,
+    "ModuleType": 15
-    "LockedBy": {
-      "UserName": "SHAMUSPC\\NINGMEI",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-04-24T15:50:07.5087717+08:00",
-    "ModuleType": 15,
-    "ToRemoveFiles": [
-      "ServerCommands\\项目\\同步项目成员.json"
-    ]
-  },
-  {
-    "ModuleName": "ServerCommand/同步项目参与人字段",
-    "State": 2,
-    "LockedBy": {
-      "UserName": "SHAMUSPC\\NINGMEI",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-04-24T15:50:07.5087411+08:00",
-    "ModuleType": 15,
-    "ToRemoveFiles": [
-      "ServerCommands\\项目\\同步项目参与人字段.json"
-    ]
   },
   {
     "ModuleName": "ServerCommands/用户",
@@ -1714,40 +1365,7 @@
   },
   {
     "ModuleName": "Plugin",
-    "State": 1,
+    "ModuleType": 40
-    "LockedBy": {
-      "UserName": "SHAMUSPC\\NINGMEI",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-04-24T15:55:56.0994768+08:00",
-    "ModuleType": 40,
-    "ToRemoveFiles": [
-      "Plugin\\Echarts图表-10_0_1_0.zip",
-      "Plugin\\Editormd-6_0_102_0.zip",
-      "Plugin\\Forguncy.CustomMenu.zip",
-      "Plugin\\Forguncy.PassListviewDataCommand.zip",
-      "Plugin\\JSON 序列化和反序列化-10_0_1_0.zip",
-      "Plugin\\JSON数据源-10_0_1_0.zip",
-      "Plugin\\Lottie动画插图-9_0_103_0.zip",
-      "Plugin\\Notiflix-9_0_103_0(1).zip",
-      "Plugin\\OPENAIFORGUNCY.zip",
-      "Plugin\\PC组件包-ElementPlus-10_0_1_0.zip",
-      "Plugin\\SqlServerWrapper.zip",
-      "Plugin\\Tiny富文本编辑器-10_0_1_0.zip",
-      "Plugin\\xTools快速开发工具包-9_0_4_0.zip",
-      "Plugin\\加载动画-10_0_1_0.zip",
-      "Plugin\\增强关闭页面-9_0_6.zip",
-      "Plugin\\复制到剪贴板-7_0_3_0.zip",
-      "Plugin\\客户端缓存操作工具库-8_0_0_0.zip",
-      "Plugin\\富文本编辑器-10_0_1_0.zip",
-      "Plugin\\对象与集合操作工具-8_0_0_0(1).zip",
-      "Plugin\\支持预览的附件上传-10_0_1_0.zip",
-      "Plugin\\甘特图-10_0_1_0.zip",
-      "Plugin\\用户管理命令 V2-10_0_1_0.zip",
-      "Plugin\\表格报表-10_0_1_0.zip",
-      "Plugin\\设置当前行命令-10_0_1_0.zip",
-      "Plugin\\设置焦点命令-10_0_1_0.zip"
-    ]
   },
   {
     "ModuleName": "PublishSetting",
@@ -1840,19 +1458,7 @@
   },
   {
     "ModuleName": "PCPage/首页",
-    "State": 1,
+    "ModuleType": 1
-    "LockedBy": {
-      "UserName": "SHAMUSPC\\NINGMEI",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-04-24T12:57:12.7123424+08:00",
-    "ModuleType": 1,
-    "ToRemoveFiles": [
-      "Pages\\首页\\首页.json",
-      "Pages\\首页\\首页.rd",
-      "Pages\\2d17eefef7c5473fbc54f0c5820a6c1.json",
-      "Pages\\2d17eefef7c5473fbc54f0c5820a6c1.rd"
-    ]
   },
   {
     "ModuleName": "PCPage/对话页面",
@@ -1893,19 +1499,7 @@
   },
   {
     "ModuleName": "UserControlPage/聊天列表",
-    "State": 1,
+    "ModuleType": 31
-    "LockedBy": {
-      "UserName": "SHAMUSPC\\NINGMEI",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-04-24T12:39:05.1539496+08:00",
-    "ModuleType": 31,
-    "ToRemoveFiles": [
-      "UserControlPages\\聊天列表.json",
-      "UserControlPages\\聊天列表.rd",
-      "Pages\\21293af3013f474faf264d978cf3501.json",
-      "Pages\\21293af3013f474faf264d978cf3501.rd"
-    ]
   },
   {
     "ModuleName": "TableView/项目任务树视图",
@@ -1917,22 +1511,10 @@
   },
   {
     "ModuleName": "PCPage/工时总览",
-    "State": 3,
-    "LockedBy": {
-      "UserName": "SHAMUSPC\\NINGMEI",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-04-24T12:59:59.3660172+08:00",
     "ModuleType": 1
   },
   {
     "ModuleName": "ServerCommand/同步项目参与人列表",
-    "State": 3,
-    "LockedBy": {
-      "UserName": "SHAMUSPC\\NINGMEI",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-04-24T15:50:07.5087456+08:00",
     "ModuleType": 15
   }
 ]

MasterPages/FGC_母版页.json

@@ -35,12 +35,14 @@
       },
       "5": {
         "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 32.0
+          "DesignLengthInPixel": 32.0,
+          "IsHidden": true
         }
       },
       "6": {
         "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 32.0
+          "DesignLengthInPixel": 32.0,
+          "IsHidden": true
         }
       }
     },
@@ -154,6 +156,10 @@
             "IconColorUseItemColor": true,
             "IsOldMenuPath": false,
             "CommandList": [
+              {
+                "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy",
+                "Title": "加载中"
+              },
               {
                 "$type": "Forguncy.Model.NavigateCommand, ServerDesignerCommon",
                 "PageName": "首页"
@@ -170,6 +176,10 @@
             "IconColorUseItemColor": true,
             "IsOldMenuPath": false,
             "CommandList": [
+              {
+                "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy",
+                "Title": "加载中"
+              },
               {
                 "$type": "Forguncy.Model.NavigateCommand, ServerDesignerCommon",
                 "PageName": "项目列表"
@@ -186,6 +196,10 @@
             "IconColorUseItemColor": true,
             "IsOldMenuPath": false,
             "CommandList": [
+              {
+                "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy",
+                "Title": "加载中"
+              },
               {
                 "$type": "Forguncy.Model.NavigateCommand, ServerDesignerCommon",
                 "PageName": "客户管理"
@@ -203,14 +217,12 @@
             "IsOldMenuPath": false,
             "CommandList": [
               {
-                "$type": "Forguncy.Model.OpenActiveReportCommand, ServerDesignerCommon",
+                "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy",
-                "SessionGuid": "10c12f31-71b4-48b9-81d7-5def732e16d3",
+                "Title": "加载中"
-                "OpenReportName": "工时报表",
-                "Disabled": true
               },
               {
                 "$type": "Forguncy.Model.NavigateCommand, ServerDesignerCommon",
-                "PageName": "工时首页"
+                "PageName": "工时总览"
               }
             ],
             "CanVisitRoleList": [
@@ -224,6 +236,10 @@
             "IconColorUseItemColor": true,
             "IsOldMenuPath": false,
             "CommandList": [
+              {
+                "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy",
+                "Title": "加载中"
+              },
               {
                 "$type": "Forguncy.Model.NavigateCommand, ServerDesignerCommon",
                 "PageName": "汇报管理"
@@ -241,9 +257,13 @@
             "IconColorUseItemColor": true,
             "IsOldMenuPath": false,
             "CommandList": [
+              {
+                "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy",
+                "Title": "加载中"
+              },
               {
                 "$type": "Forguncy.Model.NavigateCommand, ServerDesignerCommon",
-                "PageName": "财务中心"
+                "PageName": "工时总览"
               }
             ],
             "CanVisitRoleList": [
@@ -258,6 +278,10 @@
             "IconColorUseItemColor": true,
             "IsOldMenuPath": false,
             "CommandList": [
+              {
+                "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy",
+                "Title": "加载中"
+              },
               {
                 "$type": "Forguncy.Model.NavigateCommand, ServerDesignerCommon",
                 "PageName": "收益中心"
@@ -287,6 +311,10 @@
             "IconColorUseItemColor": true,
             "IsOldMenuPath": false,
             "CommandList": [
+              {
+                "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy",
+                "Title": "加载中"
+              },
               {
                 "$type": "Forguncy.Model.NavigateCommand, ServerDesignerCommon",
                 "PageName": "流程中心"
@@ -305,6 +333,10 @@
             "IconColorUseItemColor": true,
             "IsOldMenuPath": false,
             "CommandList": [
+              {
+                "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy",
+                "Title": "加载中"
+              },
               {
                 "$type": "Forguncy.Model.NavigateCommand, ServerDesignerCommon",
                 "PageName": "个人中心"
@@ -870,4 +902,4 @@
       "Formula": "FGC_母版页!$B$6"
     }
   ]
-}//FCBapg8U+5eR5/RqfD9RpZX3r09UsbA6BOFGLFoVnZ1bPcc0TkFHfGoX4p9NsXmtlJLBolXUmKu8MyCJFu3t5TA6z7CVOAlsZ8zz/qb/gzlHRjpGA1M5FGGb2WsYc72aOsXyNb7Ocz4WhQJDszdcXUAJoxZm/qDwNikJb/UPQHMl1Pn0E+Iwub9MN+v+uUFFVmCLTIMDXdQAHJC/rqCfrYKyYYDQ/ch9jDtndqeIuD1R7mhPa8mJHwjq78I5Dhh9pjDFLOvy0SI7iD1ZMujNBI8uIYUb8bWjeT2De4CYxLFS+JF4HfYeef1b7+IATgGItc9QDa1SDcwtMn0pGD3AOsF8Nl1g+ZuiNVwQtq+KT7vec1ITgqiGm0+CYl7PZuSH1Uz2IJ39mah6eb+vwEN+nUXR+y03EE1VLC7dhSwCVmELktb3AS9XGTYUeAIywrtWTpQ4P8Ub4FRJB472hB5vaVgVN0k43lGeGnjOrLnsayc5B08iopbmjB/MhAtF2CN8sbEqLoemx9YCsBMEdvbZsYRj2CThjTDzKqFolDzur4T8JkL776AsQUN2vUAoC9Y3qhKXRIG/OwT+JoNTO5bfTkoxb7IXxnSnaw+RigYfN7ZSjLhj1xTAk32dlMpw9653nFF8RTC9C091l87h1RNNP44hT+BrgkWUWcINDj/+A4BatTyDtmCilP2rBYFxWFsyjiLAgPVV2LzS3wisNnteVvQJQdm3/2E8HA401IhXBDHsLG5Yao6FDMECT8y0cM1I4MlHd/2Q7m1+SNcfM4WKmyNux269JTVrIX0cvukDnMlLcchSxn9H9clr1XumwYk2McrQGWP5lUvPoHpRQ5g5T0//vEr7aT/zFCNi7Wehnf/1/wYVRR1wysK7FIaYd9UN2qrtBH/daO1eII52Fjo10w==|920
+}//ZwlZB3d4YvaJWWwuxTS5L7cgCtrEoHZ6aeW/lvIE3SfERB6o5EJ7Tfo31SR6dV7ViM/2WDDVobcEsAaUFvEnUdNAxPObXo2nyEy7ENqJDoM9Fc8m3o2Z11SHo/7ijmFX+u8dPWXUOwoU+Ey7gvpPrTY2EAAMXqUvCvRLsnq12B0hrJltqbhH5YWxM1PPnzMhk5B6ciWWGqAfQf3UfYprkX7nrDs5r1CaXOTX7rkhjBrywWXxEH+73G5vb0Jri/W3Mmyir8RiuKftT3e6GBpd1SytTcgjN8yQAiQ4zJ+lGOO9CxOFIRx4yJXO76cNIWPmjfZVsgJEI39Mh3f4yypOXrL/ZLl6uQM5ahRkVip43FCwS6DbPRF6Lm9Mg71c8S+EciOOQ0uRlEeQNi+in2ux/pENHpR8LCD448zAMbqCHk+wmsrtQ8q+qNkaMHAVXA82hrbAasc42/so1TJQpR+26xR/hDWEEm4a7vhr6GGsANXvOV8dXzinIHRMnWNg/afH2lK0pxEx0lSPxekZ75sGVSSm0eIe3lg4rDiuQlLLlguzh3jhclfPE1mY/uugQ86ZZZS2OvV7+EC7G1jM8JdpCkysleE/LH391WA+wwoX9gS2SYUMyq66JgLYeTFqZKUPEuJDYdmHSaE720vxWnALqXKo1wvH30I0dTFxwHL8P3kdEeMX0SihHXa79c3UNxp7I6T7E84pJ44TVh+ShNEWJF36/ExmLVHovihTckzL7wAToitKs4OkiO9YDUi4xBujX6+gjVvTxiDYfB+ymWlUkOtj+yvScxGv821Ku+X7IIay60iJirKa8FzDodrRUynth/PJez3udQsJpnzdyio8OijXwTxUdNeGvyPZLPLDCCCZEFDYsAlGN+zJj2v8uzkYS3wWoSq1hHb2xhEA+kccwA==|920

Pages/94f8bae36aee4ae7aec2a063ca731b1.json

@@ -145,7 +145,7 @@
                                   "LoadBindingDataOption": 1
                                 }
                               ],
-                              "ID": "564449fd-9f25-4b28-994a-4bb108bb803b"
+                              "ID": "fe53da8c-3fa7-4ff1-8892-15973c8ebfdb"
                             },
                             {
                               "CommandList": [
@@ -157,12 +157,12 @@
                                   "ConfirmText": "您确定要删除吗？"
                                 }
                               ],
-                              "ID": "ef4ee973-b50f-4ebb-aec0-6e2a7ba9fbf5"
+                              "ID": "9bc3ff64-6ceb-4637-950a-7afa27c9e14d"
                             }
                           ]
                         }
                       ],
-                      "ID": "6800afea-ba47-40bc-afec-f9f1998d51ce"
+                      "ID": "9548076a-e543-4a97-8ced-9b38cc685f5e"
                     }
                   ]
                 }
@@ -230,4 +230,4 @@
     "PaperSize": {},
     "Margin": {}
   }
-}//7OAZYgyMS7G1Gs5YQbIqwAVCiaIGuSeYjADlsQ8a78j+JIsEs7V5ul+GWoF+C04Fss/pHMzFQRVipfApXCP5Y+cwZgiiBm9kPMtAS96JINPeljX/n94zBoU9i15hhwpxRygYuxqEqYBn3dirMrrB5vEPGSaUqI40hWJN346ERyaEX5fBvCDD2xH/WDd7P4CwxUlX3ueQW/+VkOP0F12cyMnoxwfoAb7CHE8IzwzTU2923TntyJ/MF0Op8ZcDWbhRtzD8KnQUr1EpDo1zVnZh0aeGCoL3ZVzOc3bTH3jcN2xFCHTKGdui8yiea97KEwMx4bvWQ2Vxkx+RZIdPvowv2jT1zsURuoUWszX/ozjwCb4P5AW78EP3U/xETXwLyE7LdJUMtre4lMH+0IEiNcc9tE6tj6WiGkO+bKbp5wnOhzBt2hYFcLgPv5GdLL2dfBSJOrQm0g0XLltPLIDZM4Jo33bpHr/TawQU+rep1wMmOWojHn9GEmOFa2ofMWhIP8Mea4wjWRExACFzVSSY14ORvWjncTxhjSNYnvK4xH3OySBx+kvOnrf9Rrk68UTkL1s/78dxoc6Ihufxmuq6Wykq/wPs5mqFzm5WMJMS1ThXhUFMIBXztu0MOL+fdLi1m0JUN9VjccD5XZ9bYzGk98buq2nt1/oKLxdM7IA2nkX7d0sh/QgJAWXw5JzwkdcCbO8PnC3zR5vHtHvxW5GltYx27+crBoUX0I2A6aRJ66qeSaU8Dase7kMhjacBEL8gBi7+YXGoVDWBK9xqOD3QHWr5kB4CTDHTdOeF/kXA9M1Gd1dr6cZzYnqS5HGIFjylpOBBpaFOzhQLslPq3uZ+rp8z/ZC2KmsUv/tkPXr7LumQ+rc+QKoIhgCNxvLRpinb5KkG3tCDjqX//YRqIxcS8v/9nw==|920
+}//fM3yKUYBLvd3gn/KlEQ+JkhGVk4JaUaEBn9kpIj/GKlDuWzhNvwTJusgtARTwcejX04qF8kp1cdSr1pxYyRZmbnanysgGOMoWT6H7QGuwdNA7hDgQ/CRH58DlSlDePmamd0AOmArLVEn5KOKaFm+ocFVDnGWe4O3/SCkZzixk+6o8o15yEx7LVSHvsiA7AFsQOGN0JsaeJzkCB8UDO4AqKW7cHr6pqzhPGkI7F3IuuVXJmvcwPZMPDhpqvQnYWgzU0pfXLiRClvT2v3J2m6d+OMJ2wSMlbqOnATPxr+bquTJbJVhyuRZCuXITPx+kaNGlPZ5CIJlgZzA5koIJzBPViXzOZeH/7HeOIKxyjPG/P5nCA01lJJFeKZOqH1jTjucJQMDXhCBCGEozB+a3OE2xUOJh00R34keqVIQIWFOvSKjPvYO91bCNclSOLmU/EyHBplUYPlzQ0+efKZ07A+k2zGv1VYDG8yI/vqNeGBo7mNsmmYmjDCsEJV5t8U1E7g1axKhjrOD0C/u60vhA7PTT06Thj9zUTulMzSeuLZ7bkCBr/WqFTOTbxYWGdbrBal7tAof7J+dCu51v1ZE6VYiMYUgEhi21pf3ZEVoCQyTfT9rH9M36yfIHzyK5aMjAzIC8uTFhJ52Ri62oHzsaL+DJQ/cRiOhbDbhaZv4od/C1u7E+IVEVgrQB+a5JLL34agHcSQ86NFCkKj1R9xivfEXQIMsfZG8A195f36em04SxCcWd7FqaK48BQ37HOumNq1DmJ9SJZRMtbH0cT9lprQ9qbXqyAg9oHeV/JfQytoOUonRrghG+8ORwCoGfhzeNdGaqbzBAaGyBskF7vOJ/OBd9RS4/aQg25x0Zq26WYsbG52La8AHJl9jfJeHcyWhi2M5N8VuxI+4KsVyaHxjme+KLQ==|920

Pages/a3c94948c8a24e6a9d63fc05ebfd71f.json

@@ -204,12 +204,12 @@
                                           ]
                                         }
                                       ],
-                                      "ID": "dcc3192d-6dba-4d32-a095-1402e52be96d"
+                                      "ID": "2b27bdbf-83b6-446d-8b0c-baec1c44234c"
                                     }
                                   ]
                                 }
                               ],
-                              "ID": "46f680a9-199d-4c16-abbe-bd19c440c81f"
+                              "ID": "00124ca9-0787-4bbd-8af9-ddbe2290ff10"
                             },
                             {
                               "Condition": {
@@ -239,7 +239,7 @@
                                   "Message": "复制成功"
                                 }
                               ],
-                              "ID": "c8f34bca-e2ff-46e4-9f32-de9d1a2c824f"
+                              "ID": "a846b1d4-2836-4882-9963-f30a111e25d2"
                             },
                             {
                               "Condition": {
@@ -316,7 +316,7 @@
                                           "Message": "操作成功"
                                         }
                                       ],
-                                      "ID": "1549c568-4892-4768-8272-1de9911cb3e9"
+                                      "ID": "418503b2-068b-45d2-92ee-53106414a6ee"
                                     },
                                     {
                                       "CommandList": [
@@ -331,17 +331,17 @@
                                           "BtnText": "知道了"
                                         }
                                       ],
-                                      "ID": "d6effe06-1888-46f7-be97-5fba12c59901"
+                                      "ID": "ba1a7551-d7ca-49cb-86a1-7fe6526f5810"
                                     }
                                   ]
                                 }
                               ],
-                              "ID": "eb87ff70-4cc3-4951-9a8f-219e9a4eb08b"
+                              "ID": "1bda4988-227f-4f0e-8282-8159bbd504b0"
                             }
                           ]
                         }
                       ],
-                      "ID": "64c63b67-ad60-487d-a13a-51a9bf783704"
+                      "ID": "820c1e92-4f58-4ad5-a3ee-e89a11f8e2bc"
                     }
                   ]
                 }
@@ -418,4 +418,4 @@
       "Size": "24,24"
     }
   ]
-}//Ji2cOS5U4sefFK/FzVuzvaaLrHZN4RnnVnNqbQfF7fXsrKxl+KfXeM3L5kW+yJp7Uda+Om7y0/XVtfQKb7luDzNP3wxcdFXOvbitZqDPoxE9UJgO4kuOAldOa5xW+I3e3On0BnpgUAvWLFv6dBUBBdLFm5Bt6miFWAqEQiiWOMzN+YuaBhX3mq2aUGFTGDujPZVflcPK0SmsEqrDvIibtkZH34R1ks+zhZk7D8xXnOEs68oBAAg52wjdYURGc054rIDB9FJRLsWUwXf6l6XD4WxaRN8CAaTzDTFnX+IPt2JUlTUPYNJ85cxm8RK77kxUunZvRoGoOsRmPYJU3qcsC9l4V6rGolvOc8c5DneAC06JwptQdPymCdaEtLjexShUrfUwHOlB1H550VNctVBGKh7e5qeUb84woV9QY9eghgwZIHvrwdFZ+nIEPZ+9tXPtYQvC+27eXrgncz9F8fWmaDmPWsL25D4IsPHRi8KjsilefR5c/EoLts1am9ZbdoST9M6qDP8O6YEo0PxCCjhbTRx1Cv6uMnZ5LwUGlQzZTjJLlqziHC01SpnViUHi18ZWCP7L30ZTgj/jP1zSrf828seNBxcH+QfPkoPmC0kvC+UOseCFjZWUEsCpIqgKj3WBrTaoooluYIEuAyZq78DxDrZ04K8x1LZg4NOGS/MygcZNR7YEhoMWA58zPqDwdsP63esBzg/5VEbdYJ1Ha8ipencTEEx33nXfrB5JUmPRPtFNaK6OL4akXTBTGVtZHaNkjv2oqCAKqO2Q/NIQRtGq9ZVBzQuhm2ka4OCFjTZp2dRg0S+L/FetD+fIBxTngEqALB/PkE9YNrkp2Q6MHti9/1BBB/1Y0UbAUqh211ODJ692GZl4i75+/uIauDcJkeQllZmOHH5veJUdiXgJ2wH9lA==|920
+}//eFNCHg4M1aJf2W0CDA9EnwDa8fW26dAfPSYySn/dul6Y3EQu4NnFaTHsF8G0WVTUuuI91aM2vutRCkaVWySRCgAIq867xYPVXhqQ4iIWcBShbx0sML2RF2p5iDenb4BETZZnCVtyAqSrB0YoBB6Kih3gnq2zrzBRDG8MkiQaToOf/zyNE576XhBF7xMIOzTNWIEsR9UjdApRyKThnkcJB7jh7S9eLAPT48GIKuwzu9TGKaG6jUB0M3RwB3t33EzIpboN+j0ehgDn3AC67oFLuy+ji+DN/ztjTEMKeGMK9cIn+uMXU95smxOoCO+kT51O8Rn4OPi2xmNDo9zIJC8TCJudUVwWWfNf9rPzAT5sshHfbEruWSM0gVOA9dbE/qZrzFgmI087gPyv7l2gty1DcwzXEfOdAKHOSyOFzkMBXIjfPhi86qD9JO36zG/vI7TAYawhWW+KgbpCovmAZu5clmTUdVTPsfcjIOXstd78UZaQOmRe8bY7oHpppI6tgj4YF3VjfF8FS+Gln/z7mltjUzOHC97dAyXCH7VsIEWBj6QcEt7ANit4gduiqnf3Te1gBVwM6W1VCXHynohImU8SQwBtOfRLI49LseupDYKUitJJOZBvbJ7rtJkJBLRYIOmwV4/qjLJtZeavADDZWX+HowzCq7N+Yggk4Tkm3yTgpGFlsENPxoRqRh151kKC/hFGmFjoGg9R2OrYXBX6hO+9xP8QCYRISqh3iVuy7fwgLhaJExi93OGfBzNVtRPHuaw6PgOlUZu7u50hnZU9lpGVQRfshQ5L7I692n0tWK0FBQqL+dLaVynvSrsasodS3LTBlqJWF49c6cGZxXNcwcbXn5B9dwG+v5bbl8u4E7Ydf/Pvy2eto9oaSNDUe0u3Qbyz4a8JD7v3nCWdYhy0ukMaGg==|920

Pages/个人中心/个人中心.json

@@ -585,6 +585,13 @@
   "PageInfo": {
     "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
     "MasterPageName": "FGC_母版页",
+    "PageLoadedCommandList": [
+      {
+        "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy",
+        "FunctionName": "remove",
+        "Title": "加载中"
+      }
+    ],
     "PermissionData": {
       "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionData, Forguncy.RbacPermission.Core",
       "permissionResource": {
@@ -648,4 +655,4 @@
       "Size": "1137,332"
     }
   ]
-}//P9PHVfX3awzb/qTUtWZbip+/FlQHkI84UFodmDFCqn7RB5Ta7QD15DLfGaGAYdVTExRZt7UuCWzgNoaHH3Om1HEIgGF8mbgqkrNohZDwQIlv0TAFHLmoKZ7nizjpsJ2bogOL5alP3/HbJeazOh6vu0gfL23mIMcXGHF5oYHZb+7/x5f0RlV5ZtaOw/1nv53wkUl5iuvlccpJZx2ABd4vvhxZzKUFjyICpevWW7HGLF9+ni4ECq8uhkBu38dq0a0lF40v2nUOfVZFfNq56z3WaqozZgtx3bkpRHZud/r1sEJD5ogrDjPVxGFWmty62678miJQmjiAMzsvBseGk2cENGhtq5WhtTEwddZBawVeiAlinJUbnc5KtdCtkID0jx+yWeus8bdrxdXdGxNh2q16ub3T7S8H9PfSlLNtl/5Ns88xL0cdKb4fgDPswcOvTD5k2Y3h/u9m7b3iwmkXObbjrQIIuccGMA+CDbEsQ2rYAVboqvtl+Ogha4w+DG6XskI+/i/8onV3K2Q0VZ9I3SqAfwgUKMGYdilf+jE3G0niYrOFQYSLwXdXEjxQGK1j1/tx5TIgB0KzaHh63+YBKxcFqNWVIyylWOyIvpiHzzygW1Qmqg4ZKuthszfTWvI6Nm6SDM4irhxPJLruraeFRYZV4621ZaFGpbh6rWO+1D7ZXBEy1KwgYTNUcL6BH6vfwn46vta4pLIcW6HRb+bfN2hKomDhJD1psgG4OTXvjIOp7sN+wTqogV7433ZGJz7mdqoMtRbQOoq8DeGy57T3X0VqUx5XjGM88Ypy75chhm6mp/5ZwqRkpUK6R8W9zrn3j4Dsiz5WfXZfc0t0BX70g2+CYvI+E7MxDzVjvrBayvCCGTKAibsGO3xb+9iKtrQX2AjiBZVOXOZ1Yo6HCEVcdQlaHw==|920
+}//nTWC6xms9N3jRNieOiKxInxKYAgBGHnM63dNE0MzJKEciV6nhwoQ3tRpn1ZaXKy9GduJ8tWLTWQNPAToncOiSq8LQmwpPFc7jbHbxfoWQf59kEk5kEHP5trNGM9YW+0qYrX8wYAEmlfupsyXbIVMEjgPH8CrxbFzZJV7lz0mWsE8NjluxBuPxCs0SGyWo2pwC4HQzPYb2eP9L6/zCffYBLuDGkjqh7UrFkQqsQ9ZU2gsveHYjzQYPXYB1mzIGdZdLyljDuK0YsS8c65bYYO3Qt1t66q4xqbeJQHBZbfPC/yRkuxbu/OPYlAmtJMMo71cIEkV8r7pzCLoeRjjTNUqkmkkt2Le5Y7fyBcsrDd0QT1zxMY3ih0Y7w751GN6TvZWMpr0H7p84GRBvhRWD7BYayZb+0LYQ+IdMe8i3Pn5exQWTXMqOCKbKau6UFuNPd/e7GZZEeZqR1bhjKf5W28RfIEcbJuIS7RD5nPAU/n5fKJQcSlssxCI3ZoC/5Mty5BR9ppJQnoXFoRlEeAimFk9nt05TFHCU4Om767fvxI3y7g3lt3o252tgS8psZMVO0nFEU/T6wpcW3Xudzn+zxoQgeDZtX+Twwbc13cUkKCaVikyT3o6E4R5AjIRyQa3JfxdxLOxCxCr9JkYPh/21MjKXtDHdu6o67tdhwjLgaaKY3EFaDPVxwL7ZWrx3+sK+hNGXGW7hUAzJjXzxYMKlNXYKjCsOzAs8tMgAEo8xfHo9haEN1xZfhkq3fJ80IMbcp559kwhEfQGXJ8IVzMXEGcyPL2aV2YAZuRXWZmpUQ0/F0j5/RckRQLVAg4rZC3QieiPNPJ4h/n1k05ug0oVus0MYK3xOy7GyobX9QJjDoNz3/YYWTJ357OMkZN/EIPVFgY0EIDRlHbUo6XEChrDWG7ZmQ==|920

Pages/任务/任务-任务信息.json

@@ -186,7 +186,8 @@
           "Name": "简介.svg",
           "Color": "Accent 1",
           "UseCellTypeForeColor": true
-        }
+        },
+        "IconSize": 14.0
       }
     },
     "0,20": {
@@ -337,7 +338,7 @@
                           "MethodName": "ReloadBindingItems"
                         }
                       ],
-                      "ID": "c15de392-a542-47cf-9501-fe15a7294500"
+                      "ID": "a499f937-f759-4e32-9f30-4c0f11dd2af5"
                     }
                   ]
                 }
@@ -421,7 +422,7 @@
                           "ShowConfirm": false
                         }
                       ],
-                      "ID": "29708ce2-b793-4328-b8b2-2617bf6b3b13"
+                      "ID": "e5179793-0857-48d7-86cf-c5bbeb81337c"
                     }
                   ]
                 }
@@ -509,7 +510,7 @@
                           "ShowConfirm": false
                         }
                       ],
-                      "ID": "0c48c30b-8d0d-4f5a-9105-6e76f4be1c57"
+                      "ID": "2cdc72f6-eb72-4787-bfdb-75c1f273bcb6"
                     }
                   ]
                 }
@@ -604,7 +605,7 @@
     "Styles": [
       {
         "FontFamily": 0,
-        "FontSize": 18.666666666666664,
+        "FontSize": 16.0,
         "Foreground": 1,
         "HorizontalAlignment": 2
       },
@@ -769,4 +770,4 @@
       "Formula": "'任务-任务信息'!$S$11"
     }
   ]
-}//J/lIssOKIYu4sj46JsX1TGpmqqvG3HZV+1s/XOwkjo9KDohAcHsD+V0KNIVzpZD/evNOXshX3PjcvezQEar9sSab9I5sw2gxQk3W2b8heIrYq7X0ntGSUaFsGDq7NgZPHoO76z0OkvpAIOJMCUeVZ9DVjlG6EjDekDvr8EMjb7xBkNTq60sQJHJLa3pBnGPFbUv/IweoDdSZxFOIJu0kMO+XzqRl2o6BlkZ68d6tAGHp5lOEq5fm3EXVRYVkzcJQl4WaHvoLmTXtz9LAQI1n3AVsvPgO5hu5C+4ubtRWumN4zg9Uk1oSMfvf6stdxvNzufoCNUikJ3trZKBBOsX3oGee+N+IoKVSO0XcNd8WUTmMc74OGnWe26bXZ//f27xYmZ9toV0VvAMOIzBf8VXu1LG8hNGM3D+37sSXFvNx5i0srz9qs5+aiOF/Sx2JSDxOedgug6tq9x1bepVNHc7Oizx8ipWVPpnkkgXvb1mok7E6HmM6q0PrZquF+CNnmV+Tat0eo5NEB0xbd7eZAt06rMTaInv6Clt0Vry1O8pOWRWO5GP9Vs48mnfhB41LSAhEzFhmZedKNDaTyKigp0Dp7tCPYM0xBGj4YQiTUEVgfFMVbA+raapqfyV5lJ4aPgglTvccx70o7aTj+NXru7IrwPUzr1/v9H4ica9E+TdnMKxzgQUc4tIK9H5WMpRCgPcgGa5nC8A4/uLCX9LY/xQ8iW0AzZ+ULHoVqprt+T6y98RFdKv08wwlReVjWi2/8tS1UTcQxu2O7tXij2jKx6+vxR1ytLceP8MW7OxS2HENP06rUWfBCYarBeITnyhh+qrdMrlrw5RltwULE4whNTCX6s4fbS/eD+Y9rKncSSqi7zYV9r2iGZlLu31x0iVREcgIddNssqSQlI4F31L0LW5rIQ==|920
+}//8bkT1CfJGfGKNOnfMjI1oquQZhBaeK2tPwxTU8FpL+6XPg+m/0dxmuEupc320kCHPFK0UKDGE5WH4UfwHIlNmMBLRXWx98LiHYETtUVw4kGtvzZwGr9hGQMnj3SH/DAY/vHQ2cMZqAZ+ttHHXzIbgS+Ir2GmTv1Q58GcDDXqDAs38GZJdCYi0afV1txOKcVwfmQZWeDzIK34OG2GO6lVwl72EhejYELsGReTFdVpEhGI3v/pXnF02tDbPrQpS6zGE1kXuQiQ5vOleDOxxgQ1LBLTFFWTs26bvlSjk5gfdB88UZfDye+HGHG9n1noz6YkO9ZOmlAM4bc3JKe98efwqvEYf5VIXjifviPgxDnGZYQs1vR+iiOwD5AlgzR13f/TpSiJzpIWN6NhVRfUyZWhzaM3EtPN4G91XO0gBPwbE9JEKrrobyZn3n4l91RnA5/lIVG26bPwoMTmUywCau9fO9uDDCfrhyYDlG4uWSYMI70WTk7mSiEDzvfui/YAaDG7p3wg2RLlLRqHYHk0/CveV16xpTL+8vy67xUVAVPQQWvY7b70lZZv++70+nE6v5+l+wRJACgcJXfof8hvTN3+ZJiQO9orhIGbI02AaDWW0BE/1Pu9NJjrJfW9W2CJ3VHrOmgs55Sz2AR2eZo2FeuwBVmKxLplzjl0gv61Zh8vPA4DeBt0aJj6EV4Uu9MnyWeQuO7DohCkDYkpEEfO7tLNSj3QvyyqJ051yuScdshNDVGRBYOm4QwEAoRfo5HOmwUPwfJM9+bgcYHNt7KlGePC/UhNQeiGWS6DTjrPvsUs9Dc/k6L/JiCxEB6lhr5BJy3/8dvpAlULRghZ06S3WVtj0WboeO616XPgVKYzuOWSlEIzpL3dvMDy5IkFruHRcAlpUd8qIlgOp28cobXfWRQ0rg==|920

Pages/任务/任务-关联资源.json

@@ -156,7 +156,8 @@
           "Name": "项目1.svg",
           "Color": "Accent 1",
           "UseCellTypeForeColor": true
-        }
+        },
+        "IconSize": 14.0
       }
     },
     "0,20": {
@@ -277,7 +278,7 @@
     "Styles": [
       {
         "FontFamily": 0,
-        "FontSize": 18.666666666666664,
+        "FontSize": 16.0,
         "Foreground": 1,
         "HorizontalAlignment": 2
       },
@@ -362,4 +363,4 @@
       "Formula": "'任务-关联资源'!$Q$5"
     }
   ]
-}//KrXpgABOqjV9zbLEwVgiyiLdRbhuimoj7Ps5TYarBcZl+vHs1TRKJaVesea+YNrnn5oC3AEqzaOuQj2l/aMbM4rMiFxFqFc4+A4J8oH70/f++xbt/ddUflFCnBqE9zpTe7am6eSCD0ZyX7vRwZR3JX/pO7WRJS9+AMdWNeSvUF9m8ZSRiNhe+s99ghKUBYPARjDOR2VLJBmTWumJ0KlKfX+lorigJQwN++Izb7u3HuH8CJHnK1l8peV7up0adJ7qPb8M1vf3uW37csxC36B8cTtP5WBD44WnWVPgQFXDR48n2dKpD5FIK/d4LFalBi2FVAW7hKyxqLE6pAQRHnOzntTBAbv/g4HZWD7ag53XABsMYvyreBWG5HOZIKAiQQS6KGL1itjjBAex4oC7NDNNq/SopQmihuvWG0/8hXaq3gGX48rSk/F2aQohuidLaGCMSrhRLHmuNB+Y1dQtfSSEZTXTeBYXkSm46LwUeVK7QKHcR7D3zYqSzwgoJzGqjwXg+HZFDqEdwVpm8guXi6AlcoTnmcoE+1R3/nk3k4i+RUAL1pSxr2vg3hF2BRZ5LM8DCQsBNQ4k6dlyhN9zCt3qswyit2TQ/4ZWiy0ion1WTQjX1viSAKwWk4k/9/71S06O8IyVZ2Ki0WmG3bHk+5G3U54SL8J6r+6UTTLScuIYUqyRgzpcI1GV+aKro97Ztk9I4/T8v1KFEYCmc3Nw/NJYRdZUSGhHNflFCU6YabxlR9Q9SHuiXDuibqJED2mA+JkDBEWRyscNQfkETQd4j0vNvmAmHLTycmkr+abauM+Gr/jHGSsJNQMJj5TOb/JHgR3qSQsIJDSCieBRhzuAtzq/qsEA2oyBTVH3Zjpk+IoivcPoXUiv/MeJ3q6a+5GcXEfe9cAJW9UrLbGfTq2sdHJMhg==|920
+}//A9acO6uOQ2SkXarASD99hUtFHQMCYplvi91kajnCCxj5k7pyWsqiaQhDjSUowyjtLnBAT7ZUIPFw49v7fY5Qmg+R6zkB1lHj30NgyBvspI9VcHgyHrpk05/+jRoCCjKiWnSCKFkb/osS8Nq72nOShARBy0+P65jTJK/jnVBqWlgTwb2PC2zIf70DikUlmhPwysw6IE/UNl0P8A6GZrUmTwRrh1dYLyrftgxyGhHchbWtJzBYB3/EUXCfz+RugcFXXQYh1V+VQoJizCwNmb5hbQxVUW0qiJzW5mVkcafIH+8GABt+J4yqTp1yr+JaZMvthUY5M25fCyeLH19IhTq6CRK2+WA/bTfJFCcOTrJWOhSYfCcOAXT03RA+/bHMBSC3zDfbFhtRJij6ldXMJjq//iff1wRAxqV9zn7GF0BRP2OLA+oA16HPDJ4q8bWraiD+DEkd5lE2kjii1DC8qNZ9p8dMkp7F4UhF+tp0mhtS9gzC6h5h101x4yiuCYdtnVt6wbIHcOK/1WCd/uYJjxHgmlAnnsZmo7VXS9g6NtIebxKVvDBhtWqboojl6tWnQ02BBl3Tib70F9oB2OISbxZkSs/Fhm4dWTQ5aAqdaqISJf0hZ/5W7WneaO7Lw0GmuPRAvpzuq7nvIpMFuJEZxyctF7DXhjBTlLQhTgTp5FfnYTD9IgHfAFQZ6ncVCzo6LEzvOeQVjIqKxyWI1oh+NWng3CODw+FBieXxrUry8xquFU6XxGd7x7RdfkP0vjAr7N3uZlaB/kn7nglX0CDYMKCO6mAc1oAKPkVAnZuH4GPxcwbVFA4P9RxRdP8p6ilxAkan5lec2D+pXSnub01MnUmlx6l9V1jTiufEp9L0f8sOv+FUZ4jh4CuBIVqzXAD1jczXSo7CO4E/4H4KMZwEe47o4A==|920

Pages/任务/任务-基本信息.json

@@ -196,7 +196,7 @@
   },
   "Formulas": {
     "11,2": "C16&\",\"&J16",
-    "1,18": "IF(折叠全部=1,\"展开全部\",\"折叠全部\")",
+    "1,18": "IF(折叠全部,\"展开全部\",\"折叠全部\")",
     "13,17": "C14-任务总计划工时"
   },
   "AttachInfos": {
@@ -235,7 +235,7 @@
                     "ShowConfirm": false
                   }
                 ],
-                "ID": "82010f16-4896-46e3-8f13-2688c60cf9f5"
+                "ID": "1f7c0032-ba1b-4cb4-918a-7cb69d560546"
               }
             ]
           }
@@ -452,7 +452,7 @@
                                   }
                                 }
                               ],
-                              "ID": "af12165e-2f19-4513-b93c-2f0336ade323"
+                              "ID": "a829eeef-47fc-44a8-9a9f-381d027e5d75"
                             },
                             {
                               "CommandList": [
@@ -467,12 +467,12 @@
                                   "BtnText": "知道了"
                                 }
                               ],
-                              "ID": "d658306d-464b-4529-9b85-ba3f38093b2f"
+                              "ID": "ea56893f-b53c-485a-b538-c752f009c5ee"
                             }
                           ]
                         }
                       ],
-                      "ID": "6e411dff-c8f6-4360-9900-60e4a0788fc5"
+                      "ID": "a4f54e75-22e1-4594-b9d7-4608968bc43e"
                     }
                   ]
                 }
@@ -530,7 +530,7 @@
                     "ShowConfirm": false
                   }
                 ],
-                "ID": "54dd4afa-47db-410b-92eb-76f62f11a679"
+                "ID": "9387ea5d-c188-4fca-89b2-2e1c3ca83214"
               }
             ]
           }
@@ -634,7 +634,7 @@
                     "ShowConfirm": false
                   }
                 ],
-                "ID": "7061381b-7f11-4ed5-8a0c-d58bcfd1690d"
+                "ID": "4e6345ee-0b23-4b5f-8419-020de265bafd"
               }
             ]
           }
@@ -740,7 +740,7 @@
                     "ShowConfirm": false
                   }
                 ],
-                "ID": "00877fd7-c753-44b6-8a5d-b7990fa7daf2"
+                "ID": "7942c8fc-800d-4d29-ac63-29e03ef55d9f"
               }
             ]
           }
@@ -777,7 +777,7 @@
                     "ShowConfirm": false
                   }
                 ],
-                "ID": "d5bf03fa-e2ae-40ec-8a6a-5d9f80086b61"
+                "ID": "e572ac44-49e6-4fe9-8179-f0fa0737d3e7"
               }
             ]
           }
@@ -883,7 +883,7 @@
                     "ShowConfirm": false
                   }
                 ],
-                "ID": "677c9a6a-26cc-4407-9179-b4c92792bcd7"
+                "ID": "82c4a41e-ebbf-4ff0-8c6a-6f4a9e6101d6"
               }
             ]
           }
@@ -1037,7 +1037,7 @@
                     "ShowConfirm": false
                   }
                 ],
-                "ID": "2b618646-76ff-4fb5-88b9-b4178e45a2b6"
+                "ID": "99e114a8-3efd-4fb1-98f3-4dd8b64a2d77"
               }
             ]
           }
@@ -1176,12 +1176,12 @@
                             "BtnText": "知道了"
                           }
                         ],
-                        "ID": "200b3781-0611-4461-9098-d6b507fbc5e3"
+                        "ID": "12db943d-4e8f-444c-80a0-99e873b2dcce"
                       }
                     ]
                   }
                 ],
-                "ID": "b7ec1fc2-84db-41b9-8fdf-1c3181c4a04a"
+                "ID": "518cca33-556d-4352-97df-afaa16b12aa6"
               }
             ]
           }
@@ -1564,4 +1564,4 @@
       "Formula": "'任务-基本信息'!$C$12"
     }
   ]
-}//iJriwnJ6GZVbz0kjehFj/I/IkuFR3pn1uhk2+s6JJM7DFlAzTJeZT+fYuy4VJHJMZnTkrskJRh8qheQbd4t8HsC9cSkzu0qf3oI9mJnrYMVWjTx2pnc3v7YkUlM9QjqE6CARrkMIewJ0Q9toOtjpuxxjF66nVbgIhYY6twSs8Yk9hZzZuC0eiSPCq4D+kmZAiqKYfzHNbSPT37P/KGUhQNcmuzo8SFGI56yZXxi4X+Bgbzj25NzZxc9YkK9i+32CySp7L6P5P6G4hIPE91T+gOIVQI7D44Dt6I08QcglVOLK7TYqWobS9dOjAijmUtc6EETLdtEhS8XDjufhLnfC8SELZj+lxujyC8vXssXaUN4K5ugSoHUMtR7mg2ej9uzCMTo+AykabJT+OdUmil1309SEMPmgDeB+vNXgJ2i1NaFTgxRTuTSm6kVbwVVLP62Vt9Nz/LPiY4pCG3eXm8V+DFZMzcAJNA/soX4MO6pDAS8EBIGn7q+ne8qwh2j3zLUuTq6tcxduN2nfKZD8kkOSunzx4K9k0BlLzLgVW9PFWhbte3KXnDHrrvpXJA/o/M9dzb5ywVYhOJWjgA4Ly+ZNMmLWO0zKS3JPlK5HImcSdtgZIrX4lqIXtvDtViiVbQQFm/IcHulhAUSJp6fByGXFL6wfZWm3A/UQZJ4d8CiNA27FN7OnARtOKSATNv1X4on+oxsRjTH8kZAZekUOEr1rPUI9VH51hmfXdnqlqQAMfjb9ncIg8awY4CAVQp4nhvKVYUI9QwAVjBGMjYw9v9QfSN+R+QLra/NOEN2dP4WvfvtJ48dazsZbj2XCxtwce3JpKMBcrhvjR79A5itRWdwF1zP5V4uptJP3OYpMdh58huj/tcH+3TTctihx7UmovA1uTING+5Nk3Zj8Vm3NOU21Pg==|920
+}//0PvH6Erxsn2nMkTyqIbsCd8YD7Ftbw7+sTMbO9qqUSZbQKKxNU6BeLD7yhA78paflZIRRrs8iea2k/qY2JVYwHyeJ03u6u8BXGhzOjeraEOIbibwMAqixuhqIGmi8INDBF5BT7ZU00KJ+0Sm3tDde4ixMDV3wCvEZ8gOCLCk2VlQVc20geVec3eS1HjXXhELpn3a4yplQhkpjYFi8IBzxoCK6+KdnktcgguIh2R6ZAZqfPm1TcVKJJLVuGfdiHy4I/2suJe542Z6NQQMcO4RCCVwjlfR6YOF6n9Er/SggN4RG6Hm5Fpo1LDJfTU43xBIefsHeC2B2So+pdO6Ik0uFk3qU1CbJsH1NZosmDKm1t3zIMRCH5xIy1BWmEhCnNDP/H252yj6nn8DdJAUn1P2ZQli2W8v/yocjaDwaldWF0DzKrw5vm6kjrzS13RptP4B/ILpxVZDjVLTEHml53hwGwApHaZtmHZdSDuclDVe5Gfzt6+XQTXT9SYD9CMXPiCNIlOE4NDX2wk7tlFyqCt8zF79gYAVtipE8LCeo5Z/01+YDFZUrTS0T7L7ORyc/uH9FCc+UMhVv3n72VIuQy5iX8UnHh53a/TEHwY+eYxGoj9JxNBvPjomYE0Eqzs1GuGnKMy+y3/Tq94bJa+E4WfEP1pHurxWKe3vrua/oCXlDhEN3//YVz6qaOpZDW6xZyh7ftffb9uiSo8mrKp797ARtHAGpXhgE6IU5EVD3Kq1VXqdPXfloNO7Qmt4EcfpK9wCyHBJyDW3fBY2I7G0iGPFQnPKJCOcMdXx9CsTQPmyT1hrDwtk6WubN8+njsPvXHYY+KN+EgH2Y0FkbhyKN5fxpEka5X4EVrB3UcbX+M/Xm0CSwtSMXz5aP8/XVf6X/wsqYO/orfym6UURmvV5EGoUUg==|920

Pages/任务/任务-基本信息.rd

@@ -4,7 +4,7 @@
   "RowCount": 16,
   "Formulas": {
     "11,2": "C16&\",\"&J16",
-    "1,18": "IF(折叠全部=1,\"展开全部\",\"折叠全部\")",
+    "1,18": "IF(折叠全部,\"展开全部\",\"折叠全部\")",
     "13,17": "C14-任务总计划工时"
   },
   "CustomNames": [

Pages/任务/任务-子任务列表.json

@@ -153,7 +153,8 @@
           "Name": "项目2.svg",
           "Color": "Accent 1",
           "UseCellTypeForeColor": true
-        }
+        },
+        "IconSize": 14.0
       }
     },
     "0,20": {
@@ -211,7 +212,7 @@
                   "SerializeProperty": "='任务-子任务列表'!C6"
                 },
                 "TargetCell": {
-                  "SerializeProperty": "=新增任务!B16"
+                  "SerializeProperty": "=新增任务!B18"
                 }
               },
               {
@@ -220,7 +221,7 @@
                   "SerializeProperty": "='任务-子任务列表'!F6"
                 },
                 "TargetCell": {
-                  "SerializeProperty": "=新增任务!J13"
+                  "SerializeProperty": "=新增任务!J15"
                 }
               },
               {
@@ -229,7 +230,7 @@
                   "SerializeProperty": "='任务-子任务列表'!I6"
                 },
                 "TargetCell": {
-                  "SerializeProperty": "=新增任务!J16"
+                  "SerializeProperty": "=新增任务!J18"
                 }
               },
               {
@@ -476,7 +477,7 @@
     "Styles": [
       {
         "FontFamily": 0,
-        "FontSize": 18.666666666666664,
+        "FontSize": 16.0,
         "Foreground": 1,
         "HorizontalAlignment": 2
       },
@@ -627,4 +628,4 @@
       "Formula": "'任务-子任务列表'!$R$6"
     }
   ]
-}//FqwORxC5q6lYKHBuufBD9hBoeETZ9/pGF8J2no295QXDRegMBMIy/7RSqtWIoeDsV1Av9emZbsHt38Pcb1Ylc1D4o9uPbX8JdRk7Dr4ZNqpxEutDuWHTFWfhCJt/cGQ8l+hSJ1d51LzRCOx8fXuCdjyXqEgsC6YLIumh9up1oI5QtLOtL+buaHnOTRd8suTmVYhKOGHSqGBp08Ylirdnn3GEeKlF69CCpxbtzUsm3suE3/Bb45Pg3XpOCwoE+HRWwGpE/g1XQJoqkmfL/VwUwqnc+XV1khyzRuYbVzgq4yiOqymsv4V21990/jl+MX2ZOjBDt3mtUgAYuqUGx9mxGhGOUYgiznUoPiaOo02qrqVGSdQy+h/wj/lI79Yt+D4HAUdzEgHoULHwy/Qmt8msv4JFKuz781eJqjrwGzJUK2T0UZNbOGng41Gy3HRFmUMXT5Ma7UbEGWuLkWGmijJn1hom9XI7/YFtw8NgMMlixtGx6H/emnsQFtqJRSJnNps+Bv/u+F95cub4+3eeq/x8DiTryxaUQHTnW+9a+now3P+0oxQgEPce09pYasPs/sGiagK3M37O8G1nwXjZtWIK+QJDfMFacO+y4BhvHvwjIMFvaQI8FNDYoOZ1BC/8eyL9LoGCSbhVTSQLm9Mo6mY+94xDECuqxAToXT2d6N809Bryk8VBAf8Fv74dFXuxNhiLS01K6aQhwc5FgExdyKDS7k22SqSFpA3mvEAN5Q36TWKFTz4Jd48Cxcy0unE4EC23nrvVkARQjCTyXPvkYkA6BAaWbNDhQ7oVHdTz/EPvD52ztR85/2PI1lbkRfwN6t+dbyJKlvhdwS7hBW2SZAAtd1chdA/LYptnpbyfQnD71F9CaS3NyevzgehpO7nmoo/C9LXg+uhZxY9QbcDkhLmdbg==|920
+}//oYhepS+QqxuL+mNH95hHvYh39XZidQtu7A8fVKl0X0AeUg10d4kFx9l+UJqErcvI6o7a3+D+wtSgOvoXuJZmb8Zx58Bg60FRbB5fgtYYaY2ZNv0XxDkdQz+y/HtVWznGaZAvDkKtHKR18NACkS4WQ1j2+Ee2E3JcS12e3yKyS1hIHJlIBkbIq6Smmnu6DgznBeJfX7YeGFEQDhEbLIugXJ0P5F1pfHo2iCSrocqMEbFC0pfId6H8+prNEodxuJN6vszutsY/DlhWaSvmWsAOj7/ANqZuMOPxq42IDiSPNGTikpaomZMfkwBmfeYw28qBXJLld7156QAlxyx26hWtviTcHJl6W1Jp02ZcaDqCQTC3zqBnbR3j03e0kiIsOlr9U2uHkP4Lt0ylQ9ZwrpPbMPcrcOU0abB461nacAszHhUSSrkMqTU2XvsauufHdEAW5e6Wmhe9xOrF6TnQN64akluR2tQ2b2PQ7D4ZTauSrpxHXPD2JWgQ3aU+drBTMzZR4f7Tj/qvoKPXV2VYQcU4C2EppTo7RJr1h57RyCTRRigz6ygiufMm4+CwEgaNFCDWttjroKzF4yHU0vLVRPTbfqHEhQ67sfIjGc6eOArTMwBRPzZLYKgwZPCpIqRaTLlzvOHXphWEvmBJ41gv0EMxcbxbtof8Rvkbp5Mi/Rxbesu4T8doJQfPY63gdwab5lpuBlh5YzYE1SfpG1OaLE/RsbjBSve5hnLWIsvvKhbkMiUs3PdJ2qWqXm7UBAyLwpBVxWt4xayehomg2YbGmXHq1tu70kdG+afXvhzrIrz0QRjwsKa0NexvzevadFNW6Qi9tZ3bXVilOCmiQDtJkrLT4rkRIeYu+GJXt2ga7zkY/cmNKaAk5PyloOGzwzISq+6Cq1IDIHOLA5fsSIemL+a0bg==|920

Pages/任务/任务-工时.json

@@ -220,7 +220,8 @@
           "Name": "时间1.svg",
           "Color": "Accent 1",
           "UseCellTypeForeColor": true
-        }
+        },
+        "IconSize": 14.0
       }
     },
     "0,23": {
@@ -302,7 +303,7 @@
                     "LoadBindingDataOption": 1
                   }
                 ],
-                "ID": "d1812aad-7ab5-427f-b7b3-ac4f5e4a06e8"
+                "ID": "7eb2b2e7-766d-4ba2-a2f3-aa1fdd370bb2"
               },
               {
                 "CommandList": [
@@ -341,12 +342,12 @@
                             "LoadBindingDataOption": 1
                           }
                         ],
-                        "ID": "9d2b57be-d6cb-4f18-aa7e-0504e7ef4ca3"
+                        "ID": "06b25f8c-a30d-4005-9e18-8b3bbec3467b"
                       }
                     ]
                   }
                 ],
-                "ID": "b252d2be-40b6-456b-b3fe-d36632f47021"
+                "ID": "a48f3a99-0b41-4a3c-9e64-a209b0fef587"
               }
             ]
           }
@@ -383,7 +384,7 @@
                     "LoadBindingDataOption": 1
                   }
                 ],
-                "ID": "844e9cc8-f688-444a-8af6-28fced7acd87"
+                "ID": "bf32077c-7ee0-46ac-8d04-5a43df93f4f5"
               },
               {
                 "CommandList": [
@@ -422,12 +423,12 @@
                             "LoadBindingDataOption": 1
                           }
                         ],
-                        "ID": "52354edf-b7d4-4cda-8909-2826850975e5"
+                        "ID": "8d9d006b-e3aa-4c6c-b167-0ce321f22695"
                       }
                     ]
                   }
                 ],
-                "ID": "eaa4caa2-144b-4cf1-8be9-716c2fe32c47"
+                "ID": "67286156-56e4-403a-a9dc-f1e8a091d963"
               }
             ]
           }
@@ -480,7 +481,7 @@
                     "LoadBindingDataOption": 1
                   }
                 ],
-                "ID": "36d86a32-3c0b-4989-aa18-4ba7c776258d"
+                "ID": "d2e91af0-bb92-49c8-a9ae-d57ca04117b9"
               },
               {
                 "CommandList": [
@@ -519,12 +520,12 @@
                             "LoadBindingDataOption": 1
                           }
                         ],
-                        "ID": "74a8f4dd-323a-4e73-b1d5-e7b112423033"
+                        "ID": "2c546602-223d-4e88-9c18-66b70f5a3054"
                       }
                     ]
                   }
                 ],
-                "ID": "19f628e0-5b9a-4d3a-8d06-4f56a3fd198b"
+                "ID": "cd95b67f-a6cb-4c03-99e5-edf7e61cc346"
               }
             ]
           }
@@ -569,7 +570,7 @@
                     "LoadBindingDataOption": 1
                   }
                 ],
-                "ID": "ce14dd0d-3a61-49d9-8ee4-937b10c4167b"
+                "ID": "45b95b28-24c8-42ec-8d53-7696471c3d28"
               },
               {
                 "CommandList": [
@@ -608,12 +609,12 @@
                             "LoadBindingDataOption": 1
                           }
                         ],
-                        "ID": "400b6288-b3fc-45c0-8068-6b63ea70d844"
+                        "ID": "38be685a-a5e8-4f1f-88ff-5458fe5ef9a0"
                       }
                     ]
                   }
                 ],
-                "ID": "9f9b0923-44cd-4ff0-8314-719884dcb024"
+                "ID": "22e66c67-a638-4f4d-9378-dd16c130ae3b"
               }
             ]
           }
@@ -846,7 +847,7 @@
                     ]
                   }
                 ],
-                "ID": "24d19063-fdab-41e8-b07b-7067357b8d4d"
+                "ID": "377b6831-6479-4152-9a1f-49fc60e68644"
               },
               {
                 "CommandList": [
@@ -876,7 +877,7 @@
                     ]
                   }
                 ],
-                "ID": "269e504e-d11d-43ee-adf8-a28380712b6a"
+                "ID": "97836f84-1d4b-4d8a-a5c5-80f8b87ff8a4"
               }
             ]
           }
@@ -888,7 +889,7 @@
     "Styles": [
       {
         "FontFamily": 0,
-        "FontSize": 18.666666666666664,
+        "FontSize": 16.0,
         "Foreground": 1,
         "Formatter": 2,
         "HorizontalAlignment": 3
@@ -1129,4 +1130,4 @@
       "Formula": "'任务-工时'!$V$12"
     }
   ]
-}//WT7yyZS+v+bYOb5xjSPSQy3PFmMaLbZhJHNN+65y0PBKNT8AGfIir3eUYaTQh8wVgVtaXjKP8aqr9Zw02FpwfeRvrP7/wwY+s8M8fe69AY0KOPloBH+qTrhlnKi0VHTl2dQ8UTe2nWkDu29rm3W5/LIueQ8+m+5sW4ioY+w23J89GyfQnA6ayep0h70ULj3kpqn0fG6U6zlNeuLlPNKl55ZmE3eOrfQwFWsuJ848S9E7qFRJFsYpN0X+caYOWTUi6oNlyfHVfg9r3OULCbZ3sjU2cvDtku0lcJpT4R8QpIrQjajdRaGUDwrXNG72oFCMmBzEw7Dqgzz5fwN2wf/3+IDLtiH6QoT5vxfw/strlCbFNEw6YL3rTtbavyAAw8JUd9PPTBHEH9ASLhd05Cd2EqztPbRlQK752BwEFkFydo7GUa1UsM444FnshnRqFBwmF7Z/uEA+fTmm2ax6iINSTs+x9O0G17+b56SFbi5LkGLOo5uB5MaAFlG383CAobIPWPHBAxhu9qFzaNPavMBvQAxItri3qW1AaRP37FSN+Rou++PeauP686lrOjZpszO0n/fqvj0jeYYLwBYzjGsb25nPvVJvGJQSIsHwhSMRHeKOJ0soTn4H/SLiTYJykkxHPZe/K/izXveccYUdm251r8gQsqDBlGWwDGak9CkHENawlKgUCnqLMYmLK05WXFa5sn9YK9HlpaV02GqtcW9I1DFhGAvJT23aAsFhLFwBL0rvmhS2SdxeP4z+tbuNndoHzjydryAdwMT/jyKBD3Tp0GQ1QRSocRnSENDOd4Prq7BAq+FaA17UZtr5lScx4xxnakQFca7KQNxAlLvLNc39Jh+2vsV59rOHfrb5C7KuwVwTUAcgwov/+8M0XoLSI3pdnDPFc/mztGiOO4Q99AaAmg==|920
+}//tHPeDhkHs3eFkvP4GMKSbZ7QTtQr03QHXVRiPKAAw9xiu6qwK/T5IwDoXigpn0mOaNYeVqwCIIcsxV6fZT3IbCfvPzTuq41XBZMUNgqIxbcJjlKxEMrK6UIZCGQSD9zifCFk+yxrSesoPVlB2kZ4OzMEylOQHSh8xMk4AozXieCR4VZRQjj4S5FGBc11ZvjNqKQ27ksdTcBjodkkonji3eKwQzHY0rg7pApIYsD8HyyNeMdRRd/WV2IyutdWwZ5yJsAYH/aEdqrqiRCABfOpJ2PCwlUZJutqSUvqlfGc4OFlGbtO4S7bYlNy0xBLUXHhvpiMelULDYlmYjLwbtQeHr5iyBXYCO3oDz9AhpYGCpN3ZRBLs6EnYJDOfC+uk8MCL1Tb1rbMGie43as12BDgF683g7FfwbfLoWtVawjMaDgodVQARDaBfYYR2uHAxz0a2sndnDzceMnw/Pq0c0vVd0Ekd3VBCeYj4Wo31e2ycI9O4ypn/5VuIfZZkVf8/h1mePY/G6UhscqDrTc9JOagSXTYMJHuxNCCK9eDCDHbs646VRhodVo/y3ld1Uf3ucK0XuRDosJSjCtEaOQ1Mnsuv7FOUcXhiH10gwzM7hGVGldnNqSr/4wMB22V5y9UdnxuH/dNrJHthZ1tAvnOgAF2mjale/26bHHAi1i/1NElKECkV7Or3ahL8DjADRYC+nWt4liyRYkD5wq6eHJmoCgF4hGg9tTIDCMJZvl/E76gEuaaPROaFIhHqTT9A/993QRO7x6bIM3K/KBy0FEcyb6q7ef+/VtJM1MAOXyzECNjie0uc8+UAlYvd4kgEVQiekTwBKRc4z6XXQbWCwL1V4taYyp9UdQ9T9iUm6g4Q8+mP5mTcA/S8OMs/VIWQiiDyWHHgnZIfkTGQ7njmX0osjLu6Q==|920

Pages/任务/任务-进展.json

@@ -176,7 +176,8 @@
           "Name": "报告.svg",
           "Color": "Accent 1",
           "UseCellTypeForeColor": true
-        }
+        },
+        "IconSize": 14.0
       }
     },
     "0,21": {
@@ -377,7 +378,7 @@
     "Styles": [
       {
         "FontFamily": 0,
-        "FontSize": 18.666666666666664,
+        "FontSize": 16.0,
         "Foreground": 1,
         "Formatter": 2,
         "HorizontalAlignment": 3
@@ -554,4 +555,4 @@
       "Formula": "'任务-进展'!$S$7"
     }
   ]
-}//EqJm0NYCtGSZ8ZrFlZLK+dgq9MWOgv+vxFQNu6tq9vSoYoWjAH0fTBSOdZHIAwp2UvzbNq0Cuso0quTHOELL7J8L7TKWGFm5QZkrrb1KSsrgz7u+5mLs/j1teod4Cv/PJTiYd81p0FoG8XVf2HT3GsNv31rWbYujP9smZP0T7wUwIJP7wqMIgAZiVxmqRm9U4sU/YVH6IIpOtnf5VtOJXFATOyYOo7ONGGnHrM+YgOab2KGAjyvLAma+RQDYI4bB8IPs4XXaCYwY3345YL1PzEjYZ7JvsqbQODIoKLH9+lnMoH0lt9gRyKYBJTImAKaf4mt2zbB4CUIbAqauQ2PQ+UlyDn4DfI8qYr/gYuJWtPit2kOnRJrPuExtBv/8byeTqwgdXnnATM3g7WtEhe21Euno0nDbDWAyAGnVWNrVjSXzU3tWEm1pPrqkNFNhQ0hz24+Fo+1cAcAMcWqC6gIJ5WG+LQ2vuBZE2PBZi7r+mUBLcHdrNVEy+beaosclSgDE3m9VElXze2IsHbrp5dTEYsqp4OU+TTPhsXFx06KIprnEMCGQNiZaQkxCHSEdlzlg6QkMrbpKw7/+/aRiwpToAdLxj2XMeiE7vqa3racKNhJa0hGlXurVHdZSEo9p0gjswKroOjtHrKVAYo1sNrhsIh/BdVXHzPexMb/i0v8VgRANrWKUsKJRxcdYhlhnFP/MBdFfpG9li4m7MHxa8MYgeSLP2C2UGEE6pzd3EAhPex0Pji/Rzd9kPIY+fj8ORRWaoQh/qvyEAdP1hnoJCdorZAeiszk6EsFW1wpwzP4uX5js+dtbx+mSh7myZ8uqo6I5m9gmxMV3ay8AGZeFhACVoAyodaxfCvbaGZUS7q5tg/ityYD7RhjiuMbMW2yM6X7gxjppajP3Vds6PBIhdlBTgQ==|920
+}//InizghRpmIWFSNJNl6/78Onqgfh3YtQFI9beQMFE5BBU5bFsWFyM5AnCREWIeVyf6ZwjHLv/44bmlq/JWeB+xP+hyFMj9n/Xi+LhzAEEtgwZCVd50QyRtLkGQRL7bxbmFZpWM4TUMowL3xPrjK+xS3z056Wi+zQai6Jog6HCsrPOCo+WovhAH8UHcv0iDGpvsuxXhICdfAc92BSq15v3cyLsw+trsAyJ48I/ABDjHyzO5DDr6yn+1oRtuN2I9Lx9f/INE+iGsZJaSt76hZhf9/OPEuRUsqOi03pPQzjVpne3d0gtpPVTbqfKbZUxLxG0Ri3a+uyOeRtd4S3PeD5RvcElFEk/jBi3zIclM/NTulEXEnj2fMCwRDQIWVpxAE3CvWANm93l0mbkqJwqWzMa7CkG6lPor3RcRcbgQ7GIs/sxcoQe0iyi5DVWG0FReYTX/eOZqVtdCqR/sYMod6RjA8LuG6G0mT/ogKmpL8xSxhB/W9tcQdHeVTwuE83oINtzurVwwYOYBNiLkjplceO3fuz8dXKZR/JVoHgZ+Ii32SiKaj3bK6gpByiYuxNyiLi3MWRClafTXYPzL9jI6gVtUyWjsjgn3EwFVYvrY7yRSAZAJtUWPbj9yIpAm9EEZbz9EzxJQcNSxUazPNZHX66LKap8+cYhWCaa+PNsO07ujH3MwG3UyJeuyFXypKs3K42tpAr0+h5cHHH3VDaKOZlSc9i54i4CSH5yB90jYnv7J9sgVk4W2TKmypJWH2voPGQVv1gtAWN2nMnVq3JsftXWd5h50UZD10qXtnbUwReT9wUOMdbZOfzdiIQR+t+76cscqlN5LUoyhWSHHplOBSGBh9I28ChtiuTzn4umXz55WF6wPjiZnF9e8L7uvk2qGjfC/c/ztpzBMnqKWF02zx0ubw==|920

Pages/任务/任务成员详情.json

@@ -31,32 +31,12 @@
           "DesignLengthInPixel": 35.0
         }
       },
-      "8": {
+      "6": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 35.0
-        }
-      },
-      "9": {
         "GridRowColumnDefinition": {
           "DesignLengthInPixel": 32.0
         }
       },
-      "10": {
+      "7": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 32.0
-        }
-      },
-      "11": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 35.0
-        }
-      },
-      "12": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 32.0
-        }
-      },
-      "13": {
         "GridRowColumnDefinition": {
           "DesignLengthInPixel": 32.0,
           "IsHidden": true
@@ -64,9 +44,9 @@
       }
     },
     "InLogicalVisibleIndexes": [
-      13
+      7
     ],
-    "Count": 14,
+    "Count": 8,
     "DefaultSize": 32.0
   },
   "Cols": {
@@ -157,11 +137,8 @@
   },
   "Values": {
     "1,1": "成员",
-    "4,1": "岗位",
+    "5,1": "取消",
-    "7,1": "任务时薪",
+    "5,12": "保存"
-    "7,14": "*优先级最高，不设置将会采用项目岗位中的设置",
-    "11,1": "取消",
-    "11,12": "保存"
   },
   "AttachInfos": {
     "2,1": {
@@ -246,274 +223,6 @@
       }
     },
     "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": "b9b38ece-ff9c-4a10-849c-3bebd6e69087"
-                      }
-                    ]
-                  }
-                ],
-                "ID": "0cae2991-5668-4b39-b4da-52e343570dfc"
-              }
-            ]
-          }
-        ],
-        "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": [
@@ -525,7 +234,7 @@
         "TemplateKey": "_RS_Information3"
       }
     },
-    "11,12": {
+    "5,12": {
       "CellType": {
         "$type": "Forguncy.ButtonCellType, ServerDesignerCommon",
         "CommandList": [
@@ -621,7 +330,7 @@
                             "CheckDataValidation": false
                           }
                         ],
-                        "ID": "ededa6ee-69b8-40f1-8963-36aa33ec5198"
+                        "ID": "bd721641-356a-4fdb-b563-850619a747ce"
                       },
                       {
                         "CommandList": [
@@ -631,7 +340,7 @@
                             "ShowConfirm": false
                           }
                         ],
-                        "ID": "024abb8f-df0c-421b-8d74-c65eb261240b"
+                        "ID": "eb46921c-c5dd-4c60-ba86-fec56eeacaee"
                       }
                     ]
                   },
@@ -652,7 +361,7 @@
                     ]
                   }
                 ],
-                "ID": "bba235fa-32ab-4438-b98f-309d8f937924"
+                "ID": "3aedc31b-3a26-4266-aff5-303537603484"
               },
               {
                 "CommandList": [
@@ -662,7 +371,7 @@
                     "Message": "请指定项目和任务"
                   }
                 ],
-                "ID": "a06eac23-d2d7-4c03-9a49-0d74d3bb80c7"
+                "ID": "656a62ab-246b-420e-a9a3-a506a4291d6c"
               }
             ]
           }
@@ -671,21 +380,21 @@
         "TemplateKey": "_RS_Main1"
       }
     },
-    "13,0": {
+    "7,0": {
       "BindingInfo": {
         "TableName": "任务成员表",
         "ColumnName": "项目ID",
         "GUID": "250b5313-3bbd-41bd-8609-28bb67513d07"
       }
     },
-    "13,4": {
+    "7,4": {
       "BindingInfo": {
         "TableName": "任务成员表",
         "ColumnName": "任务ID",
         "GUID": "d2e27dcb-2fc0-4a6e-b7ff-414bab3256f7"
       }
     },
-    "13,7": {
+    "7,7": {
       "BindingInfo": {
         "TableName": "任务成员表",
         "ColumnName": "ID",
@@ -704,17 +413,11 @@
         "FontFamily": 0,
         "FontSize": 13.333333333333332
       },
-      {
-        "FontFamily": 0,
-        "FontSize": 13.333333333333332,
-        "Foreground": 2,
-        "HorizontalAlignment": 3
-      },
       {
         "BorderBottom": 0
       },
       {
-        "Background": 5,
+        "Background": 3,
         "BorderBottom": 1,
         "BorderTop": 1,
         "BorderLeft": 1
@@ -729,7 +432,7 @@
         "BorderRight": 1
       },
       {
-        "Background": 5,
+        "Background": 3,
         "BorderBottom": 1,
         "BorderTop": 1
       },
@@ -741,18 +444,16 @@
       "Strs": [
         "Body",
         "[AUTO]General",
-        "Text 1 50",
-        "Right",
         "Background 2 0",
         "#FFFFFF00",
         "black"
       ],
       "Borders": [
         {
-          "Color": 4
+          "Color": 2
         },
         {
-          "Color": 6
+          "Color": 4
         }
       ]
     },
@@ -766,91 +467,41 @@
       "1,7": 1,
       "1,8": 1,
       "2,1": 1,
-      "4,0": 1,
+      "3,1": 2,
-      "4,1": 0,
+      "3,2": 2,
-      "4,2": 1,
+      "3,3": 2,
-      "4,3": 1,
+      "3,4": 2,
-      "4,4": 1,
+      "3,5": 2,
-      "4,5": 1,
+      "3,6": 2,
-      "4,6": 1,
+      "3,7": 2,
-      "4,7": 1,
+      "3,8": 2,
-      "4,8": 1,
+      "3,9": 2,
-      "4,9": 1,
+      "3,10": 2,
-      "4,10": 1,
+      "3,11": 2,
-      "4,15": 1,
+      "3,12": 2,
-      "5,0": 1,
+      "3,13": 2,
-      "5,1": 1,
+      "3,14": 2,
-      "5,15": 1,
+      "5,1": 0,
-      "6,0": 1,
+      "5,2": 1,
-      "6,1": 1,
+      "5,3": 1,
-      "6,2": 1,
+      "5,12": 0,
-      "6,3": 1,
+      "5,13": 1,
-      "6,4": 1,
+      "5,14": 1,
-      "6,5": 1,
+      "7,0": 3,
-      "6,6": 1,
+      "7,1": 4,
-      "6,7": 1,
+      "7,2": 4,
-      "6,8": 1,
+      "7,3": 5,
-      "6,9": 1,
+      "7,4": 6,
-      "6,10": 1,
+      "7,5": 4,
-      "6,11": 1,
+      "7,6": 5,
-      "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,10": 7,
-      "7,11": 1,
+      "7,11": 7,
-      "7,12": 1,
+      "7,12": 7,
-      "7,13": 1,
+      "7,13": 7,
-      "7,14": 2,
+      "7,14": 7
-      "7,15": 1,
-      "8,0": 1,
-      "8,1": 1,
-      "8,15": 1,
-      "9,1": 3,
-      "9,2": 3,
-      "9,3": 3,
-      "9,4": 3,
-      "9,5": 3,
-      "9,6": 3,
-      "9,7": 3,
-      "9,8": 3,
-      "9,9": 3,
-      "9,10": 3,
-      "9,11": 3,
-      "9,12": 3,
-      "9,13": 3,
-      "9,14": 3,
-      "11,1": 0,
-      "11,2": 1,
-      "11,3": 1,
-      "11,12": 0,
-      "11,13": 1,
-      "11,14": 1,
-      "13,0": 4,
-      "13,1": 5,
-      "13,2": 5,
-      "13,3": 6,
-      "13,4": 7,
-      "13,5": 5,
-      "13,6": 6,
-      "13,7": 1,
-      "13,8": 1,
-      "13,9": 1,
-      "13,10": 8,
-      "13,11": 8,
-      "13,12": 8,
-      "13,13": 8,
-      "13,14": 8
     },
     "SheetStyle": {
       "FontFamily": 0,
@@ -858,14 +509,12 @@
     }
   },
   "Spans": [
-    "13,0,1,4",
+    "7,0,1,4",
-    "11,1,1,3",
+    "5,1,1,3",
     "2,1,1,14",
-    "8,1,1,14",
+    "5,12,1,3",
-    "11,12,1,3",
+    "7,7,1,3",
-    "13,7,1,3",
+    "7,4,1,3"
-    "13,4,1,3",
-    "5,1,1,14"
   ],
   "PageInfo": {
     "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
@@ -894,23 +543,23 @@
   "CustomNames": [
     {
       "Name": "项目ID",
-      "Formula": "任务成员详情!$A$14"
+      "Formula": "任务成员详情!$A$8"
     },
     {
       "Name": "ID",
-      "Formula": "任务成员详情!$H$14"
+      "Formula": "任务成员详情!$H$8"
     },
     {
       "Name": "任务ID",
-      "Formula": "任务成员详情!$E$14"
+      "Formula": "任务成员详情!$E$8"
     },
     {
       "Name": "项目成员默认时薪",
-      "Formula": "任务成员详情!$K$14"
+      "Formula": "任务成员详情!$K$8"
     },
     {
       "Name": "人员全局默认时薪",
-      "Formula": "任务成员详情!$N$14"
+      "Formula": "任务成员详情!$N$8"
     }
   ]
-}//zSd3MBIkNRx30w+HZuEYNILQp395/KOCqdhDdqxlQUFLbxdaarRwhRjqGY940OS6KfaXtK0IRwdl/xl8HMdSCc2niQliEqBCDBlGT0xdkcSBB9BrZUXRHWwC7g+EYd7T5ofzrbN+QTlxczO92svs7giac/uZN6qHftL8t0m3jrk0z1vi81WkOVFLW1Y5wvnBvRHdwZZvoWDlZhiHd/fe8lVh96P7iAy5XnyC6bf4+pfpTcI7riZ4EEpFa/kSqnVqP1ErnSMsNet3Qyb4hEZwETHJLB4G5RPDq2/GJJl8V48PEQ/CglUZgOSwkxWbhmR0skrIDuoNIePvgkzkovw3I6lDaZJK0SPmNtRBztdRFRfE0ILMUuINjSjgrZRrtIXCKbcbIMBTqk3PSpzrog9HtNucxs3rNhoIW+ExfJesulgzuNq4ZR/iGSfBVJgjc5jzJIcr/0+ANYoRwkpbM9kUdoVacKKd62Ae68iqFizejhrMayqzfEvzqQpbRyu+VlnTqWYpx1HBocpqSVWym7Iz4/lbPysZHFqILMHcYHpmW5VWpV66Fe6qMXQ1Aasat5tPRSluj8ahDILv+rBipnxjZ5JPkqOAjZyz9JYiRpEqYB8dEmVcYELf6ZTDltDx5vUflOYsOk0u07YHH8j7mWis/JHhFIBGbJiiMRBIdLgfY8rTALPgZmgMyi9LX9q2Y47fYNp4dlQ068RJeIFM7/iIHildZ5qNemD6tH5oXXMsOayqiAh+RM33cyEPedrVA2FKFyLiWJJZrNuLlOer7Z2opweUc0TbuHqQ4TjqTn+l4WFXBNPLTuh6JZp4Tghja9bsQ8groJ6kn7bE1L0LPGGnxqIXJI/2MX5/mwiE9zjncOB0mcBd4VvqiRNOXeflGBAjaqhdl59Fu5+BsXi2JgkH6Q==|920
+}//SajkLoGljcezpLMy+hygPpRLPuT4GMIf00OWNcMrexXt8OHvQb6HODwhs6W8Jf7eURj3sRMsjUi8zI6bz7zhLgsjx+nJGh+CrMwUmcE76LS+XLwra8rJkgTrThl88qh4vGk0v6IBfopR0uYddx6dNWCSjMuT7MFO+6mrCkbw2qqTpBAIoaPu2LN380Nbi/IRH33DZY1x0MgHU1jomEUWwuSthByHVClCL+lFfTHOqmlAXbO/QEiEcVjYR4ezX46gtjWyzvqhrzpCwkvTJmH2qUX4Ct499NhLuzHHHs5uXcPAou9CQjuyK4lBlHqFfsWAS1K4bfo7B4NMf1hG03Ph2wQMH4E2ARkycUu7RdmnVdKdDhFg7JxSL12u6fBBaAgmTEtNGRreIZsVZnFw7ipLAlFz1z73H9AbQqPgEMQSOgqGP9vzzcF7eX9HZOZsDk2vx/FwvjmwZ7FJyLxbkJot+1f4uYZUJiu/jW5AB9xmL1qq5mNctqXd4Vovn7xVlCzQgJVfycizt/6CHOANNFC0MutPdlotNELIMkzsU/+NkY+dFSVuEI7JLZHrAQuPk+kXrtBMuxezN7sJnhM9V0d5UeKp54VyTbcnTp0YzmsCTT4LrPN5GwBVIX0d1tejI7Z6Oj75P8TJLfB5fKCv/5rdlrBx1nSgV9S0YtZp/JNsnj/0YzNMYrEcRfjRSFGmzGMkqE0NHYJ+p9Z93ZV6vgGC3taa1o/rI69SiuebohWTVq/DYTsuuwbkVCBUk8dGfkHCObQCw0NQJLR0YJYa80M5kPDKZrJbg9dKZdg2rz58f7gnNchbtNuu/Jk3ZixPmfqyHn8S9oWErRqSsz9qyHFhz/CZJJwjYtalJspvkEuZ1dcJR9SMpng8UQgAZRXeqJHcVEW0IBzVAq0rohL5P3B5Kw==|920

Pages/任务/任务成员详情.rd

@@ -1,27 +1,27 @@
 {
   "PageType": 0,
   "ColumnCount": 16,
-  "RowCount": 14,
+  "RowCount": 8,
   "CustomNames": [
     {
       "Name": "项目ID",
-      "Formula": "任务成员详情!$A$14"
+      "Formula": "任务成员详情!$A$8"
     },
     {
       "Name": "ID",
-      "Formula": "任务成员详情!$H$14"
+      "Formula": "任务成员详情!$H$8"
     },
     {
       "Name": "任务ID",
-      "Formula": "任务成员详情!$E$14"
+      "Formula": "任务成员详情!$E$8"
     },
     {
       "Name": "项目成员默认时薪",
-      "Formula": "任务成员详情!$K$14"
+      "Formula": "任务成员详情!$K$8"
     },
     {
       "Name": "人员全局默认时薪",
-      "Formula": "任务成员详情!$N$14"
+      "Formula": "任务成员详情!$N$8"
     }
   ]
 }

Pages/任务/任务首页.json

@@ -197,6 +197,7 @@
     "5,7": "项目ID：",
     "5,15": "参与人数：",
     "5,19": false,
+    "5,21": true,
     "6,1": "工时分配方式：",
     "6,7": "总计划工时："
   },
@@ -270,6 +271,7 @@
     "5,21": {
       "CellType": {
         "$type": "Forguncy.CheckBoxCellType, ServerDesignerCommon",
+        "CellDefaultValue": true,
         "Caption": "折叠全部",
         "Style": 1,
         "CommandList": [
@@ -606,4 +608,4 @@
       "Formula": "任务首页!$K$7"
     }
   ]
-}//FEWyRMsH5Qa/QB774LlDuBOCTRl02zsfDOHJ6CTLDIP5qXuyEw/776vKgRL+qdcsVrup9/Aqh8puca90YblMEEXes8C8iQwP8q4L5t2+m6UgOZS1CJ/SU2wibXcmjmGkAoo1IG+M87KNjt7K4DqVuGJc6xezf+JsQ5SLbhwnxCOdimAik0//Goth3YUC28Kc07kW1tQn5Ki0ORK5UXoCyIheprzWWWN7cGfLlUtWkGmovbogtFEdReCZaqLPpvVQ6iP/oOzp7lSEzbTADiWfX57/DfsOo6dj8Kc/vPLc4AadvLJOHPGlja03OqSn6p9s2HKIkHdKeRMBpuWs1AODqN0uLcflCNTWTG7qA/MCEfboU2o+bxQ/YyLNJfelC2w161zxYnEp4Xm3/Xb2ir4CD2Ljv0Ep3OtGZHHmr+lPZHY7wzRzmsL16uGIxDzRiEgKXRUDvs/yVTvj77QqwLOWIsgyLn0joibufkSWJVsvU/P23i7dzVmgxlO1QIbU2FFtkwYIr1Xf4uCAoAMG8aPVCMUn8AkcMF8JrEq4eIvb6utvj8UPn1SMBl2mSnsYOPbx7Zydv8q9oVbPO8UGQQNWez3/GnGqNqq21Quh9Q0QLlaR0L3RpHmuncVQEtC6x9MVY87EQbyzSLAbHkaAKZBf8jeGUAUELHaA++NB10EikO9fALzLOu/nU5auQ3g6DP3CWpGq5VAPX3SEbgI9uCql2bLjT40AUHVOxy+IAv/W0gxAKFEaUEyIYW8O9R+1MDDLrW2zpzmuDDeciMZDtR6ogaOvY/J8TMVH9Ph0APO/CnEaAKs0yVMzM5K2sWFcAGLQSuRIyuAruwP2EsHZ2UeyFx7vccv0DDesQtw+a7XQ6bO21sUlflQs6dOsVbYajXaB5oWGx6JyGxYHl3y7KjEXJw==|920
+}//c4Kxz1nhk6ja5Qxk0OMBpx6HdzMED1fEnK3Bdyya7oLzjCMdinnPXy7Fqir+xdZUIrFJhKsAQL2HmwKDoPJ5UP5mwGsIueuyPX7dqt/w7m1/q6VqPJ92TaS3W6JZ9Ufv7dUBBJ6xuJ5ylKCbhkQ0fvczEBuRzkeReOAe/+wPn4Cr/t9eP/rZDSqEWrmjuyI6tSq/uFpO2h9b1mhnRUkI/OD/+zZJf0pd9cjSJzIPyje88Ohv7zjuxkCbnqOHkKtEDLgNxtTi3p6bX7s0XL36cq2GYG0ygDUJ6cwBN6DMyYdmp2LjiR5m1eFDcDdvtiOFMIGrAZofDMZdBJmFYslvcn8bWpJPIz8qsmfnf1xVbjLexbXtkcEQZNVtm8PGjMDKPGztl0CQTISD+OeBEB5Kslzp669s+WqihPGWWCd69wclfaHVlJ+sFS89MtquyNSrq5VAUOZ4lFGiPMNp4EqosNgsVWXiqcV9tMGCRvr8JsxJ9vXJnird9uJDbHlBQqmwCAWmWxdm/7TmeiyrSqKPpsnBd9tlaq/n9zolLBoeVLFsMa3+75eT4qUmJLIIl/TPNsxJAGrrF6gNH/rnPlOT1KsBZnJOCNLRoYW0SEVRwUmhFNvppolicQ3mvGzLIb7HXSlE+V1ZvN9hr5AKsrr+CQmzQPI+IdTU7a6L2UwheTVzkr0/7GyLYK99c42UJhDyrQ0q2/3up3rK6BYgkNCyqNU9uc+mShC70eZRiL1+dk7cFLsYvwWYaTKx3gO2LPpWLz2c4S8+OkKfBgMJ0M/HFhtJBW2JF65FOdHKYi8ZLh6u4AF8lvCCqORvJqDTiUfw9gqvMBmo8lYEkwZqCy/vm2LxDgN8gZf9gFUdksumg+cTs8riCOZasiTorFks0+pQCcEnfUYcr95kiKMIz1anTQ==|920

Pages/任务/参与成员管理.json

@@ -8,40 +8,30 @@
       },
       "1": {
         "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 35.0
+          "DesignLengthInPixel": 40.0
         }
       },
       "2": {
         "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 24.0
+          "DesignLengthInPixel": 50.0
         }
       },
       "3": {
         "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 40.0
+          "DesignLengthInPixel": 394.0
         }
       },
       "4": {
         "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 50.0
+          "DesignLengthInPixel": 32.0
         }
       },
       "5": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 394.0
-        }
-      },
-      "6": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 32.0
-        }
-      },
-      "7": {
         "GridRowColumnDefinition": {
           "DesignLengthInPixel": 35.0
         }
       },
-      "9": {
+      "7": {
         "GridRowColumnDefinition": {
           "DesignLengthInPixel": 32.0,
           "IsHidden": true
@@ -49,9 +39,9 @@
       }
     },
     "InLogicalVisibleIndexes": [
-      9
+      7
     ],
-    "Count": 10,
+    "Count": 8,
     "DefaultSize": 32.0
   },
   "Cols": {
@@ -134,295 +124,20 @@
     "DefaultSize": 32.0
   },
   "Values": {
-    "3,3": "成员",
+    "1,3": "成员",
-    "3,19": "操作",
+    "1,19": "操作",
-    "4,19": "移除",
+    "2,19": "移除",
-    "7,1": "时薪权重：任务时薪 > 项目时薪 > 个人时薪",
+    "5,19": "保存"
-    "7,19": "保存"
   },
   "Formulas": {
-    "9,1": "TEXTJOIN(\",\",1,D5)"
+    "7,1": "TEXTJOIN(\",\",1,D3)"
   },
   "AttachInfos": {
     "1,1": {
-      "CellType": {
-        "$type": "ElementUI.SelectCellType, ElementUI",
-        "CommandList": [
-          {
-            "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
-            "ParameterName": "成员",
-            "TableValue": {
-              "TableName": "项目成员表",
-              "TableValueType": 1,
-              "BindingInfos": [
-                {
-                  "BindingInfo": {
-                    "TableName": "项目成员表",
-                    "ColumnName": "项目成员",
-                    "GUID": "415c3a61-4562-49f0-ab72-b070114fb3e0"
-                  },
-                  "ColumnName": "项目成员"
-                },
-                {
-                  "BindingInfo": {
-                    "TableName": "项目成员表",
-                    "ColumnName": "岗位ID",
-                    "GUID": "5bc27408-12cf-4781-b629-1f03c950e669"
-                  },
-                  "ColumnName": "岗位ID"
-                },
-                {
-                  "BindingInfo": {
-                    "TableName": "项目成员表",
-                    "ColumnName": "岗位ID",
-                    "GUID": "13f292e5-2544-4803-9fa6-8d2d6430b3ea",
-                    "RelationBinding": {
-                      "RelatedTable": "项目岗位",
-                      "RelatedColumn": "ID",
-                      "DisplayColumn": "默认时薪"
-                    }
-                  },
-                  "ColumnName": "岗位默认时薪"
-                },
-                {
-                  "BindingInfo": {
-                    "TableName": "项目成员表",
-                    "ColumnName": "默认时薪",
-                    "GUID": "be365809-71b0-4c42-96f9-5a48e43f2eff"
-                  },
-                  "ColumnName": "人员默认时薪"
-                }
-              ],
-              "SqlCondition": {
-                "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess",
-                "SubConditions": [
-                  {
-                    "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
-                    "ColumnBindingInfo": {
-                      "TableName": "项目成员表",
-                      "ColumnName": "项目ID",
-                      "GUID": "2f594d01-dffd-4dc9-99f4-fcc3d29f63f9"
-                    },
-                    "Value": {
-                      "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                      "SerializeProperty": "=参与成员管理!项目ID"
-                    }
-                  },
-                  {
-                    "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
-                    "ColumnBindingInfo": {
-                      "TableName": "项目成员表",
-                      "ColumnName": "项目成员",
-                      "GUID": "4bba478a-f28d-42ea-bf38-4e2244a0abc5"
-                    },
-                    "Value": {
-                      "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                      "SerializeProperty": "=参与成员管理!B2"
-                    }
-                  }
-                ]
-              },
-              "NullFormulaValueQueryPolicy": 0,
-              "TopCount": "1"
-            },
-            "ID": "71ac7f3543074950bbc230bfb7490e06"
-          },
-          {
-            "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
-            "ConditionAndCommandPairList": [
-              {
-                "Condition": {
-                  "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
-                  "param": {
-                    "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon",
-                    "cellLocations": [
-                      {
-                        "SerializeProperty": "=成员"
-                      }
-                    ]
-                  },
-                  "value": "%Null%",
-                  "compareType": 1
-                },
-                "CommandList": [
-                  {
-                    "$type": "Forguncy.Model.UpdateListviewCommand, ServerDesignerCommon",
-                    "ListviewName": "表格1",
-                    "UpdateType": 1,
-                    "UpdateValues": [
-                      {
-                        "Column": "成员",
-                        "Value": {
-                          "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                          "SerializeProperty": "=参与成员管理!成员.项目成员"
-                        }
-                      },
-                      {
-                        "Column": "岗位ID",
-                        "Value": {
-                          "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                          "SerializeProperty": "=参与成员管理!成员.岗位ID"
-                        }
-                      },
-                      {
-                        "Column": "任务时薪",
-                        "Value": {
-                          "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                          "SerializeProperty": "=IF(参与成员管理!成员.人员默认时薪=\"\",参与成员管理!成员.岗位默认时薪,参与成员管理!成员.人员默认时薪)"
-                        }
-                      }
-                    ]
-                  },
-                  {
-                    "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon",
-                    "PropertyItemsList": [
-                      {
-                        "TargetCells": {
-                          "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                          "SerializeProperty": "=参与成员管理!B2"
-                        },
-                        "Value": "%Null%"
-                      }
-                    ]
-                  }
-                ],
-                "ID": "1fcbc27e-c54b-4ac3-9136-595690d5e581"
-              },
-              {
-                "CommandList": [
-                  {
-                    "$type": "Notiflix_Forguncy.Report_Command, Notiflix_Forguncy",
-                    "FunctionName": "info",
-                    "Title": "温馨提示",
-                    "Message": "请先将成员添加到项目成员中再试",
-                    "BtnText": "知道了"
-                  }
-                ],
-                "ID": "3de3db54-1aca-4d50-bc8e-6ec8bb946305"
-              }
-            ]
-          },
-          {
-            "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon",
-            "PropertyItemsList": [
-              {
-                "TargetCells": {
-                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                  "SerializeProperty": "=参与成员管理!B2"
-                },
-                "Value": "%Null%"
-              }
-            ]
-          }
-        ],
-        "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": "1353a2bc-fcb4-49af-86a1-d7a674cdd192"
-              },
-              "ColumnName": "value"
-            },
-            {
-              "BindingInfo": {
-                "TableName": "项目成员表",
-                "ColumnName": "项目成员",
-                "GUID": "ac4c5f99-a88a-455d-b5db-6fd82f4d2152",
-                "AttachType": {
-                  "$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess",
-                  "UserColumnAttachType": 1
-                }
-              },
-              "ColumnName": "label"
-            }
-          ],
-          "SqlCondition": {
-            "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess",
-            "SubConditions": [
-              {
-                "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
-                "ColumnBindingInfo": {
-                  "TableName": "项目成员表",
-                  "ColumnName": "项目ID",
-                  "GUID": "323485a8-fcad-41fc-b82e-d128279a0cc9"
-                },
-                "Value": {
-                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                  "SerializeProperty": "=参与成员管理!项目ID"
-                }
-              },
-              {
-                "$type": "ForguncyDataAccess.TextCESqlCondition, ForguncyDataAccess",
-                "CompareType": 9,
-                "ColumnBindingInfo": {
-                  "TableName": "项目成员表",
-                  "ColumnName": "项目成员",
-                  "GUID": "2eabcabc-e698-42d7-aeff-db576012da6f"
-                },
-                "Value": {
-                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                  "SerializeProperty": "=参与成员管理!B10"
-                }
-              }
-            ]
-          },
-          "CustomColumns": []
-        },
-        "placeholder": "请选择",
-        "noDataText": "无数据",
-        "filterInServerOptions": {
-          "matchMethod": "contains",
-          "loadingText": "加载中"
-        },
-        "noMatchText": "无匹配数据"
-      }
-    },
-    "3,1": {
       "ListViewInfo": {
         "Name": "表格1",
         "TableName": "任务成员表",
-        "RowIndex": 3,
+        "RowIndex": 1,
         "ColumnIndex": 1,
         "RowCount": 3,
         "ColumnCount": 21,
@@ -439,11 +154,12 @@
         "ShowEditStatusIcon": true,
         "UseSimpleBar": true,
         "AllowEditInListview": true,
+        "AllowAddNewRow": true,
         "ColumnOperation": 2,
         "CommitType": 1
       }
     },
-    "4,2": {
+    "2,2": {
       "NameUsedInJavaScript": "ID",
       "BindingInfo": {
         "TableName": "任务成员表",
@@ -451,271 +167,76 @@
         "GUID": "ca57b3e5-5c1c-4557-9dd4-3609545c1754"
       }
     },
-    "4,3": {
+    "2,3": {
       "NameUsedInJavaScript": "成员",
       "BindingInfo": {
         "TableName": "任务成员表",
         "ColumnName": "参与人",
-        "GUID": "01ae69b6-e8d9-43dc-bc1d-810923d025bb"
+        "GUID": "3cc1cf12-e368-4cdb-85be-4c6c8574e995"
       },
       "CellType": {
         "$type": "Forguncy.DropDownListCellType, ServerDesignerCommon",
-        "DropdownButtonModeInListview": 1,
+        "DropdownButtonModeInListview": 2,
         "LoadOnDemand": true,
+        "WaterMark": "请选择项目成员",
         "IsBounding": true,
-        "DataSource": "用户信息视图",
+        "DataSource": "项目成员表",
         "ValueColumnBindingInfo": {
-          "TableName": "用户信息视图",
+          "TableName": "项目成员表",
-          "ColumnName": "用户名",
+          "ColumnName": "项目成员",
-          "GUID": "b7489ee2-703e-4478-a1d6-5d0bb309a4e6"
+          "GUID": "d402d63f-0f27-462f-b4de-36904a7b1f14"
         },
         "DisplayColumnBindingInfo": {
-          "TableName": "用户信息视图",
+          "TableName": "项目成员表",
-          "ColumnName": "全名",
+          "ColumnName": "项目成员",
-          "GUID": "cf280296-8970-4fac-bba6-5973a30aa34f"
+          "GUID": "45162b0e-f238-4e60-9d6e-806bdea8f6a5",
-        },
+          "AttachType": {
-        "ReadOnly": true
+            "$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess",
-      },
+            "UserColumnAttachType": 1
-      "DataValidationInfo": {}
-    },
-    "4,10": {
-      "NameUsedInJavaScript": "岗位ID",
-      "BindingInfo": {
-        "TableName": "任务成员表",
-        "ColumnName": "岗位ID",
-        "GUID": "96634184-b121-4958-ae2b-256ffcff14fe"
-      },
-      "CellType": {
-        "$type": "Forguncy.DropDownListCellType, ServerDesignerCommon",
-        "IsBounding": true,
-        "DataSource": "项目岗位",
-        "ValueColumnBindingInfo": {
-          "TableName": "项目岗位",
-          "ColumnName": "ID",
-          "GUID": "8370ddeb-8347-47b9-a082-1852abab6a39"
-        },
-        "DisplayColumnBindingInfo": {
-          "TableName": "项目岗位",
-          "ColumnName": "岗位名称",
-          "GUID": "72e01df7-95db-4efa-b534-206683e50892"
-        },
-        "ItemsQuery": {
-          "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
-          "ColumnBindingInfo": {
-            "TableName": "项目岗位",
-            "ColumnName": "项目ID",
-            "GUID": "fa869be2-89ff-45e6-9fb0-0b6a08c9267f"
-          },
-          "Value": {
-            "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-            "SerializeProperty": "=参与成员管理!项目ID"
           }
         },
         "DropDownSubItems": [
           {
-            "GUID": "e16ba71c994d4357909403f194397041",
+            "GUID": "47aef110031345e6bed6f5b7bcaab2a7",
             "BindingInfo": {
-              "TableName": "项目岗位",
+              "TableName": "项目成员表",
-              "ColumnName": "岗位名称",
+              "ColumnName": "项目成员",
-              "GUID": "792c11b6-2849-4d52-8ae8-014ef2158205"
+              "GUID": "f584aac4-1e10-4009-b150-007b0ddeba33",
-            },
+              "AttachType": {
-            "ColumnName": "岗位名称",
+                "$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess",
-            "Alignment": 1,
+                "UserColumnAttachType": 1
-            "WidthInfo": {
-              "MinWidth": 130.0,
-              "MaxWidth": 200.0
-            }
-          },
-          {
-            "GUID": "a0985e5877dc440891d8e7f67ef44d49",
-            "BindingInfo": {
-              "TableName": "项目岗位",
-              "ColumnName": "默认时薪",
-              "GUID": "e576d2a6-3a85-47da-9618-864aadbc9a1b"
-            },
-            "ColumnName": "默认时薪",
-            "Alignment": 3,
-            "Formatter": " ¥#,##0.00_);[Red] ¥(#,##0.00)",
-            "WidthInfo": {
-              "MinWidth": 130.0,
-              "MaxWidth": 200.0
-            }
-          }
-        ],
-        "CommandList": [
-          {
-            "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
-            "ParameterName": "岗位时薪",
-            "TableValue": {
-              "TableName": "项目岗位",
-              "TableValueType": 1,
-              "BindingInfos": [
-                {
-                  "BindingInfo": {
-                    "TableName": "项目岗位",
-                    "ColumnName": "默认时薪",
-                    "GUID": "af6ef5f2-09ae-49ae-b05c-525b001fdc75"
-                  },
-                  "ColumnName": "默认时薪"
-                }
-              ],
-              "SqlCondition": {
-                "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
-                "ColumnBindingInfo": {
-                  "TableName": "项目岗位",
-                  "ColumnName": "ID",
-                  "GUID": "95d7eb54-c99a-4676-aa5c-26c9530acb81"
-                },
-                "Value": {
-                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                  "SerializeProperty": "=参与成员管理!K5"
-                }
-              },
-              "NullFormulaValueQueryPolicy": 0,
-              "TopCount": "1"
-            },
-            "ID": "4b5d495055194f0aafeb67abdb229b89"
-          },
-          {
-            "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
-            "ConditionAndCommandPairList": [
-              {
-                "Condition": {
-                  "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess",
-                  "SubConditions": [
-                    {
-                      "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
-                      "param": {
-                        "$type": "Forguncy.Model.IfConditionContextPropertyParam, ServerDesignerCommon",
-                        "contextProperty": {
-                          "Display": "值变更原因"
-                        }
-                      },
-                      "value": "userInput"
-                    },
-                    {
-                      "$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": "%Null%",
-                      "compareType": 1
-                    },
-                    {
-                      "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
-                      "param": {
-                        "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon",
-                        "cellLocations": [
-                          {
-                            "SerializeProperty": "=参与成员管理!岗位时薪.默认时薪"
-                          }
-                        ]
-                      },
-                      "value": {
-                        "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                        "SerializeProperty": "=参与成员管理!P5"
-                      },
-                      "compareType": 1
-                    }
-                  ]
-                },
-                "CommandList": [
-                  {
-                    "$type": "ElementUI.Commands.ShowMessageBox, ElementUI",
-                    "Title": "提示",
-                    "Message": {
-                      "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                      "SerializeProperty": "=\"你选择的岗位薪资为\"&参与成员管理!岗位时薪.默认时薪&\"，是否更新该成员时薪？\""
-                    },
-                    "Type": "info",
-                    "ConfirmButtonText": "确定",
-                    "ShowCancelButton": true,
-                    "CancelButtonText": "忽略",
-                    "ShowClose": false,
-                    "DialogResult": "按钮结果",
-                    "AdvancedSettings": {
-                      "ShowInput": true,
-                      "InputPlaceholder": {
-                        "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                        "SerializeProperty": "=参与成员管理!岗位时薪.默认时薪"
-                      },
-                      "InputBoxResult": "时薪"
-                    }
-                  },
-                  {
-                    "$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.UpdateListviewCommand, ServerDesignerCommon",
-                            "ListviewName": "表格1",
-                            "UpdateValues": [
-                              {
-                                "Column": "任务时薪",
-                                "Value": {
-                                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                                  "SerializeProperty": "=IF(参与成员管理!时薪=\"\",参与成员管理!岗位时薪.默认时薪,参与成员管理!时薪)"
-                                }
-                              }
-                            ],
-                            "UpdateRowType": 3
-                          }
-                        ],
-                        "ID": "a6d6c300-25e5-448b-be20-2d6c0bc0b36f"
-                      }
-                    ]
-                  }
-                ],
-                "ID": "eb160186-9d0a-4859-b76d-4272a1511840"
               }
-            ]
+            },
+            "ColumnName": "项目成员_全名"
+          },
+          {
+            "GUID": "ce015e22293c4fe4bdb3da9b126366d3",
+            "BindingInfo": {
+              "TableName": "项目成员表",
+              "ColumnName": "岗位ID",
+              "GUID": "f81fea2f-2ca4-426f-a823-d9d4a2c8d54c",
+              "RelationBinding": {
+                "RelatedTable": "项目岗位",
+                "RelatedColumn": "ID",
+                "DisplayColumn": "岗位名称"
+              }
+            },
+            "ColumnName": "岗位名称"
+          },
+          {
+            "GUID": "3ecb151f557c4df5a891bf33f150f1ac",
+            "BindingInfo": {
+              "TableName": "项目成员表",
+              "ColumnName": "默认时薪",
+              "GUID": "5ae738a3-3fb5-412d-bf60-1d30d94a60be"
+            },
+            "ColumnName": "默认时薪"
           }
         ]
-      }
-    },
-    "4,15": {
-      "NameUsedInJavaScript": "任务时薪",
-      "BindingInfo": {
-        "TableName": "任务成员表",
-        "ColumnName": "任务时薪",
-        "GUID": "7fbbe1f3-2df0-424e-ac1f-50defe5f8c8e"
       },
-      "CellType": {
+      "DataValidationInfo": {}
-        "$type": "Forguncy.NumberCellType, ServerDesignerCommon"
-      }
     },
-    "4,19": {
+    "2,19": {
       "NameUsedInJavaScript": "操作",
       "CellType": {
         "$type": "Forguncy.HyperlinkCellType, ServerDesignerCommon",
@@ -730,7 +251,7 @@
         "ClickMode": 1
       }
     },
-    "7,19": {
+    "5,19": {
       "CellType": {
         "$type": "Forguncy.ButtonCellType, ServerDesignerCommon",
         "CommandList": [
@@ -817,7 +338,7 @@
                     "ReloadData": true
                   }
                 ],
-                "ID": "5c9d1beb-a191-4c37-beb7-9083dd9d04df"
+                "ID": "bba0866d-b100-4018-85ed-2bcd53c10ec7"
               },
               {
                 "CommandList": [
@@ -832,7 +353,7 @@
                     "BtnText": "知道了"
                   }
                 ],
-                "ID": "792a3863-fe3d-4f63-b88d-1a5cad954c64"
+                "ID": "a7b88a3b-e61e-4856-b761-933dbcb18222"
               }
             ]
           }
@@ -848,14 +369,14 @@
         "IconSize": 14.0
       }
     },
-    "9,6": {
+    "7,6": {
       "BindingInfo": {
         "TableName": "任务表",
         "ColumnName": "ID",
         "GUID": "8817b380-324c-4770-9a5f-98948b913fd8"
       }
     },
-    "9,9": {
+    "7,9": {
       "BindingInfo": {
         "TableName": "任务表",
         "ColumnName": "项目ID",
@@ -870,9 +391,6 @@
         "FontSize": 13.333333333333332,
         "HorizontalAlignment": 1
       },
-      {
-        "HorizontalAlignment": 1
-      },
       {
         "Foreground": 2,
         "HorizontalAlignment": 1,
@@ -894,21 +412,17 @@
       ]
     },
     "CellStyles": {
-      "3,10": 0,
+      "2,3": 0,
-      "3,15": 1,
+      "2,19": 1,
-      "4,3": 0,
+      "5,1": 2,
-      "4,10": 0,
+      "5,2": 2,
-      "4,15": 1,
+      "7,12": 3,
-      "4,19": 2,
+      "7,13": 3,
-      "7,1": 3,
+      "7,14": 3,
-      "7,2": 3,
+      "7,15": 3,
-      "9,12": 4,
+      "7,16": 3,
-      "9,13": 4,
+      "7,17": 3,
-      "9,14": 4,
+      "7,18": 3
-      "9,15": 4,
-      "9,16": 4,
-      "9,17": 4,
-      "9,18": 4
     },
     "SheetStyle": {
       "FontFamily": 0,
@@ -916,20 +430,15 @@
     }
   },
   "Spans": [
-    "1,1,1,21",
+    "2,19,1,3",
-    "4,19,1,3",
+    "7,1,1,5",
-    "9,1,1,5",
+    "7,6,1,3",
-    "4,3,1,7",
+    "7,9,1,3",
-    "4,15,1,4",
+    "5,19,1,3",
-    "9,6,1,3",
+    "2,3,1,16",
-    "4,10,1,5",
+    "3,1,1,21",
-    "9,9,1,3",
+    "1,3,1,16",
-    "5,1,1,21",
+    "1,19,1,3"
-    "7,19,1,3",
-    "3,3,1,7",
-    "3,10,1,5",
-    "3,15,1,4",
-    "3,19,1,3"
   ],
   "PageInfo": {
     "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
@@ -967,11 +476,11 @@
   "CustomNames": [
     {
       "Name": "任务ID",
-      "Formula": "参与成员管理!$G$10"
+      "Formula": "参与成员管理!$G$8"
     },
     {
       "Name": "项目ID",
-      "Formula": "参与成员管理!$J$10"
+      "Formula": "参与成员管理!$J$8"
     }
   ]
-}//owNQyRi0MeesZzmdL/GtiO/4LJghQvOkLl9Fkq6T6U8qIhXEKFGAA2YqJS8+DyXJbkZR/wIoarGXWwx69yw6gpw7fdE65xOi2yTPv6wBtinrGTy7N+tSnWqm8HS0viude9XbikCahsqrjtdP9/IeqzckC6k2NwSy7O95H/G7+5WYXQExfgF9brSEInOq3FD2j+0fJzzeL7zutS+DjInvbPcPfNNhq96FatghqLN6y1o38rqf35K9G4ejC7QHzd0vqgE54i9TkRe9y/c7hWc0kcNkGgtjzVnjth9xekQJ6qaAtYosLDtHQ9gg0VMF9n8CmAbu9Ge0ai+tD0Ki+DKkJ8cEoWoelAAk4x2qzlJOBQdAutP6WCMgJHITGj2u1gU9S6FTPRhYN14rc1uXGKBqVhRw4hl9r+CogedYp+5/gW+UzcDCpm93DxTZqs2bqhDtq3t/exwoygfMgZi4vQUMg0cVXKXDlzitYFgqgEDHYU1BKKvu8CpWihvPzclF3qf1bYmuQ2fJRAFuUP1pqAm90vyjlA215VnacQSNa6khWgqg7a3hx/55iJzYfxjEAuVhegZZaGHD+seD84rJPyPdB5iTWsh9SeWD+DOkE45IbnnYT6EqwkJcBG5ggC0OSRHu31aUPSV+/3e4jRR+GjkXv4/SAWGbFXxQpcSYqQVVro1f6O6ZhbxX5fnjqlOOKWL1+Fr19sCaXR3p28gTfnrhY5sNQz7prHoKHPMdgW1UwuToqnGEfUQc1nuReoFSZ9AD3J3zN8WyrFKpk7SQPAV/oOjnfThRhjI3eg1kJizWnD2qv0hOmVNtNzg22FnUAQ1GxKm8h/AhvjPRL3jvFQ0ZvcUKgC3w75SOXwcHIXxO+qnmCTu4b/n2NdGsnhuvjjjKWwAbxZhmvHUGVU1UD5cdQg==|920
+}//qsiMwnPG+WhQbnp3dZ8V7NiSrpdzTEyiQbV0yiGeVr+WlP7B8zzqF/jf+Mf6J76z9hxgyVwGhVvcL/BkNRtJULiXKLWRuvq8oC9H+cwp1L1kmGvnAo+6LQj1bYXVjEf2UuIjjSwEZeI0lJRT62CToFTZPZ2LfFoTTR7plEbQ4orJINRAHWediwiCb3rDFDN7yZJhrbzvK8TcuOsHnJa/kKXOGCY2F+CqoE/URqpEqmbkDpAr5nTZLHdB2up9hFLKVSWXN3WR/uwgw69OMOhAssdl4OLum6Et/2Ay7pq70DfO4RB0qr/4vQl6cnhu/swrdLXiKGJ2xyWfy3a4sSIYknaYavoftZ9Y9I8YeyNCFhFwdxSTomku2geRmIqmQN5AUDspUl5Vabg0U3m3QR82z4G58IrtcnbbUO54k/d7U8AS2WU1i7LoXEu39tpsNAG0sOJkVvO57DOs41SCK131MEqL3p9sK+UGJLelVQqMYxHv8mvuiyWSqS2L7U7ps4zPzjjYKJeHqCp1cmxUhN2TMkJkR2Zxr83rsqtt2X3e/U2Bp1zDhYa2hNLjm8HJsmRJL2Aj+aX548AAEtodgnmyrJnPCKm7HJVG1HeZAti60wutWKnz1t6SlBoB+jksShb6f/NEGZYIJZuFnMwKy+J9g6JSOxlzIeYWbqj3jWKDW94LkB9Er9gVQduez9NTnAmmSPjJy1VCzkr/9CJnA+Zp84mLsRV97z8bcNF+8i7VEqHAKkP/+TkFFXfzQa0gPw+uuucPST6E8nj1s7hB4DXoa5K1yO6KnMtEC/52/oQHjg0HfEKoyowtqivNDQTLWcRHQRZSIoaZAR6WmsHujw43zjlNzzjMEdHzaKrHTO4T9ZYVPOiAS6JkhzzHBZXRvOMxegglriEJeAtPDpt/GDbULA==|920

Pages/任务/参与成员管理.rd

@@ -1,18 +1,18 @@
 {
   "PageType": 0,
   "ColumnCount": 23,
-  "RowCount": 10,
+  "RowCount": 8,
   "Formulas": {
-    "9,1": "TEXTJOIN(\",\",1,D5)"
+    "7,1": "TEXTJOIN(\",\",1,D3)"
   },
   "CustomNames": [
     {
       "Name": "任务ID",
-      "Formula": "参与成员管理!$G$10"
+      "Formula": "参与成员管理!$G$8"
     },
     {
       "Name": "项目ID",
-      "Formula": "参与成员管理!$J$10"
+      "Formula": "参与成员管理!$J$8"
     }
   ]
 }

Pages/任务/工时/分配计划工时.json

@@ -51,7 +51,7 @@
       },
       "15": {
         "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 177.0
+          "DesignLengthInPixel": 39.0
         }
       },
       "16": {
@@ -67,31 +67,26 @@
       },
       "18": {
         "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 10.0
+          "DesignLengthInPixel": 24.0
         }
       },
       "19": {
         "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 10.0
+          "DesignLengthInPixel": 35.0
         }
       },
       "20": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 35.0
-        }
-      },
-      "21": {
         "GridRowColumnDefinition": {
           "DesignLengthInPixel": 24.0
         }
       },
-      "22": {
+      "21": {
         "GridRowColumnDefinition": {
           "DesignLengthInPixel": 27.0,
           "IsHidden": true
         }
       },
-      "23": {
+      "22": {
         "GridRowColumnDefinition": {
           "DesignLengthInPixel": 27.0,
           "IsHidden": true
@@ -103,10 +98,10 @@
       5,
       6,
       7,
-      22,
+      21,
-      23
+      22
     ],
-    "Count": 24
+    "Count": 23
   },
   "Cols": {
     "RowColumnAttachedInfos": {
@@ -184,54 +179,9 @@
         "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
-        }
-      },
-      "22": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 32.0
-        }
-      },
-      "23": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 32.0
-        }
       }
     },
-    "Count": 24,
+    "Count": 15,
     "DefaultSize": 32.0
   },
   "Values": {
@@ -240,8 +190,8 @@
     "7,1": " b",
     "9,1": "工时数",
     "13,1": "备注",
-    "20,1": "取消",
+    "19,1": "取消",
-    "20,20": "提交"
+    "19,11": "提交"
   },
   "Formulas": {
     "7,1": "TODAY()&\",\"&TODAY()"
@@ -482,7 +432,7 @@
                             }
                           }
                         ],
-                        "ID": "b5824c3c-5f3e-4098-80b6-1db5505f293e"
+                        "ID": "cc9082cf-78d7-49b5-be4c-fa3af1263d22"
                       },
                       {
                         "CommandList": [
@@ -491,12 +441,12 @@
                             "ErrorCode": "0"
                           }
                         ],
-                        "ID": "3017d809-02aa-4651-9cf1-8064d5a089a3"
+                        "ID": "d9a0a7da-06bb-4ee6-8178-2ec31972a36c"
                       }
                     ]
                   }
                 ],
-                "ID": "80be424b-6c3e-4747-abc6-a6c938ca4129"
+                "ID": "25842086-5508-406b-b02f-2c083a0b9f82"
               }
             ]
           }
@@ -529,10 +479,10 @@
         ],
         "type": "textarea",
         "placeholder": "请输入",
-        "resize": "none"
+        "resize": "vertical"
       }
     },
-    "20,1": {
+    "19,1": {
       "CellType": {
         "$type": "Forguncy.ButtonCellType, ServerDesignerCommon",
         "CommandList": [
@@ -544,7 +494,7 @@
         "TemplateKey": "_RS_Information3"
       }
     },
-    "20,20": {
+    "19,11": {
       "CellType": {
         "$type": "Forguncy.ButtonCellType, ServerDesignerCommon",
         "CommandList": [
@@ -658,7 +608,7 @@
                                     "AdvancedSettings": {}
                                   }
                                 ],
-                                "ID": "35bc215e-5647-4941-b282-266dbe907e35"
+                                "ID": "2d53b013-85dc-45ec-ae8b-62a00be0a3cd"
                               },
                               {
                                 "CommandList": [
@@ -675,7 +625,7 @@
                                     "AdvancedSettings": {}
                                   }
                                 ],
-                                "ID": "d6025f25-f9b4-445b-82c3-e32ecdbd2767"
+                                "ID": "5f8dc987-2d96-4393-a7de-bee083f18882"
                               }
                             ]
                           },
@@ -814,7 +764,7 @@
                                             "ReloadData": true
                                           }
                                         ],
-                                        "ID": "0f162bde-4368-48ed-ad52-e788ae192aca"
+                                        "ID": "0e79ddd0-1bfb-4430-ac8c-9ecac13fafeb"
                                       },
                                       {
                                         "CommandList": [
@@ -829,17 +779,17 @@
                                             "BtnText": "知道了"
                                           }
                                         ],
-                                        "ID": "680c2413-531f-48bd-9233-39016dbb32e7"
+                                        "ID": "d06728b3-384a-4739-b6b5-fd99377cdfd3"
                                       }
                                     ]
                                   }
                                 ],
-                                "ID": "b892726e-be5f-4f7a-9525-e53271138ad1"
+                                "ID": "6c343d6b-223c-417f-8c3d-86af5895cf86"
                               }
                             ]
                           }
                         ],
-                        "ID": "5573c6a0-43cb-49e3-8cce-5e4a14cbf4f8"
+                        "ID": "17d11d1f-d9e4-446f-b0d1-4bef7a35a65a"
                       },
                       {
                         "CommandList": [
@@ -851,12 +801,12 @@
                             "BtnText": "知道了"
                           }
                         ],
-                        "ID": "1a87a62f-0b6b-4b05-ab38-64f6c331ee40"
+                        "ID": "733235f5-db15-4165-946d-cf9456a072b6"
                       }
                     ]
                   }
                 ],
-                "ID": "7263b546-36aa-45f3-9f0e-f6df8af13e51"
+                "ID": "00d280dd-1604-42c1-bc59-e50f1d34db20"
               },
               {
                 "CommandList": [
@@ -866,7 +816,7 @@
                     "Message": "请添加参与人后进行操作"
                   }
                 ],
-                "ID": "02d610b7-4ab3-4573-b79a-fbcdf2677afb"
+                "ID": "34e6617d-bd78-4d87-a466-1d32c45cf97c"
               }
             ]
           }
@@ -875,7 +825,7 @@
         "TemplateKey": "_RS_Main1"
       }
     },
-    "22,1": {
+    "21,1": {
       "BindingInfo": {
         "TableName": "任务表",
         "ColumnName": "ID",
@@ -888,11 +838,6 @@
       {
         "Foreground": 0
       },
-      {
-        "FontFamily": 1,
-        "FontSize": 13.333333333333332,
-        "Foreground": 0
-      },
       {
         "FontFamily": 1,
         "FontSize": 13.333333333333332
@@ -903,6 +848,11 @@
         "Foreground": 0,
         "Formatter": 2
       },
+      {
+        "FontFamily": 1,
+        "FontSize": 13.333333333333332,
+        "Foreground": 0
+      },
       {
         "BorderBottom": 0
       },
@@ -952,228 +902,128 @@
     },
     "CellStyles": {
       "1,1": 0,
-      "1,11": 1,
+      "4,0": 1,
-      "1,12": 2,
+      "4,1": 1,
-      "1,13": 2,
+      "4,2": 1,
-      "1,14": 2,
+      "4,3": 1,
-      "1,15": 2,
+      "4,4": 1,
-      "1,16": 2,
+      "4,5": 1,
-      "1,17": 2,
+      "4,6": 1,
-      "2,11": 2,
+      "4,7": 1,
-      "2,12": 2,
+      "4,8": 1,
-      "2,13": 2,
+      "4,9": 1,
-      "2,14": 2,
+      "4,10": 1,
-      "2,15": 2,
+      "4,11": 1,
-      "2,16": 2,
+      "4,12": 1,
-      "2,17": 2,
+      "4,13": 1,
-      "4,0": 2,
+      "4,14": 1,
-      "4,1": 2,
+      "5,0": 1,
-      "4,2": 2,
+      "5,1": 2,
-      "4,3": 2,
+      "5,2": 1,
-      "4,4": 2,
+      "5,3": 1,
-      "4,5": 2,
+      "5,4": 1,
-      "4,6": 2,
+      "5,5": 1,
-      "4,7": 2,
+      "5,6": 1,
-      "4,8": 2,
+      "5,7": 1,
-      "4,9": 2,
+      "5,8": 1,
-      "4,10": 2,
+      "5,9": 1,
-      "4,11": 2,
+      "5,10": 1,
-      "4,12": 2,
+      "5,11": 1,
-      "4,13": 2,
+      "5,12": 1,
-      "4,14": 2,
+      "5,13": 1,
-      "4,15": 2,
+      "5,14": 1,
-      "4,16": 2,
+      "6,0": 1,
-      "4,17": 2,
+      "6,1": 1,
-      "4,18": 2,
+      "6,2": 1,
-      "4,19": 2,
+      "6,3": 1,
-      "4,20": 2,
+      "6,4": 1,
-      "4,21": 2,
+      "6,5": 1,
-      "4,22": 2,
+      "6,6": 1,
-      "4,23": 2,
+      "6,7": 1,
-      "5,0": 2,
+      "6,8": 1,
-      "5,1": 3,
+      "6,9": 1,
-      "5,2": 2,
+      "6,10": 1,
-      "5,3": 2,
+      "6,11": 1,
-      "5,4": 2,
+      "6,12": 1,
-      "5,5": 2,
+      "6,13": 1,
-      "5,6": 2,
+      "6,14": 1,
-      "5,7": 2,
+      "7,0": 1,
-      "5,8": 2,
+      "7,1": 1,
-      "5,9": 2,
+      "7,14": 1,
-      "5,10": 2,
+      "9,1": 3,
-      "5,12": 2,
+      "11,1": 1,
-      "5,13": 2,
+      "12,0": 1,
-      "5,14": 2,
+      "12,1": 1,
-      "5,15": 2,
+      "12,2": 1,
-      "5,16": 2,
+      "12,3": 1,
-      "5,17": 2,
+      "12,4": 1,
-      "5,18": 2,
+      "12,5": 1,
-      "5,19": 2,
+      "12,6": 1,
-      "5,20": 2,
+      "12,7": 1,
-      "5,21": 2,
+      "12,8": 1,
-      "5,22": 2,
+      "12,9": 1,
-      "5,23": 2,
+      "12,10": 1,
-      "6,0": 2,
+      "12,11": 1,
-      "6,1": 2,
+      "12,12": 1,
-      "6,2": 2,
+      "12,13": 1,
-      "6,3": 2,
+      "12,14": 1,
-      "6,4": 2,
+      "13,0": 1,
-      "6,5": 2,
+      "13,1": 2,
-      "6,6": 2,
+      "13,2": 1,
-      "6,7": 2,
+      "13,3": 1,
-      "6,8": 2,
+      "13,4": 1,
-      "6,9": 2,
+      "13,5": 1,
-      "6,10": 2,
+      "13,6": 1,
-      "6,11": 2,
+      "13,7": 1,
-      "6,12": 2,
+      "13,8": 1,
-      "6,13": 2,
+      "13,9": 1,
-      "6,14": 2,
+      "13,10": 1,
-      "6,15": 2,
+      "13,11": 1,
-      "6,16": 2,
+      "13,12": 1,
-      "6,17": 2,
+      "13,13": 1,
-      "6,18": 2,
+      "13,14": 1,
-      "6,19": 2,
+      "14,0": 1,
-      "6,20": 2,
+      "14,1": 1,
-      "6,21": 2,
+      "14,2": 1,
-      "6,22": 2,
+      "14,3": 1,
-      "6,23": 2,
+      "14,4": 1,
-      "7,0": 2,
+      "14,5": 1,
-      "7,1": 2,
+      "14,6": 1,
-      "7,23": 2,
+      "14,7": 1,
-      "9,1": 1,
+      "14,8": 1,
-      "11,1": 2,
+      "14,9": 1,
-      "12,0": 2,
+      "14,10": 1,
-      "12,1": 2,
+      "14,11": 1,
-      "12,2": 2,
+      "14,12": 1,
-      "12,3": 2,
+      "14,13": 1,
-      "12,4": 2,
+      "14,14": 1,
-      "12,5": 2,
+      "15,0": 1,
-      "12,6": 2,
+      "15,1": 1,
-      "12,7": 2,
+      "15,14": 1,
-      "12,8": 2,
+      "17,1": 4,
-      "12,9": 2,
+      "17,2": 4,
-      "12,10": 2,
+      "17,3": 4,
-      "12,11": 2,
+      "17,4": 4,
-      "12,12": 2,
+      "17,5": 4,
-      "12,13": 2,
+      "17,6": 4,
-      "12,14": 2,
+      "17,7": 4,
-      "12,15": 2,
+      "17,8": 4,
-      "12,16": 2,
+      "17,9": 4,
-      "12,17": 2,
+      "17,10": 4,
-      "12,18": 2,
+      "17,11": 4,
-      "12,19": 2,
+      "17,12": 4,
-      "12,20": 2,
+      "17,13": 4,
-      "12,21": 2,
+      "19,1": 5,
-      "12,22": 2,
+      "19,2": 1,
-      "12,23": 2,
+      "19,3": 1,
-      "13,0": 2,
+      "21,1": 6,
-      "13,1": 3,
+      "21,2": 7,
-      "13,2": 2,
+      "21,3": 7,
-      "13,3": 2,
+      "21,4": 7,
-      "13,4": 2,
+      "21,5": 8,
-      "13,5": 2,
+      "21,6": 9,
-      "13,6": 2,
+      "21,7": 9,
-      "13,7": 2,
+      "21,8": 9
-      "13,8": 2,
-      "13,9": 2,
-      "13,10": 2,
-      "13,11": 2,
-      "13,12": 2,
-      "13,13": 2,
-      "13,14": 2,
-      "13,15": 2,
-      "13,16": 2,
-      "13,17": 2,
-      "13,18": 2,
-      "13,19": 2,
-      "13,20": 2,
-      "13,21": 2,
-      "13,22": 2,
-      "13,23": 2,
-      "14,0": 2,
-      "14,1": 2,
-      "14,2": 2,
-      "14,3": 2,
-      "14,4": 2,
-      "14,5": 2,
-      "14,6": 2,
-      "14,7": 2,
-      "14,8": 2,
-      "14,9": 2,
-      "14,10": 2,
-      "14,11": 2,
-      "14,12": 2,
-      "14,13": 2,
-      "14,14": 2,
-      "14,15": 2,
-      "14,16": 2,
-      "14,17": 2,
-      "14,18": 2,
-      "14,19": 2,
-      "14,20": 2,
-      "14,21": 2,
-      "14,22": 2,
-      "14,23": 2,
-      "15,0": 2,
-      "15,1": 2,
-      "15,23": 2,
-      "17,1": 2,
-      "17,2": 2,
-      "17,3": 2,
-      "17,4": 2,
-      "17,5": 2,
-      "17,6": 2,
-      "17,7": 2,
-      "17,8": 2,
-      "17,9": 2,
-      "17,10": 2,
-      "17,11": 2,
-      "17,12": 2,
-      "17,13": 2,
-      "17,14": 2,
-      "17,15": 2,
-      "17,16": 2,
-      "17,17": 2,
-      "17,18": 2,
-      "17,19": 2,
-      "17,20": 2,
-      "17,21": 2,
-      "17,22": 2,
-      "18,1": 4,
-      "18,2": 4,
-      "18,3": 4,
-      "18,4": 4,
-      "18,5": 4,
-      "18,6": 4,
-      "18,7": 4,
-      "18,8": 4,
-      "18,9": 4,
-      "18,10": 4,
-      "18,11": 4,
-      "18,12": 4,
-      "18,13": 4,
-      "18,14": 4,
-      "18,15": 4,
-      "18,16": 4,
-      "18,17": 4,
-      "18,18": 4,
-      "18,19": 4,
-      "18,20": 4,
-      "18,21": 4,
-      "18,22": 4,
-      "20,1": 5,
-      "20,2": 2,
-      "20,3": 2,
-      "22,1": 6,
-      "22,2": 7,
-      "22,3": 7,
-      "22,4": 7,
-      "22,5": 8,
-      "22,6": 9,
-      "22,7": 9,
-      "22,8": 9,
-      "22,9": 9,
-      "22,10": 9
     },
     "SheetStyle": {
       "FontFamily": 1,
@@ -1181,13 +1031,13 @@
     }
   },
   "Spans": [
-    "11,1,1,22",
+    "11,1,1,13",
-    "15,1,2,22",
+    "15,1,2,13",
-    "20,20,1,3",
+    "19,11,1,3",
-    "20,1,1,3",
+    "19,1,1,3",
-    "7,1,1,22",
+    "7,1,1,13",
-    "22,1,1,5",
+    "21,1,1,5",
-    "3,1,1,22"
+    "3,1,1,13"
   ],
   "PageInfo": {
     "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
@@ -1228,7 +1078,7 @@
                 ]
               }
             ],
-            "ID": "36587935-65f0-476d-b978-054e9089765c"
+            "ID": "0c7904a0-24f2-4419-90d9-4db83e642be8"
           },
           {
             "CommandList": [
@@ -1245,7 +1095,7 @@
                 ]
               }
             ],
-            "ID": "520f0837-ea98-4ae9-a31a-f488888b1d61"
+            "ID": "dfcdca39-cc00-47b2-afa6-b3eff1aead95"
           }
         ],
         "Comments": "只有工时分配方式为【分配到天】的情况下，才需要填写日期，否则不需要"
@@ -1276,15 +1126,15 @@
   "CustomNames": [
     {
       "Name": "任务ID",
-      "Formula": "分配计划工时!$B$23"
+      "Formula": "分配计划工时!$B$22"
     },
     {
       "Name": "工时类型",
-      "Formula": "分配计划工时!$L$4"
+      "Formula": "#REF!"
     },
     {
       "Name": "参与人列表",
-      "Formula": "分配计划工时!$G$23"
+      "Formula": "分配计划工时!$G$22"
     }
   ]
-}//4pfvOGlyL2+/GlhvEo/Dwcv7Nj1EBZdUJCjStwO3Ok9Jel59V5qIuR90EGy1wJSNFTNZSJM897HOCZIR5raUrDipJ/ry/lvDmdhnJpPqeuEOr/BVNcCFdUN6HpQx0HLacIv1sa0z3JMMYi3yZ5BVWDkbldXKqHV7+VmVKgfuEThd83pl/NqYuBd80tmpumFjvl5JyJ3zQK3Y1uw9DaesLQPcTux1nL69+rAQXtDJUuVA/jwbL4OeW9rmA80WwrYYXsbWAuTSOtMuAwgoFDvPPw397U+EVmyPGxQp0zmLywtZ1p5CLgbMNQlz+Vn8gD6xE296rv4sYPmFowjJ6p/I9IH8UNuOXJaywmXgL47qi8jbcRRTBGYrDvI0S5yqCxrK+dnFzbwCOqbrLT1xMyOTmGkUVlCflCIGl95NpN1pktix9nI7QYxLkmAtlAsg6Pl87ULYBq6W54AZ2clbOBcX254uuUBqpPyADqVnzXohO4H1u2SLEj6nSu4uncJ3Na33XV1EvNXCbL2RFzLsLMEeYVW6C4qtG7gRu/HOJXtx+ose4ZY/cyfKH90fmHkf3GcB/Pq+QO/5shJIzKpvSvKE1sTdUfJbjDJ3EH83F/I/i2pBlekmg/lD6vE4dCzpD/YRn/IsDSxorawTXU89oIbhm4Pzc/8DGErpjZqh92sZF+HpTBAiTIFMhPjYRih5ZVBg8id19+rUq9g6ZbpcXUfcFH1Z1+xmYQ8M8fodrk6x/BfdbHy0bHEFPj6XL6v5u1aXSebnGnBAgojrtX6TIgwF8JSXsmIB3yQEllmKzsaNKnRmQq2d4fEJdwyN+2oT49NeYbxo2h3Iwh762VB9/hz6s7wV5TJ4fHcCfhDXD2FiFmumiRkChlT9VObwDvxdwZM+5gIkZiXFlAjOz418qmelug==|920
+}//HJA9vhrkMBYRFyhlnjV9ZHJb68GPdTgIDfDSbycCSq0tHmIhkapsdDZIJdHByAZ7oSHe2iu2FIWmC2wZquG49HLX/zGXtwxRsj2f6+jb2/L6xHZT2hasGef/mQ8K6cPuJl7Uvhjaf8wwaO1nhCx23l/sf8kRgvIJWnvu4krgxOCXZW37ZXIE3yjlzxipCMojULr1iun8otGUTDJWCPNWlIQTL+0ORctkgPhn7bJLsE0yc6Q9w6c2Gm+ZgefvmrEWoweNnr3DnrmzecB1yDBpM3Caj4+NiM600IcoeKDLHnbItMzxCiqi4jMB3X8MOH7OPdFhPoFHVbv8qpw1fxy8lZxnc5rwEAzvQFe+ZwUfGC0eDlke2y3Kgnith0tRqFrt2MUtRoJrlo2W3BNwnEJfG0CezLInfbv3EbqKmct5Ics7SS6xyy4nlUZ/XZz5aKCY6QalM0Sr+KJK25zvj7xp21XUs4IoUr4mJ5gL8dWaKGVSh0Rg/5B2WaD3XW0EihSK5+gmgm0Rovzansr+VYDXHKSzS34FjD4H00DhdmaMi0Z42asfRu4PmeXmOnM9f92YnT4kyz6Uf5spJEiYnQP9bZSDcxCHC9VcUZ1p2IweUp04+++2Jhsqmj/SKDapSosEjtau/YJXirtzNhz6GXfe1wOAQfTFpf5844YvJJK+cfQnWh8hnTU7BQdAqENbMYHPO9loHlaJtT48XQMJWFI6BsxNRLWXQq0tIQ+S7UJbtMtelzWflVnl31X6pDgNfoYrJndsj8o2WFdc0jHdCWaVL4v1/bXDRU0NUuYkhzQwBTWUy/YyP2Ts/dLGmjDfhTUKVB7bvW/f5P9T8YEDQFXUrojxw3Cc19CYGfo5oAPUZ4LDzmMyl7EgKM6TBtqqXcoYgb46zjLBC7sZBNK2GxH0Cg==|920

Pages/任务/工时/分配计划工时.rd

@@ -1,22 +1,22 @@
 {
   "PageType": 0,
-  "ColumnCount": 24,
+  "ColumnCount": 15,
-  "RowCount": 24,
+  "RowCount": 23,
   "Formulas": {
     "7,1": "TODAY()&\",\"&TODAY()"
   },
   "CustomNames": [
     {
       "Name": "任务ID",
-      "Formula": "分配计划工时!$B$23"
+      "Formula": "分配计划工时!$B$22"
     },
     {
       "Name": "工时类型",
-      "Formula": "分配计划工时!$L$4"
+      "Formula": "#REF!"
     },
     {
       "Name": "参与人列表",
-      "Formula": "分配计划工时!$G$23"
+      "Formula": "分配计划工时!$G$22"
     }
   ]
 }

Pages/任务/工时/新增报工.json

@@ -60,7 +60,7 @@
       },
       "19": {
         "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 177.0
+          "DesignLengthInPixel": 33.0
         }
       },
       "20": {
@@ -76,12 +76,12 @@
       },
       "22": {
         "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 10.0
+          "DesignLengthInPixel": 24.0
         }
       },
       "23": {
         "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 10.0
+          "DesignLengthInPixel": 24.0
         }
       },
       "24": {
@@ -96,7 +96,8 @@
       },
       "26": {
         "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 27.0
+          "DesignLengthInPixel": 27.0,
+          "IsHidden": true
         }
       },
       "27": {
@@ -111,6 +112,7 @@
       13,
       14,
       15,
+      26,
       27
     ],
     "Count": 28
@@ -196,49 +198,9 @@
         "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
-        }
-      },
-      "22": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 32.0
-        }
-      },
-      "23": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 32.0
-        }
       }
     },
-    "Count": 24,
+    "Count": 16,
     "DefaultSize": 32.0
   },
   "Values": {
@@ -248,11 +210,11 @@
     "13,1": "特定时薪",
     "17,1": "工作进展",
     "24,1": "取消",
-    "24,20": "提交"
+    "24,12": "提交"
   },
   "Formulas": {
     "7,1": "TODAY()&\",\"&TODAY()",
-    "26,14": "DATEDIF(G27,K27,\"d\")+1"
+    "26,6": "DATEDIF(G27,K27,\"d\")+1"
   },
   "AttachInfos": {
     "3,1": {
@@ -430,14 +392,14 @@
         "NumberType": 7,
         "FirstParamValue": {
           "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-          "SerializeProperty": "=新增报工!B12<=新增报工!O27*24"
+          "SerializeProperty": "=新增报工!B12<=新增报工!G27*24"
         },
         "IgnoreBlank": false,
         "ShowInputMessageWhenCellIsSelected": false,
         "ErrorMessage": "工时数超过所选日期范围允许的最大小时数",
         "ErrorTo": 1,
         "ErrorToTargetCell": {
-          "SerializeProperty": "=新增报工!W10"
+          "SerializeProperty": "=新增报工!O10"
         }
       }
     },
@@ -501,7 +463,7 @@
         ],
         "type": "textarea",
         "placeholder": "请输入",
-        "resize": "none"
+        "resize": "vertical"
       }
     },
     "24,1": {
@@ -516,7 +478,7 @@
         "TemplateKey": "_RS_Information3"
       }
     },
-    "24,20": {
+    "24,12": {
       "CellType": {
         "$type": "Forguncy.ButtonCellType, ServerDesignerCommon",
         "CommandList": [
@@ -770,7 +732,7 @@
                                                           "ReloadData": true
                                                         }
                                                       ],
-                                                      "ID": "3a1c2f7d-f678-4cab-9dbd-d553c5cc6dbe"
+                                                      "ID": "354ad539-aa23-479f-a016-3f2209f01aab"
                                                     },
                                                     {
                                                       "CommandList": [
@@ -785,12 +747,12 @@
                                                           "BtnText": "知道了"
                                                         }
                                                       ],
-                                                      "ID": "637b8c7d-6d09-492c-b136-fbadc7cede29"
+                                                      "ID": "9c09fa44-2585-48e4-9587-c594706cb511"
                                                     }
                                                   ]
                                                 }
                                               ],
-                                              "ID": "b9f20530-1725-4cc8-94e6-9296cdbac375"
+                                              "ID": "6fc2c493-3675-4028-aa6b-8faeadc298d1"
                                             },
                                             {
                                               "CommandList": [
@@ -800,7 +762,7 @@
                                                   "Message": "用户已取消"
                                                 }
                                               ],
-                                              "ID": "2e15e1d7-2cb0-402f-bf85-f71580475d7e"
+                                              "ID": "fb65beab-0e3b-4c78-a4c8-57baf7a1b6a7"
                                             }
                                           ]
                                         }
@@ -843,12 +805,12 @@
                                     "LoadBindingDataOption": 2
                                   }
                                 ],
-                                "ID": "3fa42053-5acb-494e-a176-0540ce3f6d9c"
+                                "ID": "376de07b-74e3-48f3-bd56-edf207a64019"
                               }
                             ]
                           }
                         ],
-                        "ID": "5bad3470-f02b-4477-8131-843270cf2ef0"
+                        "ID": "c5c9839d-8607-4213-83e1-8be015e3ff5d"
                       },
                       {
                         "CommandList": [
@@ -960,7 +922,7 @@
                                     "$type": "Forguncy.Model.StopCommand, ServerDesignerCommon"
                                   }
                                 ],
-                                "ID": "598802be-fb96-4926-88c1-cb60e72540ee"
+                                "ID": "57f4ba20-a21f-4b81-b191-46c4028c79bf"
                               }
                             ]
                           },
@@ -1090,7 +1052,7 @@
                                     "ReloadData": true
                                   }
                                 ],
-                                "ID": "0ed27990-f180-4fa6-a493-a256a1ef89d4"
+                                "ID": "3a16c799-c951-42b8-898f-ba2d6bc6a9f2"
                               },
                               {
                                 "CommandList": [
@@ -1105,17 +1067,17 @@
                                     "BtnText": "知道了"
                                   }
                                 ],
-                                "ID": "cada8fc5-aaf1-4b03-bd37-8bacc506dcb4"
+                                "ID": "b6450bb0-31f7-42e1-b3ce-c8654820dcbc"
                               }
                             ]
                           }
                         ],
-                        "ID": "dd27db54-cfc8-459a-a3f1-8d0415eb880d"
+                        "ID": "c262b1d6-7859-450d-8036-d9bfae191cda"
                       }
                     ]
                   }
                 ],
-                "ID": "d94eb415-593c-446e-82a0-43f8d84b164e"
+                "ID": "3e392e83-823b-4c98-b2e9-c92c1fad0698"
               },
               {
                 "CommandList": [
@@ -1125,7 +1087,7 @@
                     "Message": "请添加参与人后进行操作"
                   }
                 ],
-                "ID": "f3526c21-3d96-47a6-a34f-0d2ff88f08b0"
+                "ID": "1993d762-6905-4b82-b3d1-20002c8e12d5"
               }
             ]
           }
@@ -1147,11 +1109,6 @@
       {
         "Foreground": 0
       },
-      {
-        "FontFamily": 1,
-        "FontSize": 13.333333333333332,
-        "Foreground": 0
-      },
       {
         "FontFamily": 1,
         "FontSize": 13.333333333333332
@@ -1162,6 +1119,11 @@
         "Foreground": 0,
         "Formatter": 2
       },
+      {
+        "FontFamily": 1,
+        "FontSize": 13.333333333333332,
+        "Foreground": 0
+      },
       {
         "FontSize": 12.0,
         "Foreground": 3,
@@ -1193,10 +1155,12 @@
         "BorderRight": 1
       },
       {
-        "FontSize": -1.0
+        "Background": 6,
+        "FontFamily": 1,
+        "FontSize": 13.333333333333332
       },
       {
-        "Background": 6
+        "FontSize": -1.0
       }
     ],
     "Types": {
@@ -1221,290 +1185,189 @@
     },
     "CellStyles": {
       "1,1": 0,
-      "1,11": 1,
+      "4,0": 1,
-      "1,12": 2,
+      "4,1": 1,
-      "1,13": 2,
+      "4,2": 1,
-      "1,14": 2,
+      "4,3": 1,
-      "1,15": 2,
+      "4,4": 1,
-      "1,16": 2,
+      "4,5": 1,
-      "1,17": 2,
+      "4,6": 1,
-      "2,11": 2,
+      "4,7": 1,
-      "2,12": 2,
+      "4,8": 1,
-      "2,13": 2,
+      "4,9": 1,
-      "2,14": 2,
+      "4,10": 1,
-      "2,15": 2,
+      "4,11": 1,
-      "2,16": 2,
+      "4,12": 1,
-      "2,17": 2,
+      "4,13": 1,
-      "4,0": 2,
+      "4,14": 1,
-      "4,1": 2,
+      "4,15": 1,
-      "4,2": 2,
+      "5,0": 1,
-      "4,3": 2,
+      "5,1": 2,
-      "4,4": 2,
+      "5,2": 1,
-      "4,5": 2,
+      "5,3": 1,
-      "4,6": 2,
+      "5,4": 1,
-      "4,7": 2,
+      "5,5": 1,
-      "4,8": 2,
+      "5,6": 1,
-      "4,9": 2,
+      "5,7": 1,
-      "4,10": 2,
+      "5,8": 1,
-      "4,11": 2,
+      "5,9": 1,
-      "4,12": 2,
+      "5,10": 1,
-      "4,13": 2,
+      "5,11": 1,
-      "4,14": 2,
+      "5,12": 1,
-      "4,15": 2,
+      "5,13": 1,
-      "4,16": 2,
+      "5,14": 1,
-      "4,17": 2,
+      "5,15": 1,
-      "4,18": 2,
+      "6,0": 1,
-      "4,19": 2,
+      "6,1": 1,
-      "4,20": 2,
+      "6,2": 1,
-      "4,21": 2,
+      "6,3": 1,
-      "4,22": 2,
+      "6,4": 1,
-      "4,23": 2,
+      "6,5": 1,
-      "5,0": 2,
+      "6,6": 1,
-      "5,1": 3,
+      "6,7": 1,
-      "5,2": 2,
+      "6,8": 1,
-      "5,3": 2,
+      "6,9": 1,
-      "5,4": 2,
+      "6,10": 1,
-      "5,5": 2,
+      "6,11": 1,
-      "5,6": 2,
+      "6,12": 1,
-      "5,7": 2,
+      "6,13": 1,
-      "5,8": 2,
+      "6,14": 1,
-      "5,9": 2,
+      "6,15": 1,
-      "5,10": 2,
+      "7,0": 1,
-      "5,12": 2,
+      "7,1": 1,
-      "5,13": 2,
+      "7,15": 1,
-      "5,14": 2,
+      "9,1": 3,
-      "5,15": 2,
+      "9,14": 4,
-      "5,16": 2,
+      "11,1": 1,
-      "5,17": 2,
+      "12,0": 1,
-      "5,18": 2,
+      "12,1": 1,
-      "5,19": 2,
+      "12,2": 1,
-      "5,20": 2,
+      "12,3": 1,
-      "5,21": 2,
+      "12,4": 1,
-      "5,22": 2,
+      "12,5": 1,
-      "5,23": 2,
+      "12,6": 1,
-      "6,0": 2,
+      "12,7": 1,
-      "6,1": 2,
+      "12,8": 1,
-      "6,2": 2,
+      "12,9": 1,
-      "6,3": 2,
+      "12,10": 1,
-      "6,4": 2,
+      "12,11": 1,
-      "6,5": 2,
+      "12,12": 1,
-      "6,6": 2,
+      "12,13": 1,
-      "6,7": 2,
+      "12,14": 1,
-      "6,8": 2,
+      "12,15": 1,
-      "6,9": 2,
+      "13,0": 1,
-      "6,10": 2,
+      "13,1": 3,
-      "6,11": 2,
+      "13,2": 1,
-      "6,12": 2,
+      "13,3": 1,
-      "6,13": 2,
+      "13,4": 1,
-      "6,14": 2,
+      "13,5": 1,
-      "6,15": 2,
+      "13,6": 1,
-      "6,16": 2,
+      "13,7": 1,
-      "6,17": 2,
+      "13,8": 1,
-      "6,18": 2,
+      "13,9": 1,
-      "6,19": 2,
+      "13,10": 1,
-      "6,20": 2,
+      "13,11": 1,
-      "6,21": 2,
+      "13,12": 1,
-      "6,22": 2,
+      "13,13": 1,
-      "6,23": 2,
+      "13,14": 1,
-      "7,0": 2,
+      "13,15": 1,
-      "7,1": 2,
+      "14,0": 1,
-      "7,23": 2,
+      "14,1": 1,
-      "9,1": 1,
+      "14,2": 1,
-      "9,22": 4,
+      "14,3": 1,
-      "11,1": 2,
+      "14,4": 1,
-      "12,0": 2,
+      "14,5": 1,
-      "12,1": 2,
+      "14,6": 1,
-      "12,2": 2,
+      "14,7": 1,
-      "12,3": 2,
+      "14,8": 1,
-      "12,4": 2,
+      "14,9": 1,
-      "12,5": 2,
+      "14,10": 1,
-      "12,6": 2,
+      "14,11": 1,
-      "12,7": 2,
+      "14,12": 1,
-      "12,8": 2,
+      "14,13": 1,
-      "12,9": 2,
+      "14,14": 1,
-      "12,10": 2,
+      "14,15": 1,
-      "12,11": 2,
+      "15,0": 1,
-      "12,12": 2,
+      "15,1": 1,
-      "12,13": 2,
+      "15,2": 1,
-      "12,14": 2,
+      "15,3": 1,
-      "12,15": 2,
+      "15,4": 1,
-      "12,16": 2,
+      "15,5": 1,
-      "12,17": 2,
+      "15,6": 1,
-      "12,18": 2,
+      "15,7": 1,
-      "12,19": 2,
+      "15,8": 1,
-      "12,20": 2,
+      "15,9": 1,
-      "12,21": 2,
+      "15,10": 1,
-      "12,22": 2,
+      "15,11": 1,
-      "12,23": 2,
+      "15,12": 1,
-      "13,0": 2,
+      "15,13": 1,
-      "13,1": 1,
+      "15,14": 1,
-      "13,2": 2,
+      "15,15": 1,
-      "13,3": 2,
+      "16,0": 1,
-      "13,4": 2,
+      "16,1": 1,
-      "13,5": 2,
+      "16,2": 1,
-      "13,6": 2,
+      "16,3": 1,
-      "13,7": 2,
+      "16,4": 1,
-      "13,8": 2,
+      "16,5": 1,
-      "13,9": 2,
+      "16,6": 1,
-      "13,10": 2,
+      "16,7": 1,
-      "13,11": 2,
+      "16,8": 1,
-      "13,12": 2,
+      "16,9": 1,
-      "13,13": 2,
+      "16,10": 1,
-      "13,14": 2,
+      "16,11": 1,
-      "13,15": 2,
+      "16,12": 1,
-      "13,16": 2,
+      "16,13": 1,
-      "13,17": 2,
+      "16,14": 1,
-      "13,18": 2,
+      "16,15": 1,
-      "13,19": 2,
+      "17,0": 1,
-      "13,20": 2,
+      "17,1": 2,
-      "13,21": 2,
+      "17,2": 1,
-      "13,22": 2,
+      "17,3": 1,
-      "13,23": 2,
+      "17,4": 1,
-      "14,0": 2,
+      "17,5": 1,
-      "14,1": 2,
+      "17,6": 1,
-      "14,2": 2,
+      "17,7": 1,
-      "14,3": 2,
+      "17,8": 1,
-      "14,4": 2,
+      "17,9": 1,
-      "14,5": 2,
+      "17,10": 1,
-      "14,6": 2,
+      "17,11": 1,
-      "14,7": 2,
+      "17,12": 1,
-      "14,8": 2,
+      "17,13": 1,
-      "14,9": 2,
+      "17,14": 1,
-      "14,10": 2,
+      "17,15": 1,
-      "14,11": 2,
+      "18,0": 1,
-      "14,12": 2,
+      "18,1": 1,
-      "14,13": 2,
+      "18,2": 1,
-      "14,14": 2,
+      "18,3": 1,
-      "14,15": 2,
+      "18,4": 1,
-      "14,16": 2,
+      "18,5": 1,
-      "14,17": 2,
+      "18,6": 1,
-      "14,18": 2,
+      "18,7": 1,
-      "14,19": 2,
+      "18,8": 1,
-      "14,20": 2,
+      "18,9": 1,
-      "14,21": 2,
+      "18,10": 1,
-      "14,22": 2,
+      "18,11": 1,
-      "14,23": 2,
+      "18,12": 1,
-      "15,0": 2,
+      "18,13": 1,
-      "15,1": 2,
+      "18,14": 1,
-      "15,2": 2,
+      "18,15": 1,
-      "15,3": 2,
+      "19,0": 1,
-      "15,4": 2,
+      "19,1": 1,
-      "15,5": 2,
+      "19,15": 1,
-      "15,6": 2,
+      "21,1": 1,
-      "15,7": 2,
+      "21,2": 1,
-      "15,8": 2,
+      "21,3": 1,
-      "15,9": 2,
+      "21,4": 1,
-      "15,10": 2,
+      "21,5": 1,
-      "15,11": 2,
+      "21,6": 1,
-      "15,12": 2,
+      "21,7": 1,
-      "15,13": 2,
+      "21,8": 1,
-      "15,14": 2,
+      "21,9": 1,
-      "15,15": 2,
+      "21,10": 1,
-      "15,16": 2,
+      "21,11": 1,
-      "15,17": 2,
+      "21,12": 1,
-      "15,18": 2,
+      "21,13": 1,
-      "15,19": 2,
+      "21,14": 1,
-      "15,20": 2,
-      "15,21": 2,
-      "15,22": 2,
-      "15,23": 2,
-      "16,0": 2,
-      "16,1": 2,
-      "16,2": 2,
-      "16,3": 2,
-      "16,4": 2,
-      "16,5": 2,
-      "16,6": 2,
-      "16,7": 2,
-      "16,8": 2,
-      "16,9": 2,
-      "16,10": 2,
-      "16,11": 2,
-      "16,12": 2,
-      "16,13": 2,
-      "16,14": 2,
-      "16,15": 2,
-      "16,16": 2,
-      "16,17": 2,
-      "16,18": 2,
-      "16,19": 2,
-      "16,20": 2,
-      "16,21": 2,
-      "16,22": 2,
-      "16,23": 2,
-      "17,0": 2,
-      "17,1": 3,
-      "17,2": 2,
-      "17,3": 2,
-      "17,4": 2,
-      "17,5": 2,
-      "17,6": 2,
-      "17,7": 2,
-      "17,8": 2,
-      "17,9": 2,
-      "17,10": 2,
-      "17,11": 2,
-      "17,12": 2,
-      "17,13": 2,
-      "17,14": 2,
-      "17,15": 2,
-      "17,16": 2,
-      "17,17": 2,
-      "17,18": 2,
-      "17,19": 2,
-      "17,20": 2,
-      "17,21": 2,
-      "17,22": 2,
-      "17,23": 2,
-      "18,0": 2,
-      "18,1": 2,
-      "18,2": 2,
-      "18,3": 2,
-      "18,4": 2,
-      "18,5": 2,
-      "18,6": 2,
-      "18,7": 2,
-      "18,8": 2,
-      "18,9": 2,
-      "18,10": 2,
-      "18,11": 2,
-      "18,12": 2,
-      "18,13": 2,
-      "18,14": 2,
-      "18,15": 2,
-      "18,16": 2,
-      "18,17": 2,
-      "18,18": 2,
-      "18,19": 2,
-      "18,20": 2,
-      "18,21": 2,
-      "18,22": 2,
-      "18,23": 2,
-      "19,0": 2,
-      "19,1": 2,
-      "19,23": 2,
-      "21,1": 2,
-      "21,2": 2,
-      "21,3": 2,
-      "21,4": 2,
-      "21,5": 2,
-      "21,6": 2,
-      "21,7": 2,
-      "21,8": 2,
-      "21,9": 2,
-      "21,10": 2,
-      "21,11": 2,
-      "21,12": 2,
-      "21,13": 2,
-      "21,14": 2,
-      "21,15": 2,
-      "21,16": 2,
-      "21,17": 2,
-      "21,18": 2,
-      "21,19": 2,
-      "21,20": 2,
-      "21,21": 2,
-      "21,22": 2,
       "22,1": 5,
       "22,2": 5,
       "22,3": 5,
@@ -1519,25 +1382,19 @@
       "22,12": 5,
       "22,13": 5,
       "22,14": 5,
-      "22,15": 5,
-      "22,16": 5,
-      "22,17": 5,
-      "22,18": 5,
-      "22,19": 5,
-      "22,20": 5,
-      "22,21": 5,
-      "22,22": 5,
       "24,1": 6,
-      "24,2": 2,
+      "24,2": 1,
-      "24,3": 2,
+      "24,3": 1,
       "26,1": 7,
       "26,2": 8,
       "26,3": 8,
       "26,4": 8,
       "26,5": 9,
-      "26,6": 2,
+      "26,6": 10,
-      "26,10": 10,
+      "26,7": 1,
-      "26,14": 11
+      "26,8": 1,
+      "26,9": 1,
+      "26,10": 11
     },
     "SheetStyle": {
       "FontFamily": 1,
@@ -1545,17 +1402,16 @@
     }
   },
   "Spans": [
-    "11,1,1,22",
+    "11,1,1,14",
-    "19,1,2,22",
+    "19,1,2,14",
-    "24,20,1,3",
+    "24,12,1,3",
     "24,1,1,3",
-    "7,1,1,22",
+    "7,1,1,14",
     "26,1,1,5",
-    "15,1,1,22",
+    "15,1,1,14",
-    "3,1,1,22",
+    "3,1,1,14",
-    "26,6,1,4",
+    "26,10,1,1",
-    "26,10,1,4",
+    "26,6,1,4"
-    "26,14,1,4"
   ],
   "PageInfo": {
     "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
@@ -1590,7 +1446,7 @@
                 ]
               }
             ],
-            "ID": "b2388146-2a9d-4f37-8f53-8ea0a0266b43"
+            "ID": "a6624d21-6646-4323-91cd-993961bc55db"
           },
           {
             "CommandList": [
@@ -1607,7 +1463,7 @@
                 ]
               }
             ],
-            "ID": "ca3783a8-0f4d-469b-8c1e-547fabbe3e38"
+            "ID": "f4bd3296-97f6-4f11-babe-1378aad50b48"
           }
         ]
       }
@@ -1637,11 +1493,11 @@
   "CustomNames": [
     {
       "Name": "工时类型",
-      "Formula": "新增报工!$L$4"
+      "Formula": "#REF!"
     },
     {
       "Name": "任务ID",
       "Formula": "新增报工!$B$27"
     }
   ]
-}//VDagVxypAQTb5c30m7PKyfPG5vdifRokajJxueanFVUdfnEwGUqOdRwXE+n08YU6MXHzhwVN/hE4aGAj27zftQ4ktnZ0bUb0IgG3K9YH1k+hzqR20zv/kMYbaRZH042dPmihOlbPip/djVxW6lfuks/WxJ6PD3ruB++vZlrYt9myVrQYCiCjmdmzll0pqGRsvC+fTeB0SX+msILGH1jHNIopNkHQdHfVUHX7r7ITHkHZlLkl/IbOXCkDfFtGalkdAAnyoVtCOMHypzyeHd3s/6wY0pFs52Va7giDZI3aAwYni4EJ4BLPPzP/eV+8RxGAW1gZGf/t7BL8X5GJOJi9WluztFvceyLwYrmGSt/6EVmyLBQO+aT/xE8R6zkzwRPg6/zjqFSMWkm9Wvupkeg5sZJIS2WZ2hyrgVkjKXvVgKHoIOe8tAtJSPbxqLNTGtaLLgppNYVJ1vf+TdXNQoQ2zTsOk4Zw9LxaxIqudMvgYXjP3/P4bh9x+YnJqtuJ+YaNSucCrA6EASPYmYmL8Wfb3Y7SIvoSOujuAuT2evksBYCRxnp3gUth1wSsOVcWs5+0s+QAExFEKlDJgbvbe7+g60gRyu3J9Q8RYY5IYAP3ZiP2519m63Es/shJ+yBi9zdE+xQX8nQHhB3qKLlmoG9M7VKTlqwqeuP7IVWjErNmvTug9CXK7ymB9dVHGsTz5MvAoILZpn5kl5Ye6Geb78Y/k6u0+G4kk5vto8iw4dJo2W1W9g1T4X9dc7wmIDr6JR53X+b5w1WaKG4aj5TzYqcTe+o0vxHR+ti0OWbqmN71p4QUxDznI16l5n7tyzWIwkWskeZv8onJFTji1QoRtpup9HK9t/BosyjDmgJ2fSHFARmycjInaWEq3ls82jjy7bR/tKC1nqhV4n5ey6lF/62pQg==|920
+}//WikzRHpZdmC0nkqoE3FbUrTFc68rCWik+4001jc6q3N6wvGrzs8ZmQxVc5v4bgV1HjvVXaCkCA+7AZZHbmF3xTZZoknzxHMbjnTBOowb6DzF6UYR8WFoIA2poZdi/ZjEP7JhX4n7f2zZhxHxTuQkGVjTtcsfSzDla7BdPss0U8VpBbjEPCIvepgqQvjJ/EvXVd3TYv5ezrpvO8oOY3ROUpkdOWzToHvV2z4ERtw/5xOE5MY9kC0Kguvl7C0yApmB370IU77NYU0bkDBbir3+/cLiquNr6D/l14By0PdnL+IekvbJnDqhGM3B/IqFojUYull0vLCs9piPFSTelRsdIp/0ZE9iEn2AEjgpXpfL9aVXmrbfA7cP1typEonDOf8b7AcAN4reacKswVy+/0Di8m9IIF/8SlD0iDJe6qJKBjxNmzwDd+/qNgdPAruiVL6wvLty0XY8cP+vvHoTSSdWPhOHGJhrNAQAI6M+2ILQnI1F9PQWZRq437EMZeJ7H7uj8lo2zN4fwnmid7mpeNFEfVv4YmxZkbXF+FH+lPQM4XTCIa3e1a3mZXHFGsR/GcH95iqtfLuQVuZcer7H52arl77T2fvDx67ouCe1bu9lvoJx6ZW0454yeLMLa4+VtQDjV/r86e0oekG5aPHIWdCcQkzUIVh58Hnmv8t3i5621M0eHMtdHBqeAk4j4m6wIrKZoRPEpKHkRsawbTS0nYplW5xcCafNQtzGox72TMKSkybX956pp6cfboXMevP28bnlunV2jaMzseNxvemkVqLFbPMlTLFQl1UG0IKgtNqvHCjleQQAdR0Atlu5WfmhO2FBjP8XfC+F5qHv8GTi8AXx3wnY4YsU/tZY+nbiwlyjXeCTTj5bjK5ncPGPzVarprBb4u7E8MKDxigfxWUaiYgcAQ==|920

Pages/任务/工时/新增报工.rd

@@ -1,15 +1,15 @@
 {
   "PageType": 0,
-  "ColumnCount": 24,
+  "ColumnCount": 16,
   "RowCount": 28,
   "Formulas": {
     "7,1": "TODAY()&\",\"&TODAY()",
-    "26,14": "DATEDIF(G27,K27,\"d\")+1"
+    "26,6": "DATEDIF(G27,K27,\"d\")+1"
   },
   "CustomNames": [
     {
       "Name": "工时类型",
-      "Formula": "新增报工!$L$4"
+      "Formula": "#REF!"
     },
     {
       "Name": "任务ID",

Pages/任务/新增任务.rd

@@ -1,18 +1,18 @@
 {
   "PageType": 0,
   "ColumnCount": 40,
-  "RowCount": 24,
+  "RowCount": 26,
   "Formulas": {
     "1,1": "IFERROR(\"所属任务：\"&ODATA(\"任务表?$select=任务名称&$filter=ID eq \"&IF(ISBLANK(父任务ID),\"null\",父任务ID)&\"&$top=1\"),\"请输入任务标题\")"
   },
   "CustomNames": [
     {
       "Name": "父任务ID",
-      "Formula": "新增任务!$B$24"
+      "Formula": "新增任务!$B$26"
     },
     {
       "Name": "项目ID",
-      "Formula": "新增任务!$B$13"
+      "Formula": "新增任务!$B$15"
     }
   ]
 }

Pages/共用/MD编辑器.json

@@ -3,7 +3,7 @@
     "RowColumnAttachedInfos": {
       "0": {
         "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 24.0
+          "DesignLengthInPixel": 31.0
         }
       },
       "1": {
@@ -13,7 +13,7 @@
       },
       "2": {
         "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 24.0
+          "DesignLengthInPixel": 32.0
         }
       },
       "3": {
@@ -28,7 +28,7 @@
       }
     },
     "Count": 5,
-    "DefaultSize": 24.0
+    "DefaultSize": 32.0
   },
   "Cols": {
     "RowColumnAttachedInfos": {
@@ -187,25 +187,10 @@
     "DefaultSize": 32.0
   },
   "Values": {
-    "1,1": "编辑内容",
+    "1,1": "保存"
-    "1,34": "关闭",
-    "1,39": "确定"
   },
   "AttachInfos": {
-    "1,34": {
+    "1,1": {
-      "CellType": {
-        "$type": "Forguncy.ButtonCellType, ServerDesignerCommon",
-        "CommandList": [
-          {
-            "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon",
-            "ClosePopupResult": 1
-          }
-        ],
-        "Text": "关闭",
-        "TemplateKey": "_RS_Information3"
-      }
-    },
-    "1,39": {
       "CellType": {
         "$type": "Forguncy.ButtonCellType, ServerDesignerCommon",
         "CommandList": [
@@ -223,8 +208,29 @@
             ]
           }
         ],
-        "Text": "确定",
+        "Text": "保存",
-        "TemplateKey": "_RS_Main1"
+        "TemplateKey": "_RS_Main1",
+        "Icon": {
+          "Name": "Application/069_save_6.svg",
+          "BuiltIn": true,
+          "Color": "Background 1",
+          "UseCellTypeForeColor": true
+        },
+        "IconSize": 14.0
+      }
+    },
+    "1,41": {
+      "CellType": {
+        "$type": "Forguncy.ImageCellType, ServerDesignerCommon",
+        "CommandList": [
+          {
+            "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon"
+          }
+        ],
+        "ToolTip": "关闭",
+        "Size": 16,
+        "ImagePath": "错误.svg",
+        "UseCellForeColor": true
       }
     },
     "3,1": {
@@ -251,42 +257,34 @@
   "StyleDatas": {
     "Styles": [
       {
-        "FontSize": 18.666666666666664,
+        "FontFamily": 0,
-        "Foreground": 0
-      },
-      {
-        "FontFamily": 1,
         "FontSize": 13.333333333333332
       },
       {
-        "FontFamily": 1
+        "FontFamily": 0
-      },
-      {
-        "FontSize": 13.333333333333332
       }
     ],
     "Types": {
       "Strs": [
-        "Text 1 50",
         "Body"
       ]
     },
     "CellStyles": {
       "1,1": 0,
-      "1,34": 1,
+      "1,2": 1,
-      "1,35": 2,
+      "1,3": 1,
-      "1,36": 2,
+      "1,5": 0,
-      "1,39": 3,
+      "1,6": 1,
-      "3,1": 2
+      "1,7": 1,
+      "3,1": 1
     },
     "SheetStyle": {
-      "FontFamily": 1
+      "FontFamily": 0
     }
   },
   "Spans": [
-    "1,39,1,3",
+    "3,1,1,41",
-    "1,34,1,3",
+    "1,1,1,3"
-    "3,1,1,41"
   ],
   "PageInfo": {
     "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
@@ -326,4 +324,4 @@
       "Formula": "MD编辑器!$B$4"
     }
   ]
-}//4UMIsU3XUAhlp0TB3sPnqyzH92o23JX7/YenURymmIYsf2atHh2yatBvKbDFNuTLHD3vwm0GZvewnmmiDNsBDya9UBqY7hapgCmTFmbhJUbgIh6XHMmCSqgUCTeSMSpSj3kBF6ZXIN9PG49vqU0Cz6tQSzBUXVND3HyuSLqI0UjiVqb5lUhnZx6IoxWYH0gGXsYYLIE3BUFDVxJnNd60/3UzxiHpb+QlCEvzg19w3PeHKjwo3Xhyut07Fciry5TNbDefM7V+teI7hYIrGdzljFj2sCWkNtp/CLFz3FuAeclmlGxh0ogovp+5xxVNA3cfbd4N++sGrQrEjTgGs5mJ9rfU3tRMoULgvDS8J1PG4h/PCm/U9anR650SmgMxEf0A/F0drPiK4yFyINzXkJtSeJ6kFWLLTTZn/6ZqnXjkw4/xg6FVYOITv0LtDUHo+ZBBU1ZS1kO4GhbcWQK9cJSzvP6x1dY2mF+CBDerJhM5pWSH48Ord+Yhluf1cy3OhmK3LSaUKp8xPSqq1C22j9RGiHIxPp4egum4XCbKATUOZnyldOFbByKe+LixDnyqbFK6mfX9LxbZJ7v2E28Q160U++2JNJ0a+PnnuEP/GO4FRHxWi8dUTLF5kkM7mvkwTYdDNtnT59tblNKgwAnGc7yX6sjRURpfzceatEPgiQFLWSFHmXVQd4rV5+mk0IIXZ5pQXGKq6ancl8MSiC8p6MoTbJxUeUYCMauXWb+2vAXqKvhP9TaNGUEjjOFLOPT9Uxj0RqEI+IrH7B/WRW1S6WpS16MJZLiBhPBEqftJK4clvr1Z5px7Zho6gZ1qTmxLSV0ZhroXWGTxSgWitphvefydIupmBKv1tVToIgpnTCWxCf9kn4zJfJz/WAyvJWcdvG4hcBBZtLkFKSUXSoQz7aeBbw==|920
+}//BQeffkiOuOBM0/VkbbeiQbSMYuGK045SsasgMQm2j0/bZOucnaJ2uWtbOeoyMydWTRe4ILygWjaktPgaBvLcOJW/qeID7vbpm53Ss1FWVVfDXkAFHVaXj2+dWa23UvPCGCsTKIJf+ZJs8i1F2bppYifxR+HN27oheTkFnsnT5tbvZwxQ9fqxZCqzEPfSQtk8Lt7UDDX1M3XOUmSm84v8p0oxe+XyaDJaPTuhenrWly1cXWpIE2qRnE5WFD8yZdJVOBj5/lqJ27zJhFA/qZTHRgtyJsa9cbIRi9Eb8cUaj+MxaItEEPmbyL7GNfvgl1Z2tqFLngmKkqrmessB0b3FRv0EcvYWvRNUURUSPP/aBptPpKJZBDv1C9tCl7fiakXlVZEqLO9JsLA9t8WJzAOC0/w5Qy8EyliB1Awxu/lzn3sevTjkgabygaXv+QobFgZ8FhxJq11bognBFCNHkZlcR+mNgD97zYDcHRvqyg9+6jJkwun4nMUb+TAFHfRVgpy1x8O6OESgAVDpM4kln9fgAuuQyqUd8VZ4b0+w4eCBHP9twEooVlDbqV2jMEj6ndRqLMxm0GQghxlWNX6kEoG8e8HiDr94ThFnFXdjDyVWw7vqixj85NjTMNnYDlG8maiK1Ja7Q3Kl/4b/1F+/opf685lg9AqvdQ3+hxrv/HxvJqPPd0LdrhCterx7vSYuAjfoU1bSeWAUIj2Ge+JG0Og6TB5j9e/uwpifudq0ePcJq/siEhULZb3cg5tyFbWXahTLyCWvHUQtGphfoFXN2709Q9FW8opnrdwGa9OVHVJSn8dB8o9U73IYlSWPnnZ3ghrYEMnmhdvTXGx1vII/qFh0xwzsuI3Kz0nqGDiSxXRTulV12hffrupTXPY63Xs78KiWUCEYHCsFXhQjYtG0yCOroA==|920

Pages/客户/客户管理.json

@@ -498,7 +498,7 @@
                               }
                             }
                           ],
-                          "ID": "d742c58e-989a-4f62-90e8-68973c2201f9"
+                          "ID": "23b73ff8-853d-46d0-80a7-af76d60731bd"
                         }
                       ]
                     }
@@ -804,7 +804,7 @@
                             }
                           }
                         ],
-                        "ID": "e18d36bd-2d79-4310-8db4-757fa7499c80"
+                        "ID": "14bbcd7e-03d7-414b-a18d-186c9493f82e"
                       }
                     ]
                   }
@@ -1008,7 +1008,7 @@
                                 }
                               }
                             ],
-                            "ID": "41009268-c59b-44f6-bbfc-4996085f9263"
+                            "ID": "293c17ec-1bcf-44ff-b515-792f3dedde03"
                           }
                         ]
                       }
@@ -1415,6 +1415,13 @@
     "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
     "MasterPageName": "FGC_母版页",
     "Title": "客户管理",
+    "PageLoadedCommandList": [
+      {
+        "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy",
+        "FunctionName": "remove",
+        "Title": "加载中"
+      }
+    ],
     "PermissionData": {
       "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionData, Forguncy.RbacPermission.Core",
       "permissionResource": {
@@ -1446,4 +1453,4 @@
       "Formula": "客户管理!$B$31"
     }
   ]
-}//nZrvz8XI/v6XRJcaBI7tPx6beMAqcLJpzN9ydVx4q3rF7+238ESFzXOIK814CEhsRJlO7Nw6JhZTxC8fFpfamNm8WbnU3+gLHD5BWz82XKLpm/cTHwvBoUWAxep/9EeQn0n3J19TbszpBv7L7Dy6SjNYHP9HGTB13RZlQnCYI7CRoO59KS6g3XgvOSRvAmpQhPLTXI0gN3WVWWZiaklXrQXMKLXtKwkKTiNOkmoo46pPkkKdLGA5eReYJletlPilvWH/8KyUprLO705LSmbiiTYCavua7hy1+gQAu8qw4OuJv5bNdMSJxaSFaf8fYBjlHla64AUz7K3ev3bRl5ymne7HroQdvsNHFT/5/HSvDzL5qfRWdVz2G9iCIReEfz4VKz4Y2PMyC2WtQuk/s8n1UFdNChk8bAtRfTGrmdlEAcoQRfOdr0UgUtOrojGpD+ZZud35ZXuzPAqQaVMmtsboKOptNYVDAo9z8BRjXy7W8vuYg9NLr9bOcuM2MLreRsPdhsqCkYYcQJc4DDiJTArxz5E0l8oWLaMByQC6iWT6Kb51sFvBN0fbQHm/+A8JzFc0Osi4tGZWQNj2TwLf+FoGsgEnKhYl+vU/pt5JM+O/vHc2zv4NP+kKMyXa34uqHjtOtFDApyB6qihDzQgjZRImfwFygIhyAPefsj2MNUQPinatuZEAarMMkFp/F/qls/rF9oA2cqhg+YV4ykr01uJCdmhd7cmRDP0SsUN/k79d28UuhWBVMKdo2g8zIlxLC4DNCJVCdzskDy/tR6suLISa2LS+tOiwhd6S/LKyi7IOPsinMYYGV54gtm5VnFGBiTY3Qkvtx9UE8XetMCs1AKzEDFSqTs24Ao3+8ojLgDVpcnbynsdyKZ6r/Zxa1ASTXrE1/2UIT/PcbBRJ7N2Kme/jHg==|920
+}//H2xXM1xPKkwPRFxW6V+jemabA/gWfdjLmkOAhLkfw808iJi9tOKrFRnQR/o8OSCc3mpqL2+1ok31pYPkNLkmvz/wWrRztzBC8/WlDT7aEWXj7EtgOf+EZDPSSPWNZ/yhh/v5vV8nAPi3iT1ybE194Zf1H9pQqZzR5hoLrukVQ353l5hhVBwt+/8YxTHCHBsI7MIHv4ru57LlCvR+0IWmg5nORlpQttLL32sXhU7icWC6oPnHOWbcCA2nz45hdAPLw+XMJx1fDRzzgAKuI4Xbm0l6d1M/oEmUDcBxU1TfdKeBtoTUr92iSSwkhPZRawHHAf59ogS2TsDXe56copu/KbkY+0/mU8JyafZZruF3C33IocdTavY6iOmiA647Aijf8zHqXw2rZOxaDqzEHtQSAX16fZdKNE+IcjrYwk2ySOoaODYQSjrLVzUAJmQEVArHe43/nlxWjAni8xSQnX0sV+AUsbEYq2waKy/kh+zwpHQ1ViCMeyWZlztPnDHLxvlvz7f434Wl7OdQsC56yz98aFERwuehGuyPC/Lb1Z1iFySnu5F4jExi8ZXI9rbPrbiXP03LjGAUrmjJo9PcLjYdrjk6+4/4LRwKEViYG+G6dU6r8WVg+iY2wK5OXO17bk5MMCCdibP9aOIQLJeqhPTvASgOagiqEkjocSqfpjbKbHh1zikf2uF+Cj404X7pAZGzmGCAQnAJkQScJzbD4JP42QqLkj3IsyZrjAtWqwvZg5M5pJ0E2X+3S4OCtuKsCxoDjNayoavSqTjnQxYKiVGdZX3vXiYJXAS2ZpSIzx5jGLj++xrZ/EEkfN13aoYkclCL1PbNmXkH9xUj6kaaLaU2qJWiL29aNuMxGFtv+0xvWRhK301zBs38UpKuhrt/rt7iV8b4xBW9DcdV5MNS1AeDXQ==|920

Pages/工时/工时总览.rd

@@ -1,14 +1,14 @@
 {
   "PageType": 0,
-  "ColumnCount": 38,
+  "ColumnCount": 37,
   "RowCount": 21,
   "Formulas": {
-    "1,3": "TODAY()"
+    "1,5": "TODAY()"
   },
   "CustomNames": [
     {
       "Name": "财务中心子页面",
-      "Formula": "财务中心!$C$4"
+      "Formula": "工时总览!$C$4"
     }
   ]
 }

Pages/工时/工时首页.json

@@ -373,6 +373,13 @@
   "PageInfo": {
     "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
     "MasterPageName": "FGC_母版页",
+    "PageLoadedCommandList": [
+      {
+        "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy",
+        "FunctionName": "remove",
+        "Title": "加载中"
+      }
+    ],
     "PermissionData": {
       "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionData, Forguncy.RbacPermission.Core",
       "permissionResource": {
@@ -394,4 +401,4 @@
     "PaperSize": {},
     "Margin": {}
   }
-}//okbE1Y8oZwuk2cYL9uTPuaC2rXiun5vxx88J7qA3WFNJgR3pXzA4Nep5sDYGd5PHfCGdsAKHqhK0ek+QzFYNhXaQg1kD9Gj7X7a8u6KqxroesQydQwsykXHAtH2Eqq11MoCeTe267KNsmbMrKr7RtKzTPvkAmbTDMG278jfLs6APeOwlKNbl9IEkuXsktsRd9dE3pj/uzKbBz8a1mRtqXQ2yP0aPP9P+RkXtcazz+yvJzIThxqJi3Dj0rN8p6+o9Rcbc9E6Zpb8LBe56+CNOGSPdCBbOXJcVgUrmiFDrFS5iJvP/J9uod+C/4Mgq7uDjjD505F8iHg43iOV4HNx+g/QJmNutKLX2sz258Tm1OUI6xv42At3qjPNNg8bKRoat8PUCAFeLcggFi5zrYUGhTRMUcsR+sL0C6ruG5Z/7DIJM8xLcdFPP+qBUegVNb+z73S3LPwFqSI+KMqEwTt0eCIHTgv7NzjGZy3SOrPA9ypvdCv5WhqPQyYrKmBIF6rbLGEjHosp/SucdjfXD9P/bkwZNERepMm8HxtGqWYBoZgCJpQj1iVh1TVRe4dQgKgGqYVVMXHkfeSn58B5AOuOgv6ReeNlDKtALYKhnnOaZVT8BcntZpEeypiHW1vQgjBnId5/RdOcVB/AoJJIy99ha6uOXhwBSg+rdntSlp45VjBvrQ0MYJs+fj9mPnXlUZaRywsVbw1LoycMFs+1E464m+weqCbopMSjPCymXFwh/z5w+NTgUJZVXchm7M/DFwS8h21SPp5srqEWAcLlRdyuw7+YRcUUD0NfJixda/bPjgtw+UNHQWP4lZbZvfoX8TgaNidlS7yV/5xGvi+AIyKLJxg3BRPwYRDwP3TgcNL3oTXnt8BDgeHV4TJnBWUSAmPDImRu60sdA7P8jhYqsvwZEDA==|920
+}//Sr8Y6wr9Jjc7KmbH/yN/Z1TR1bICdFT7gb3T3N6GkLuH8c0n7FYyPK5uMgK8RGa6SSs+op9XyBIVbpDiJ51Rx+G4YeMAwzNn+rb5z2xpxaXTloJB8Z+0VedsZ6s8igSdJtsJcyYE3yLm/oY7D7DzcRBmv5fW2o48UtSNehMne97pjo7CHYWZn4JqkYUFtsqFeBEod+oHsuh+5FjADpGE/D2i16etFLVp9j+VIYAFLZowfyhMdg0YZhrBJNXDpCSLhYaJHtFl9M/2c11MpOz+cJsGedMEHSUeeAnoA3VTbWzWnIxxk0hFHH9qTvIzGcX9MtxEEQ3zfnY42uLGRA3mM2eRnoZl3D1IwOEquHbZKAfR1QLpKZ8Re/0m6dZTs0Qo0g2+N99eNhmclgRKJ4BQyfBQrKp07jGK4A0LmicrvN11zf170aECY8G2FUIR0KFgVmFEO5SHdrTNbEc+sNeEBas/biaYaHpFJiUdLDJISwaYdZuBO7IlaFjx9v4N0WoodnSnHDCrxlgMWTrOA0Cb7S0wq5npBVQlPeztIMsm/+5bXTgKiyu4i8D5W1toNVGiF8b5gzqyL5iQBCvnIpR93GsLMZm/YggO91Pm0E4PZi66LGt/DMZJFQiAR0VG3t54zuQ1HW863zl2+/ms/mTp7HjktXPUjRYJi/GwyybVLJ8mGyz3q0yqB+8bZZUzLQ8yGECxwqOLKb5wHEXwzexWlw6DyIDYvM1YZzzkCqqvJjFkaIm7roPV+ozP414hK8HXPeDAQItdcRdAcwZacwDdnzV+zM6CEsalM+L7NJmGL1CXi214myGQ3RQpEc79VIR79J8k1jbdXBs+GRi1QBb6rk18dv6i7ukHoYPLDiMIrE6WwzLYl3Lzf/vPlAMlIkUJO1EQuw9C0arDBqH2v6LIoQ==|920

Pages/收益/收益中心.json

@@ -238,7 +238,7 @@
                   }
                 ],
                 "Comments": "如果流程发起后，存在当前用户正在办理的任务，那么弹出任务详情页面",
-                "ID": "934f1b58-3999-4872-b1a5-774fb709aef7"
+                "ID": "418d4110-0d1e-4824-b7ae-a79072c666b6"
               }
             ]
           }
@@ -402,6 +402,13 @@
   "PageInfo": {
     "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
     "MasterPageName": "FGC_母版页",
+    "PageLoadedCommandList": [
+      {
+        "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy",
+        "FunctionName": "remove",
+        "Title": "加载中"
+      }
+    ],
     "PermissionData": {
       "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionData, Forguncy.RbacPermission.Core",
       "permissionResource": {
@@ -423,4 +430,4 @@
     "PaperSize": {},
     "Margin": {}
   }
-}//7bjHua4NjoJ31iyMV6jAV92OrAjjic29HbD9mxKZGLZNVn+OCc781wyZg6DoRkRqXcVO/koVrPEsV6Kf6Q7FCvMBdO1H9aaYonguBAku7ToaQuokp2IaDGEc73Rr1rQG6Xoh9xpSdXHSxB4vIWh56fwrUdpq+QGIcNItyt8Sni54VV3DY159cOFROYYJBynEHXwrMpRNv+MkQyk7aR/PqAv/5qmU1t78kErP03J4VBE7vzAkrRG4EJrcZT/5v3mFocKaPJ3CxhlqepcT7DeIXUxgVpQ6MASsrCii2bSTLWifUaqNwPh0V34S4A+lk2k8QxvFcQQHA5wvK1PqnU618eN+LPOTS1Yj05jD3iaySQncmG4i5Eb8vYtN0rZa4opFmR0lFQCNEgTY8WUN/zlpxLbsyShnNxXVab7VVpVyDbCGDd+gLZ/SIGPEL3pWn4VZW/vMF6SYadACrysoPVKa0HbJ89obc0MnWF9+Ce7n5BjhRIT67UBEln+rp6gmJYSsjnpf8AKRvz7P9cqpJ5RsKAcKhfVx5MLAkbor+DgYtsLSR5dOvvJWnGJ3QHtTM1DslumjHmMaRPfNO5AKyg3BDb0L4QuoVA4tCxgoZnSryvcY/X0Qlyr6SU2jfPxPm6Xx6nuo4eZXuB6ZEn0IC9wb4LJYbTeC8uqlalaEKemdIEtwcUfooUEPU7egYBIN0epBjGg/1TcPfwHD4k7Psq41O6vF7gjY/7ehePpsbkY/V3mWv5Ms7+YkAZqiDCHDdqlxzMgLAIF/uyiGXrcdZM1neIshiTxhjMJQs0W0C7ndtqfFz1EShrLMmLlHYFikG/b8MBTfdnA21ub/w7Pa5VOudUlHwIVr5NoRKPG05PFh/OF92w5HxjRZvcPLLwfgwEDMQw1zPbJHAdMGGjTzLcRfog==|920
+}//jW7deLplKWKjJPhVhYfOce/fvE6w2CEH7dZDitpS1R3zYn1G0nAQ6fd9Ne+hsZFH2Mmg4g1pbJ6ukJTDk6YJuh5n2JK1uIsrsJh6ifhgqRbUYcVOaI75CnzrFV1RbJn08Pg+Yp5JsUC6w9d3KMoJ8r9bzNGdZXyPLG7GU12uVh6SttEMSk3fxypJB/efhn05+XRrpM7yIZw6yvX7i8A1rS0zAjl5SS8m6jYQtrD5s336/NH7hvHZI9dK7gEbLPcaBjo4R9TaiA9tpuo7NA99wmBSLANpSwAeb8JH2ztGCYzcMCsJI63viugIIFcQvlzsENR1hzn6oba/ltXOYYXF+NVpLEi5uVVfP1KaJroIV73tLAse206rt3Abtt1l3FR8AYhkmNXDoTnJNhJOjm5q3qU5OIbVGq0JZQ9t0+KbvLe+GVTp/EI2CKtvb7i+ByQj2agkYoasQ/KFhgGRJ5LnR2hLOb1KRRnfVhi8BjHSwgTUDq9i1acjr5S9N5N5dYriDTo2cY0K0KP48Z97EI61FSfJ2V6+edoCZZshhwi8RaQbFzyRGrsQNE/D8k6MzLX1C3Bu28m94anafoCPSDwCgSkGNYj/Ph1iJXA8Ms+NXA+OlzR102CAUcwnsSaLlHspkTXFgluh1vAEZF960+TzKaXr0BIvfOQ6qo9ixLfAFMTUki3eqFRdBEzxPO+d1uhuEn6rFVCfkmMG9Qjf2Qis2Ga9ZgOWDRgJCoJz5FVRVlkWHzmDHgU77DmcFlnoc6a1Ntn4R/1obHPR+J+F405RsPhiclCkYpVgGVz/9c5idusV7fX96KVk5GfOus2MokmTaHeTWONpcJhkdn0Cx7fb+0aMKFZ59j/uPfPy8uAhjLmEFtwQrZ10DsnsyejfC0Ki8h2AhoU1y5y4Eynxl2gooA==|920

Pages/汇报/汇报管理.json

@@ -473,7 +473,7 @@
                               }
                             }
                           ],
-                          "ID": "6f15124a-1ca0-4275-9f8a-ff76da7a1e84"
+                          "ID": "fecb2a01-4868-4f2f-9b38-1c912e8232b9"
                         }
                       ]
                     }
@@ -781,7 +781,7 @@
                             }
                           }
                         ],
-                        "ID": "bb3f401f-f50a-4e61-bcb9-a11081aff96b"
+                        "ID": "321d964d-a039-4a49-a93c-7614aa6f7035"
                       }
                     ]
                   }
@@ -940,7 +940,7 @@
                                 }
                               }
                             ],
-                            "ID": "6e26e223-d36b-46b5-9af4-e5f43c7a8398"
+                            "ID": "fab9717d-8efa-4499-91b6-c16421c8dd78"
                           }
                         ]
                       }
@@ -1409,6 +1409,13 @@
     "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
     "MasterPageName": "FGC_母版页",
     "Title": "汇报管理",
+    "PageLoadedCommandList": [
+      {
+        "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy",
+        "FunctionName": "remove",
+        "Title": "加载中"
+      }
+    ],
     "PermissionData": {
       "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionData, Forguncy.RbacPermission.Core",
       "permissionResource": {
@@ -1448,4 +1455,4 @@
       "Formula": "汇报管理!$J$23"
     }
   ]
-}//5KIFxjUHi5nXHZETkLWBhQPAlUVGiVaRyn/RSNtKQnwPjls1HsdoDaOlJmfvnv4d7kE8bVIVZifi9Lr7gGDegccg9/uHQC7uKDskz9a4QZ2LzfY7QgWd2XDMuOayeNIZPhIx0C7LnN1sgPeJ/lvi39XDniQKdLaUEM/WygPrGTgP+Ai9534SuSa4+/aoke9yDGnWChkDq9UVqhFaOQ0zmRmwp7wtC9FJQ4qgecQod1lAF73RIvBcWB/s49RutLUkW82nKLuXuSHmX1bE/UzOYw1jHmmgBfJTivEUZv7LGgktyh0PPi9yowVmOu31KPmt+ymQFUIz+z1P1cGvRdICrMGAYMczcAn9EqWsmOex+zeafror+fEzRtyHXaYpAO0D0vPrqtryBjJkUR7EeC8mI/9RSc6Y2zV7cxIcpUUiZbZBQPptlByIelNVTsnEXWH9wS631tMkyvtsZ2ofVsio+bRLABOIFLI7SrKIHthi19MBEtfL6rdHep4JAy34bwOuWlvnoy7cjrBk5h8I6QthFBWojGQPbkUcxzgX65jr1YYwRqzniWET7xuNKyM4a71gGrtv0p/QD0jRRu7xUfqopHd+KGGg6b6NfTOxfoupZAm+qavROlCRtmbK5cvprfI8oZ7zN6SVOcsF3F18c/Nr5+T2doU5SItmC9GquJrL4UJMWdjzVYDcyJs8aG5JhOtSfhiWMriLnN41Xm6DbdA6WrLVq/nGjvE+rElfvUzoPG7yyQ3FH/05Js6KOnoyvdpo/B3+fdz2yT4AwE8ktEuuc4LlGUqK7Hl1+EtvVVBFY7MReFB02u/NcUuQKgiRgXg25ti/3jlGALRByRsr0RFXeKg6HFR3EyKMwkdncl21XCUIrwShiwYFNItGBPUu0wXmDh+wA/JYJ5C7RCVJ5NiGEQ==|920
+}//BaN4h8WmkiHxSWglDmQWkkcQQ0sR6ObghFSd2TxzVuswL7IkvMEjHp5PAFH6Lejfmhcv7cByaRXkfI6ftbu/tINvKWH3SukLbDgvvLNGXqLIsdeHjvQbLXG+2eGL1JyDoIe6tKWKYIReqGe6i14XM0SyEIXcJAU6l7E5dHwLvLeL7++n8m8Wpyu8coCLlByTzti0u7cirsoRQrUGd6W8Ll6s6Q+0XUYf4OI/w3ngyIWUjk9uW39hFBUURv1TUGD1zHeVm621TSGApZ+Eb1IdTDsFlSnn6oYlq89txbjsPW8MLP7cTfeCASSOTkHEMQTxcgYZiLJyMxC5jGXUE8fZl1Wu0DcXrtN9tagjv2FsIHr0WWMNbagQLlAab10JQn5+PINE9omZdug9nug6vTqqoc1ozclqL4WRXhDVGjA0vIjrEGQZBnDWzyN7utBiTtxywP93ay4gxasypDDMuy/4RSmeoQ/N8+1arAUoIkxQM3hhRT44umYgPl4UbLm+tAmKES9M0NXFjSFKS5qudJN1u8Kk0O2dXBMcYix+AtJZ3Bq99jXAJ2TaTDANeweFrgUfLlzsbgdjiXHiHbJAuhktlmFc4ZYDxtqw/yzktLnTwT3k5yilqJtuDNIs6TPgac8EfsUUaWkeV/LoKX1i/vAR29J0wtxPLlNBRe870EZHKKFfKENb0kWwzieJleFJuqZlBj6wSCUmOAdA4y2phBetH/u3lTkLMMuyJUCIZ+DpnrRhznMcK8f0wvUlbIeHVXSRkdTewgOZls42dtI0OsH4s5wrI1OWXiewkQC4wCQ/i0qzDPOTykNWcMl9GL5Fsj9t9PgBW+1lzuGiM6T24OjdK1uVdPNdOR0XRAYALLyfC3Wc8FW30IqQPbsjJHE1XQyNY3kTbKvcaz/4I570WRnmlA==|920

Pages/项目/项目列表.json

@@ -477,12 +477,12 @@
                                       ]
                                     }
                                   ],
-                                  "ID": "a2162dc1-2966-41e6-a86c-3d798fcc79f9"
+                                  "ID": "8a3241a5-8051-45e4-8a41-670d6d7c5f9d"
                                 }
                               ]
                             }
                           ],
-                          "ID": "75a27b99-57af-4100-9853-f4445e5fd305"
+                          "ID": "abc37e28-5ad0-4d79-a10a-4649dfbda6eb"
                         }
                       ]
                     }
@@ -981,7 +981,7 @@
                       ]
                     }
                   ],
-                  "ID": "9436f4bd-02d4-46ea-9c6b-5b1e44d72fb8"
+                  "ID": "c0607921-0572-476a-b157-bc21aabe6a1f"
                 },
                 {
                   "CommandList": [
@@ -994,7 +994,7 @@
                       "LoadBindingDataOption": 2
                     }
                   ],
-                  "ID": "9415c21a-ec8a-42f7-b88a-801869f65cf0"
+                  "ID": "79abdb15-0bbf-4501-bcea-146e441c0aa2"
                 }
               ]
             }
@@ -1552,6 +1552,13 @@
     "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
     "MasterPageName": "FGC_母版页",
     "Title": "项目列表",
+    "PageLoadedCommandList": [
+      {
+        "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy",
+        "FunctionName": "remove",
+        "Title": "加载中"
+      }
+    ],
     "PermissionData": {
       "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionData, Forguncy.RbacPermission.Core",
       "permissionResource": {
@@ -1583,4 +1590,4 @@
       "Formula": "项目列表!$B$15"
     }
   ]
-}//U/BDgcJ5l/EeWnMp7PXu3s0g0/mRc/X5Bgb5WMAQZv1D6oLuIicG0FHIim6AZpONE2Wcs1U87eV6dQrg63IeXieFZFyC8ZbqDqovi0S2XycCneHbeUa6mcR014ZmMYW6XzN5/xT1pT6125neLsF2bhtCBWzPSrw8xBDeI+f0EW8E0Rc+XOzmcpcdueCMLN4acn0+KKwFkSAfq5ZBj8QjLkBbjDwxyYBDEcegOpRU7uRzuohs7z8IFCzOadNme46EZm9r0ECU7CDTVzOrbDENaj4TrT4FGzra5cMJ9XjKVchlF9YUXnevUyzG8Dt6q2thpYts/SlmPR2h/nftFqL2A4Ek+H/Z450KlMa8/FFT3OPP1vlLLEFfuWgek3uvjzfL2bewPjQegj9u2vh3eik2vsBozSXrzopIHoHnHI2XeMeh9mROVaaKBIlLlfiCxzSnuBM2jUuYJj2lLELKLyjFmIdAfReg7jLVtK3btiTG+IQJkuFz9Ctrhp+la/V8i4W4T+SUSA3/ciYMsdf0fPFIWJp0j9cXWPey6Tl/iqfZCNqjjjRQ1M/Lf/BGi0r8QWcWe1H2oYdtkYYAQw600LngcGmyydiI2rmw8AuqAqSzf1q4a8tLc2jke5nM6oRWg74OCt8sXxgKGkCQORBXPJBTNUcO6X/+EtnrFD9IbS7hDEq4Ni7rLD3nHG0yIi/JzhsyBzpzaqRWXlSPpac0FVApDmE++gm/C0W7AOHUL0vx8VYuKH/uWqv5NQUH+Iy0vk7AfbmLWiOc7uhDhIcwh8daM5UmhARX+2exhMi9qqPDwtPzbEsnjH8SbMn3hBp9ab+5h/JkwHSdRKO1zsyBa6HuJMX/b/7oeVO7sWfUroDoCleK8jVDGfAxT9Jh9C5CBq2diPmFo9QHMtoVJ7XOr9zavg==|920
+}//vfyXaWbIqKmet89NnB5evBaI8VAP+xxdulrCRKzu0HvKmgUJJxZg7cDRtQ5Rxi9CIXWWSIURT5GXv+118hQukjfYZaGq8UJGjZ3A8/5fq3Aq8Ri2r86FmoxVyrGrJeimsZtxZBvg/RX5SoEGLVHLqdNB4uehwvg4cWqZn5qaENiRlyyhfFnbtBCwAZ5cgzKXRi9/vkDWc3g5pXQJ5F8M2BBrvT2IXJwwg2LweOPK3zKQef+P4MPLv3ZT8B52UUv0dVczQBbyh7Q8f4yG3oaMgysWU4d5Yl0ZG0SuTr/SbvepEAukPDN+xY3tFRFivGFxwLGjDpOszjTuEG5rC6Hw0tzya4M9i5MVMnCC9f5jWZEmU9i9VTuFYrVSviImXx8puhf1awzv8v1WyZCKMMpvxD2Qw0mewCjxabGCq0XtF04Rft2NWVQIzHgO1KJratvNpCtLZ0zFFZRGB8QV2BTOx9FkenFCdIBV0YTBm31ydpuDUvC1mmqMaEzcX0tX61fHnMiMTkaHIwdmwxmB0DPplKqEUoFVW0KTr1snl7Kfjf1mpijk5xvpEdjVCHk7widbywcDvEs6KugcMdM2ABE+d+4kGnx7d47l5Qbho6b/vWZUGwu2aoQWR2yPzE/p0a2IFlVeFFymNp4xp5xjPZhG4bHIoI1pTG9AVqbHYRWJoJWdgdrHLIUValSzTs1GwRf8LjtbMzX5MRK8+MBMQAWfSYEIi3ZOHzzuG3Z1O078ThVvv4a3sAvduNcnqHj9hkYHYpzXC7nKHVifIVm5nj5c2ahv33po+T9pl/raUP20oCjuqfKtvrbQdNoLgCT9lQH4D5IJC2xlSFmU5lFTRMdUFwBj6s46kDjgt0iwZu0GSHbiT7+dwJjkyyIiPpROEp4ACQbC15sgB73VqL6coS4qAQ==|920

Pages/项目/项目首页/项目配置/项目信息.json

@@ -97,6 +97,11 @@
           "DesignLengthInPixel": 32.0
         }
       },
+      "19": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 24.0
+        }
+      },
       "20": {
         "GridRowColumnDefinition": {
           "DesignLengthInPixel": 32.0
@@ -179,11 +184,6 @@
           "DesignLengthInPixel": 32.0,
           "IsHidden": true
         }
-      },
-      "19": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 24.0
-        }
       }
     },
     "InLogicalVisibleIndexes": [
@@ -574,7 +574,7 @@
                           "MethodName": "ReloadBindingItems"
                         }
                       ],
-                      "ID": "f7c704f5-c64c-4502-934a-c31f8f724793"
+                      "ID": "56b63745-1da0-4a39-a943-13f8ab31c3a5"
                     }
                   ]
                 }
@@ -773,7 +773,7 @@
                     ]
                   }
                 ],
-                "ID": "9a90364d-c26b-4c42-9afc-4f22ef491520"
+                "ID": "62cca6df-6081-4cf8-80f1-31d91f2e963d"
               }
             ]
           }
@@ -1476,7 +1476,7 @@
                     "ID": "613d6db5dca642d99eb01056acdc150c"
                   }
                 ],
-                "ID": "9ba59697-00f0-4fa1-a213-a6cc8b6d7d4a"
+                "ID": "57f9141f-ff03-461a-a854-53781719d436"
               },
               {
                 "CommandList": [
@@ -1487,7 +1487,7 @@
                     "ID": "82821c155b76412f958cc0f74f5fcfbf"
                   }
                 ],
-                "ID": "417f4204-2792-4a8e-a7f2-f4a2b340a10f"
+                "ID": "bb34b98b-a7b0-4057-8460-ae795cdf7587"
               }
             ]
           },
@@ -1727,7 +1727,7 @@
                     ]
                   }
                 ],
-                "ID": "f97edd72-2df2-47be-85bf-d35b6b792859"
+                "ID": "3971453f-6684-40cd-8cae-a48a5b6be1fc"
               },
               {
                 "CommandList": [
@@ -1742,7 +1742,7 @@
                     "BtnText": "知道了"
                   }
                 ],
-                "ID": "7856898f-548d-46b0-947e-794eb9a20008"
+                "ID": "c98d3bcd-64c7-4300-bb5d-ed6bf08c9a39"
               }
             ]
           }
@@ -2412,4 +2412,4 @@
       "Formula": "项目信息!$B$36"
     }
   ]
-}//03mu+5nOs+cOh2Z5Zq9gp9pTZ4RGEU+bb/E6jzBjBzP3kRcvcFvb8uMODWi15XdSND1Mdsr97YtyzpsRRkxYJMCUJGgld5TjlQp7/N6z8G1a31gSnQsVSYfB5acozNxymJTB6GJOu9oBivj1+vwx952wP+9wh5/rl19s3JeXAD/bWvsezi6j7cafttqKarVQgsSubjx3p0f4eA/fUT04i/nmUF/JcQcZooVqTZuHPXmVPPSoB4LBv5LyESx1hNnN2sPR19kdD7famJEWAuVxZsYNFldzO6Y85aHfxYCdlB+2y2eZrIfpjEGZ7iAgGtphOjzIFDUBbFMh/lR6H15nOudZY0OfBa50+wxmIqmzaaIsFe0lMJcs7m3yM8OXemKzxrQjJFWkJmWI7Odh3YkQtWUHcXPitKymtFsdsC6p59KHkPVD10WoTtcWYToHlUFVgGR4nwgMxhA1d0AGAdSytNOeVox8tk+Q307jUZuLVVY5GTObK2xp7lW7bKVjMH/DtcRJAc4KqJK8FUvlKa5FXs46eneZIf5R9IClLsiA+Qa4T1NXkIuGbLrxpoegxR87yciv80FqjsBhzXHT27MhMtuHhgIpJPZx3DYWMKH8MYFjxnlb+Wedm0mvStlKCX6UGPUymZ1zaCBLYNe0c93lDmv2Ee/X7ZBpaFFi8UplZEm8iVm6pdv0YVCmSQ4lGFI+LaSBnn2t8DJxKPy9Kn8imBdRyIWjFLqX9cC08QwdoJZVHIGH4N+TrGBwKZ7AFpP/8MC25JDIyjSDq+jM2qx9Vh7kgrIyvNWgPEeuAgludrfrFvVc5A6vE7dfWlUFirSgyaxJJQSnpagLJqidTlaIIJq6mNBaFdU9O8L9RlyyBZoY4v2XyUdxxGJg5DdeMdGUepzatKcuUSSE8jBJ8OVFzw==|920
+}//Mp9pVVGJAIjCh73Ru1aeeCQUMExYLdwrvVUFEcTK4P71RVp9eAyzxLu1cJguX2T83YfBMqJiM89cg/cu1yXucoSvLjq1bN4o1Lnrq4p8qxg1eRsHP5e08g9xGqe33CI/5UCQs8zW5QnrL0vwyBpkmJyd34rX7lCQcwsYAjqIdTgvUfWWwTGqQTfRdhpunC9w46X3aF3ImVstR7tdezj4r1PCIFjY6/4GsIbFQ/l9UFvJuzVtLv+ZpfsKMy5Zmn1oOnFIRBq3E52dTboit6L9ZB385gTDBTvyYiUgk+bHa3IxaEkKKMS6iLQGSREk1KCfiTOLxeCEWDgHbOqstF3/RK3bk2ks6aP/OEWUw2o28izBN6T7vPm6I4ahML+zfK2DMI7xnq+XF9UYrLTm3PyD1O7/4A8RqYdLpwpgY5gkFdeXPJYduUSWSU6pCRmQ/VIrLIIFC+/Ye7cWBSnVu+qNQa3zcD9wTL87t8EqPgK0FOmCZuItIX+Wp41jBDF+g/kWL1UW5ZVn0TgC7CqUU4CGESQ8bptQJsblWl+e+kULNJbh27ZrlDaDNWAEJZ8/ePPH57Y8VtNslDWjRftYaL2pyv4v/f8EGbRauuQMZIhpajT7NqkqOw6jjT4g0pMRdxhW1gqgqS1ddF+uBl9M3Zm+YGwUg+7T3JX6H+FJF7k5eAvs/ynV8Rkvwzjoiyu5IV7KslxH0yUWzTvkBPjnO19Q8DuLlw6PW9YVz/Idf4kTMQrMik6IqrDTjy53Rab7F7yDAejQD+oH3Gi3Be3q+3H1IlVcq5w16co9vhX4dl6Nn24z3tQLMph41AwpKvjRfYXPOfs+YZ5ulqXuGl4Xm6iIEjZ/2QrBlE7vcqibB7p8AOUa4NFvgUg3BEWT6xkgHm5zUCN7Qrp2yR1vh0NRMnWngQ==|920

Pages/项目/项目首页/项目首页-容器页面/任务列表.json

@@ -467,7 +467,7 @@
                     "LoadBindingDataOption": 1
                   }
                 ],
-                "ID": "950ce299-7352-453d-b59a-789b2b4ce74b"
+                "ID": "561a9319-b4de-4ff5-88a2-e4b5c47adae3"
               },
               {
                 "Condition": {
@@ -501,7 +501,7 @@
                     ]
                   }
                 ],
-                "ID": "e549f024-9c5a-49f7-a0ca-1215fe963c98"
+                "ID": "21360fb2-1ce4-437f-8225-cc4ab5b1ec3c"
               },
               {
                 "CommandList": [
@@ -521,7 +521,7 @@
                     ]
                   }
                 ],
-                "ID": "0ec91516-2713-4ce2-8f73-929b50445a37"
+                "ID": "00d57c25-5715-4e07-957e-ee6e439c4328"
               }
             ]
           }
@@ -805,9 +805,10 @@
             "$type": "ElementUI.VirtualizedTableColumnSetting, ElementUI",
             "DataColumnName": "任务名称",
             "Label": "任务名称",
+            "Width": 230,
             "Fixed": "left",
-            "Align": "center",
+            "Align": "left",
-            "HeaderAlign": "center"
+            "HeaderAlign": "left"
           },
           {
             "$type": "ElementUI.VirtualizedTableColumnSetting, ElementUI",
@@ -872,7 +873,6 @@
           }
         ],
         "DefaultExpansion": "expandAll",
-        "ShowLineNumberColumn": true,
         "LineNumberColumnSetting": {
           "Label": "NO",
           "Width": 35,
@@ -1219,4 +1219,4 @@
       "Formula": "任务列表!$B$4"
     }
   ]
-}//K4Qb241nRlI7L80rtT7t4bJ2RX415ycA7uawlNBXjjF0WgB9XUWUlkN5P94f9xaTacXe+/4B6CpNSRmMNC8UoW21FcnR3cOuq6wXqmuMBMaL6HpL3TYS7IfGHW+gsiOIq+ZLZZegkmVEPwsHBxmpEYb8oDouzv1m665jbNXFA6HCjL5FUa0P8H/7dfJXEe8CmmybhUNpFrFSwU0tXQtBAm6YWlPSiODSC60eB18ErOMziJc9wQ0Yp4yYLPrD1R1+ZFbKvQoZAwh70PKY1fP33pOGNVFzYGsSCWnnJo3bVx8dsLgNMpUVb4pbXcAiCi4ZCXs7hPEU3lJr0mY7uTB2eJKSj1mKp2ckEpg1is3FAWdrqQZOG+k3e2tVL2phXznfOmfCmynPdz58TnmOeCTnDCngUfG/PAoMdtRGC9IcISTRtzWZmlBv8MCoRwSNo0Trjmrr6knzckwwae+0xZhQRmaijbMmudSx1KX7dSMhcrkVFXZ5S3xcKZXQyADaiGVc34Wg8ihqQw+wcNcK0efS7ciJ8l4gCnCJPbRt8XLGzQuneU2spqJ43G+mihGWDf3zcFYysLIaVHUQqJdSBwVRUSb73itwJuB5fZgn3ypZqHXoBak58wFmxw75onmZGwSqSXuA003YgiVUnc74hh1z9eY6BIKroYuYSFbWzNLai0z22W8tt+nfxUk8Z7bWAU1ezskuisMO55qa3H+rRCfqPtU890rvG4SruW3nHCrbIpO+tqyMJDgitXcXfJkdDw0Pv6EZ4hfU5R5SkL8uKcWNoMtLHiM3X5a9sZ4XH0IF84qWRygejz47kR7yCy7Gj+Wzlc0VoIG04WyuTGDFA+W7Kl1XzRmk24zbIHvO3VOdg1k6Wk7WQujm36gH9cActepviJxXrW89MA3Nb3+dD7eNOQ==|920
+}//3G8gQBAjW74orbraakAf+4yAfE2QZFFZNhDXOUoccCOi8Vzz9qIaqhztm7MjilkShV73ObD8sOotm0CNkfd6f5xTc3lsHCzsdfoeMWERbaU3VXcPiirbIoumYEPuuQZXruXfRv3q1gT8IioPfg5QJHeb7Ljf4RIRv8VblT2oEp7L+RLi03osyyywMTuLrXlAGD+tJ+tOPKztaTtBIlexD9CIlUa7Zc1PdjumcvX5lBdqa5EZTmVybUY4UQ5EQ7TzRMZtQwenftpCdWh/QaJ7rGDBpKRhL7sM75ybXChLDb4uxtrH4Sjq4b83PVy5nssK2qDyP1KlDXcMcziPBJEE301Zk7yyLGQtjw2b93LJ9RCjYh0Q0CiIH1s17l8DDh9gr3JX2EwUuDkLhiGH0BHWA8LF7vImsn5spm0xyuNY8/hmL6jlTUzbEdDQdbC6nyyACO29ih6qnpLpqV7HmKawtabSRQyOodjGWt9ek1N1BV6BOP/UiTd8Y83WvZ9coaMo1sFymBHa9ygkD2ISoC+Fx9cJQoYclKp5pGOTNhBqs54i90NqpiazU7KbP7N9Z/udlvFs8G7T09XFcFeyOH9HPFJyI2NfbhNwkpeAuefV8BXZe/4vl0sQdtpNURLALJEmIDhNWWUsD5F7+iItTl333WdRic9++QK7zUFKoHlrttcu3o0fhDJyfQ6Q9WxuYV+sx0t6vwc04GOywAHIxwt81jP9UFImmJYuTWJN7+oMRKKWB+uU+cn5GjzlrNGO7heKyYdBTNrwqsg/48oEqexiA2TNMHDMFeJqGgwGZQuiQHhxyxCcIp0PDzjVHBrDTBG5BXNtoTEAMDS17wPyIo486j+km0E3qlFsmIrrdtOCK8+OB9YxIJmnbmggKoiNUxhKi1z3hBl38tT2CZl8BUuJoA==|920

Pages/首页/首页.json

@@ -344,7 +344,7 @@
                       ]
                     }
                   ],
-                  "ID": "527644e9-1257-4648-9228-c8a1c9c90e3d"
+                  "ID": "4035343e-728d-47d8-ae0a-d6193bbe904a"
                 },
                 {
                   "CommandList": [
@@ -364,7 +364,7 @@
                       ]
                     }
                   ],
-                  "ID": "b232bc9b-8923-4a4d-8c99-fa0afc4449a5"
+                  "ID": "ba26bc8e-f858-418a-a33c-fbd735990725"
                 }
               ]
             }
@@ -549,7 +549,7 @@
                           ]
                         }
                       ],
-                      "ID": "0f431da6-014c-4886-83ed-254e317d068b"
+                      "ID": "535b46e3-243e-462e-9db6-02ae2dfe32d0"
                     }
                   ]
                 },
@@ -600,7 +600,7 @@
                           "Millisecond": "1000"
                         }
                       ],
-                      "ID": "b9b8c2b6-8fe4-4658-9f8e-f4c3be7a301d"
+                      "ID": "f4b07151-dc38-465a-b13a-4f446b2de4be"
                     }
                   ]
                 },
@@ -684,7 +684,7 @@
                           }
                         }
                       ],
-                      "ID": "521262d4-5f8c-42f6-96d9-50da3f5a364d"
+                      "ID": "22e55a5d-e23a-4b8f-959c-2d43cb9c3b13"
                     }
                   ]
                 }
@@ -798,6 +798,13 @@
   "PageInfo": {
     "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
     "MasterPageName": "FGC_母版页",
+    "PageLoadedCommandList": [
+      {
+        "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy",
+        "FunctionName": "remove",
+        "Title": "加载中"
+      }
+    ],
     "PermissionData": {
       "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionData, Forguncy.RbacPermission.Core",
       "permissionResource": {
@@ -849,4 +856,4 @@
       "Formula": "首页!$M$19"
     }
   ]
-}//8NslKoXYaOpeXx23UovLzaZuo6ReHYpMIy5itryDfilzfIaVmwpKLnYCN6BvkqMgX5LEDq/T2/TKmbkHgijvMAps7RqrTK7pkyOTJ0cG19BzsPL3M2vBkh5iEAoB6mXN24Xt2wEyDNl4d5kp+qQi4+312aszk7QhG+Da1/FwPXNAuAdPcDZ5iKZsEHDws5++1cl29q2ZZIrvN7wv8bDHQAQz9ER5HP+FwommACbeGyRLg1jVKGBpTkIZSapzxZRSiRZJlyUafIqtGIbwzegDwdR0uWSdhyua/nyYbjyFyPTsQvkg4uhtnpjf/SFwDUR19P4ixiMN/eZRSEK8lwmxzzo8wfDVjiobJO19SsTC+pZGFR/IDEZnqHu2Dn4Vm88/8x/zw2usrvLK/rYuEUf52DAWNUuLAYdQISJZEhqw5pZWMlDDLOieR0d8aUzj/a1fqj0fUJRB6YnoZ6EPBx7YL3AWQi+UF7CXXfMW/b6buom+Tc3UqHB+1+jze5yu/LZjo2ilDyWGKNGfrwjin0SUhu9qk0H3fvo8G4UwCMqO8qJfPVD1bDERtRHOG2b9N+Fzmqp86BBj+xaNTVXjLTSrMFd8m8I3TcpGGhUBX54IrOJxSW54qBS0juCHada/jMIlUJXABCOXSiuRavxSa9EEUqUuDdvFBUax0DjzcGl0xEd8/I4/EW7+bdjXnsPzqyFub+TWml32K8dUdbTKXayKjlBYEh9WVssc3OHwPASNqjadgRP//EYOozvw43kbXNLjVAJS7mXHNSYDDX8Pd3te2hhq7YuOo5wvVbxNyhg0L0vS6Gn9eH7qYaTsCJhr2f8M4+k7qdNvIG/2SOjjU0hTcQkkfpf07FRyi5t7upAyl3TUVyShOmkQzgsOQFDe7Vbb/Nns97icxQ9poItsFzC5aQ==|920
+}//d2QExqboCb8jegB+L0S7JiUOSf9SoyVWyqTxXL4j0IF1CMqCJnDKkKqCKRP5xbn4aQkPSYg9cYpELk4Fn+PGs57blUiOfsC3Wg8+eZKHTHEMZO+qViWJ3dRlDu2tVWJSwkxhkvzRWETJWbf0BgiZvraU/+qY/Bf+ixiu7f2tlxNKxjBdzKMS3lcoRcFaUCWaH2YuFA+WJXnQY379KGOAxO8wnslsvYRbVnjELZwGzKJqXXCWW6199liry1xiTSeehpZoucwt1Knk3O/CXE1UxeO5cJqQdwF3tVz9NSG6YLnm+kw0/m4AL/iLYuLkq0Jowgrw4/jgKyZzQfTHuhwrHrhZpphytpRXogvDLCnn++KKoi6S3OGZgqle2GU1vIVo8WepIGrjIJTxyaTmtetenQMR/XgNwX9tJHWbyfD7qAIhzD4t98HWnh5vw5YSgHbv8no++wnSxfu6fJKM7vbLVA117AZQ2RhchY/C0yPr/KIKwiFXVk0ObxisC/IjJd5r7sXHbcOIcb8B7E4qmZgqLUHxKfNC9jsr8jUNU5HlDjLkOla07U+gOHBB/ysuv1kUn0Hss7X5IydiQuqzdFkoKn16hYCtJBLukS/z6ALmII+tyEeRVAKV5eJLHeXJSBrm8DNiAHm/zan2aKPP0cd1XAYOcJaIVAEiq6GXhVKHKBRbzWJRnpKMHAjHfbtiOA7iHXHG3sInWc2+6iK2U84mrcAc8O5CrRWWFetPt9sJe9tXDHrAeYB526MwnQluijftHC09PJMoFgFHCmuWp1t5znM0G5+DFvBM/KO3Dddco51FFqqCQuvIRSVt1XMABXfcTH87PIqcIaPTYRgsP7fQQBfZXZAADa8bdxJwU5NYdU7CqhcTnapOg5k8spnJY6mzQJn4vzvEbIduhQSjbLa1og==|920

ServerCommands/任务/新增任务.json

@@ -41,6 +41,10 @@
           "Name": "执行人",
           "DataValidationInfo": {}
         },
+        {
+          "Name": "成员ID数组",
+          "DataValidationInfo": {}
+        },
         {
           "Name": "开始日期",
           "DataValidationInfo": {}
@@ -182,7 +186,7 @@
                             "ID": "289bf7d065ed4d829192ec2cfcd1aff9"
                           }
                         ],
-                        "ID": "e061f809-9278-416a-b480-aef74ad8caeb"
+                        "ID": "19ce1788-df29-40b4-a115-831a230461f7"
                       },
                       {
                         "CommandList": [
@@ -254,7 +258,7 @@
                             "ID": "cbfea9db3fa545839e30188fb7c9dfba"
                           }
                         ],
-                        "ID": "c3e2ff5b-e415-43d0-b7c7-079efdaeeaed"
+                        "ID": "64064707-a6a5-4fe5-a25f-ca805217a4c5"
                       }
                     ],
                     "Comments": "严格模式下，根据是否有父任务来计算本次预算工时的上限"
@@ -288,12 +292,12 @@
                             }
                           }
                         ],
-                        "ID": "664e3f3e-0afe-4f14-9aa0-3deb8ee1c12b"
+                        "ID": "796f5586-2ec6-4289-9824-c815e6bba011"
                       }
                     ]
                   }
                 ],
-                "ID": "a7c14fc3-d8ac-4e4b-a907-45e333a5524e"
+                "ID": "d5ba24e1-84f0-4e52-964d-53e3c4927221"
               }
             ]
           },
@@ -470,7 +474,7 @@
                     "BindingInfo": {
                       "TableName": "项目动态",
                       "ColumnName": "项目ID",
-                      "GUID": "017d289e-78e0-4eaa-89e8-0d3cfbf57d60"
+                      "GUID": "4e1a7eef-c35f-479e-958c-e34b85538dcc"
                     },
                     "Value": {
                       "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -481,7 +485,7 @@
                     "BindingInfo": {
                       "TableName": "项目动态",
                       "ColumnName": "项目动态",
-                      "GUID": "f351575c-6a88-4d02-bc3c-4fa73691434d"
+                      "GUID": "1e311d03-f3a1-4fb7-971e-b605d3e76792"
                     },
                     "Value": {
                       "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -492,11 +496,137 @@
                     "BindingInfo": {
                       "TableName": "项目动态",
                       "ColumnName": "执行人",
-                      "GUID": "3bb8e80c-258e-4d88-8554-bad92a4020bb"
+                      "GUID": "65b3ab45-38d5-4b31-907d-37832258bf27"
                     },
                     "Value": "%CurrentUser%"
                   }
                 ]
+              },
+              {
+                "$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%",
+                      "compareType": 1
+                    },
+                    "CommandList": [
+                      {
+                        "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
+                        "ParameterName": "项目成员数组",
+                        "TableValue": {
+                          "TableName": "项目成员表",
+                          "BindingInfos": [
+                            {
+                              "BindingInfo": {
+                                "TableName": "项目成员表",
+                                "ColumnName": "ID",
+                                "GUID": "b72cf0b4-c471-44fa-b47b-a534a09cde3e"
+                              },
+                              "ColumnName": "ID"
+                            },
+                            {
+                              "BindingInfo": {
+                                "TableName": "项目成员表",
+                                "ColumnName": "项目成员",
+                                "GUID": "f0d91e3d-8562-4bca-bb0f-4e9d7afd4d55"
+                              },
+                              "ColumnName": "项目成员"
+                            }
+                          ],
+                          "SqlCondition": {
+                            "$type": "ForguncyDataAccess.TextCESqlCondition, ForguncyDataAccess",
+                            "CompareType": 8,
+                            "ColumnBindingInfo": {
+                              "TableName": "项目成员表",
+                              "ColumnName": "ID",
+                              "GUID": "9ac991d2-282b-43bb-bef9-a0b00a6be7e3"
+                            },
+                            "Value": {
+                              "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                              "SerializeProperty": "=成员ID数组"
+                            }
+                          }
+                        },
+                        "ID": "f6e9f35a3cd540248c1d0f35ededb0a1"
+                      },
+                      {
+                        "$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": "573a2b42-c3e1-4bfb-85cf-1546a9036ad9"
+                                },
+                                "Value": {
+                                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                                  "SerializeProperty": "=项目ID"
+                                }
+                              },
+                              {
+                                "BindingInfo": {
+                                  "TableName": "任务成员表",
+                                  "ColumnName": "任务ID",
+                                  "GUID": "a4c9ac26-cbb1-4201-b122-4b0a7191fadf"
+                                },
+                                "Value": {
+                                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                                  "SerializeProperty": "=新任务.ID"
+                                }
+                              },
+                              {
+                                "BindingInfo": {
+                                  "TableName": "任务成员表",
+                                  "ColumnName": "项目成员ID",
+                                  "GUID": "4e695e8e-c89d-4a59-ada7-7e8b4d827b92"
+                                },
+                                "Value": {
+                                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                                  "SerializeProperty": "=Item.ID"
+                                }
+                              },
+                              {
+                                "BindingInfo": {
+                                  "TableName": "任务成员表",
+                                  "ColumnName": "参与人",
+                                  "GUID": "a24651df-83f8-4d76-954d-3b06728c4dcd"
+                                },
+                                "Value": {
+                                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                                  "SerializeProperty": "=Item.项目成员"
+                                }
+                              }
+                            ]
+                          }
+                        ]
+                      }
+                    ],
+                    "ID": "2168063c-897b-46f9-9c04-bea75ada5f94"
+                  }
+                ]
               }
             ]
           },

ServerCommands/任务/更新任务参与人.json

@@ -149,7 +149,7 @@
                                 "BindingInfo": {
                                   "TableName": "任务成员表",
                                   "ColumnName": "项目ID",
-                                  "GUID": "261b6290-e45f-4595-abbd-36574ac3f28c"
+                                  "GUID": "36840f44-abdb-4d4d-a8f4-7edd900c77b8"
                                 },
                                 "Value": {
                                   "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -160,7 +160,7 @@
                                 "BindingInfo": {
                                   "TableName": "任务成员表",
                                   "ColumnName": "任务ID",
-                                  "GUID": "2be24e49-4a55-42cc-8be6-f28a42f6c15e"
+                                  "GUID": "fd7a6205-fefc-4194-9099-f157992c4350"
                                 },
                                 "Value": {
                                   "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -171,34 +171,12 @@
                                 "BindingInfo": {
                                   "TableName": "任务成员表",
                                   "ColumnName": "参与人",
-                                  "GUID": "2c8d6bd3-6fc6-41bf-bae9-78784cf4b729"
+                                  "GUID": "e13a4631-28c4-4c05-b1bc-68d3971514b6"
                                 },
                                 "Value": {
                                   "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
                                   "SerializeProperty": "=Item.成员"
                                 }
-                              },
-                              {
-                                "BindingInfo": {
-                                  "TableName": "任务成员表",
-                                  "ColumnName": "岗位ID",
-                                  "GUID": "0b90628f-b229-493f-9c5d-0227ec050478"
-                                },
-                                "Value": {
-                                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                                  "SerializeProperty": "=Item.岗位"
-                                }
-                              },
-                              {
-                                "BindingInfo": {
-                                  "TableName": "任务成员表",
-                                  "ColumnName": "任务时薪",
-                                  "GUID": "bf95d3f0-1632-4dc1-8cb9-320fb13f3e8f"
-                                },
-                                "Value": {
-                                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                                  "SerializeProperty": "=Item.时薪"
-                                }
                               }
                             ]
                           }
@@ -237,34 +215,12 @@
                                 "BindingInfo": {
                                   "TableName": "任务成员表",
                                   "ColumnName": "参与人",
-                                  "GUID": "e9ffead8-6af1-40f0-bd06-8bcf55f769e6"
+                                  "GUID": "144e58a1-955d-4719-97c4-71b86e09e86e"
                                 },
                                 "Value": {
                                   "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
                                   "SerializeProperty": "=Item.成员"
                                 }
-                              },
-                              {
-                                "BindingInfo": {
-                                  "TableName": "任务成员表",
-                                  "ColumnName": "岗位ID",
-                                  "GUID": "42dcdf05-28be-4b8d-ba4d-a6f705f4718e"
-                                },
-                                "Value": {
-                                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                                  "SerializeProperty": "=Item.岗位"
-                                }
-                              },
-                              {
-                                "BindingInfo": {
-                                  "TableName": "任务成员表",
-                                  "ColumnName": "任务时薪",
-                                  "GUID": "09140a4d-b88c-42c9-9847-15110c2120c7"
-                                },
-                                "Value": {
-                                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                                  "SerializeProperty": "=Item.时薪"
-                                }
                               }
                             ]
                           }
@@ -313,7 +269,7 @@
                             "BindingInfo": {
                               "TableName": "项目动态",
                               "ColumnName": "项目ID",
-                              "GUID": "d5d82bb9-79a3-4095-bbb4-1bae803665cf"
+                              "GUID": "c8d19332-7834-4358-bec6-e9e173a0f2ae"
                             },
                             "Value": {
                               "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -324,7 +280,7 @@
                             "BindingInfo": {
                               "TableName": "项目动态",
                               "ColumnName": "项目动态",
-                              "GUID": "bbe3d62b-3c34-4607-80c4-1e2c75d2f4fd"
+                              "GUID": "4e768777-3eff-4bbf-85c4-c1f173965266"
                             },
                             "Value": {
                               "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -335,7 +291,7 @@
                             "BindingInfo": {
                               "TableName": "项目动态",
                               "ColumnName": "执行人",
-                              "GUID": "6619d272-5e20-4f49-9ce5-f2d044902052"
+                              "GUID": "6a928517-26f1-4302-a829-5f103daeae5b"
                             },
                             "Value": "%CurrentUser%"
                           }
@@ -365,35 +321,13 @@
                     "RefreshAfterFinish": true,
                     "CheckDataValidation": true
                   },
-                  {
-                    "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon",
-                    "ServerCommandName": "同步项目成员",
-                    "Parameters": [
-                      {
-                        "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon",
-                        "ParamName": "项目ID",
-                        "Value": {
-                          "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                          "SerializeProperty": "=任务信息.项目ID"
-                        }
-                      }
-                    ],
-                    "ResultErrorCodeTo": {
-                      "SerializeProperty": "code"
-                    },
-                    "ResultMessageTo": {
-                      "SerializeProperty": "msg"
-                    },
-                    "RefreshAfterFinish": true,
-                    "CheckDataValidation": true
-                  },
                   {
                     "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon",
                     "ErrorCode": "0",
                     "Message": "操作完成"
                   }
                 ],
-                "ID": "938285c7-b260-46dc-9369-d8b78265d4e7"
+                "ID": "c39a129b-d09f-48bb-9fdf-db4ed5ded7b1"
               },
               {
                 "CommandList": [
@@ -403,7 +337,7 @@
                     "Message": "任务不存在"
                   }
                 ],
-                "ID": "96a24cfe-caef-45aa-aee6-773c70df934b"
+                "ID": "57d232e2-f4a4-4f6f-a87f-5aa731b9f1c4"
               }
             ]
           }

ServerCommands/任务/移除任务成员.json

@@ -76,7 +76,7 @@
         "NullFormulaValueQueryPolicy": 0,
         "TopCount": "1"
       },
-      "ID": "b15d94ad6e7644c293da886727448cb1"
+      "ID": "ff8bcb1f34844313913273cf7ef6d7ca"
     },
     {
       "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
@@ -224,35 +224,13 @@
               "RefreshAfterFinish": true,
               "CheckDataValidation": true
             },
-            {
-              "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon",
-              "ServerCommandName": "同步项目成员",
-              "Parameters": [
-                {
-                  "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon",
-                  "ParamName": "项目ID",
-                  "Value": {
-                    "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                    "SerializeProperty": "=任务信息.项目ID"
-                  }
-                }
-              ],
-              "ResultErrorCodeTo": {
-                "SerializeProperty": "code"
-              },
-              "ResultMessageTo": {
-                "SerializeProperty": "msg"
-              },
-              "RefreshAfterFinish": true,
-              "CheckDataValidation": true
-            },
             {
               "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon",
               "ErrorCode": "0",
               "Message": "移除成功"
             }
           ],
-          "ID": "fa79df67-bf2f-4a4b-a67d-a8f1c513bc86"
+          "ID": "fe53fdf3-ad5c-4bd1-a81e-0e937e33c4c6"
         },
         {
           "CommandList": [
@@ -262,7 +240,7 @@
               "Message": "任务不存在"
             }
           ],
-          "ID": "1b902fd4-28c7-419f-9706-ae9e7541b242"
+          "ID": "4026af5c-8486-4367-8fae-ba73d80ca59b"
         }
       ]
     }

ServerCommands/工时/上报实际工时.json

@@ -270,36 +270,46 @@
                 {
                   "BindingInfo": {
                     "TableName": "任务成员表",
-                    "ColumnName": "任务时薪",
+                    "ColumnName": "项目成员ID",
-                    "GUID": "93b2f1d8-fd53-468a-9211-87f51b6a5494"
+                    "GUID": "ab7cb84d-53aa-4ef4-9480-9dcf6c0081a1",
-                  },
-                  "ColumnName": "任务默认时薪"
-                },
-                {
-                  "BindingInfo": {
-                    "TableName": "任务成员表",
-                    "ColumnName": "岗位ID",
-                    "GUID": "299a3d18-2733-483d-bcd6-09e057c343ef",
                     "RelationBinding": {
-                      "RelatedTable": "项目岗位",
+                      "RelatedTable": "项目成员表",
                       "RelatedColumn": "ID",
                       "DisplayColumn": "默认时薪"
                     }
                   },
-                  "ColumnName": "任务岗位时薪"
+                  "ColumnName": "成员时薪"
+                },
+                {
+                  "BindingInfo": {
+                    "TableName": "任务成员表",
+                    "ColumnName": "项目成员ID",
+                    "GUID": "5235f7aa-0a63-4bd3-8c41-f3a32d4c3a93",
+                    "RelationBinding": {
+                      "RelatedTable": "项目成员表",
+                      "RelatedColumn": "ID",
+                      "DisplayColumn": "岗位ID",
+                      "NextRelationBinding": {
+                        "RelatedTable": "项目岗位",
+                        "RelatedColumn": "ID",
+                        "DisplayColumn": "默认时薪"
+                      }
+                    }
+                  },
+                  "ColumnName": "岗位时薪"
                 },
                 {
                   "BindingInfo": {
                     "TableName": "任务成员表",
                     "ColumnName": "参与人",
-                    "GUID": "599afbfc-245b-40b1-b078-adb9ca71abef",
+                    "GUID": "b9b7cb37-08a6-4720-bddc-153de4068f89",
                     "AttachType": {
                       "$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess",
                       "UserColumnAttachType": 5,
                       "AttachTypeTag": "默认时薪"
                     }
                   },
-                  "ColumnName": "参与人默认时薪"
+                  "ColumnName": "用户时薪"
                 }
               ],
               "SqlCondition": {
@@ -334,7 +344,7 @@
               "NullFormulaValueQueryPolicy": 0,
               "TopCount": "1"
             },
-            "ID": "5d336b93a4df4cd08bf82c0216fd637b"
+            "ID": "ddbdfdd0fa554a2fa5e51d9879d30174"
           },
           {
             "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
@@ -414,7 +424,7 @@
                       "NullFormulaValueQueryPolicy": 0,
                       "TopCount": "1"
                     },
-                    "ID": "c24060577e0143fdb16f1f374c7c895a"
+                    "ID": "8615b1487f3b4d1984fe1bac333cfc4d"
                   },
                   {
                     "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
@@ -423,7 +433,7 @@
                       "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
                       "SerializeProperty": "=任务信息.提成系数"
                     },
-                    "ID": "cb367be8fb7748938fbb70bd84ece17b"
+                    "ID": "a2a37ae37d2d43eaa84993dec74c3f4c"
                   },
                   {
                     "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
@@ -432,7 +442,7 @@
                       "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
                       "SerializeProperty": "=工时数"
                     },
-                    "ID": "082f169b38f44fdda8b19e98912a9d4e"
+                    "ID": "01d0003c29094ae09dd6e64261457190"
                   },
                   {
                     "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
@@ -441,7 +451,7 @@
                       "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
                       "SerializeProperty": "=DATEDIF(开始日期,结束日期,\"d\")+1"
                     },
-                    "ID": "3116169271594431b3b1c7d31a006d8b"
+                    "ID": "d3163c87b76a40d8a3911d660b47f2fa"
                   },
                   {
                     "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
@@ -485,7 +495,7 @@
                                             "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon",
                                             "ParamObject": {
                                               "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                                              "SerializeProperty": "=任务成员.任务默认时薪"
+                                              "SerializeProperty": "=任务成员.成员时薪"
                                             }
                                           },
                                           "value": "%Null%",
@@ -497,18 +507,18 @@
                                             "ParameterName": "计算时薪",
                                             "ParameterValue": {
                                               "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                                              "SerializeProperty": "=任务成员.任务默认时薪"
+                                              "SerializeProperty": "=任务成员.成员时薪"
                                             },
-                                            "ID": "e313b6627e4d4f5c812c5385f1117e65"
+                                            "ID": "cc82db30c405475598d3aa026d4ec0d9"
                                           },
                                           {
                                             "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
                                             "ParameterName": "时薪计算来源",
-                                            "ParameterValue": "任务默认时薪",
+                                            "ParameterValue": "成员时薪",
-                                            "ID": "76e6b1beb86d4cffa86d99da1b1b8d56"
+                                            "ID": "3c1021e484ee4ba0a86633071b42d8bd"
                                           }
                                         ],
-                                        "ID": "5892bb26-315d-4713-b965-a9c3a0c5aaf5"
+                                        "ID": "8278602b-cbdd-437b-aa0e-e8f5315f75ea"
                                       },
                                       {
                                         "Condition": {
@@ -517,7 +527,7 @@
                                             "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon",
                                             "ParamObject": {
                                               "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                                              "SerializeProperty": "=任务成员.任务岗位时薪"
+                                              "SerializeProperty": "=任务成员.岗位时薪"
                                             }
                                           },
                                           "value": "%Null%",
@@ -529,142 +539,73 @@
                                             "ParameterName": "计算时薪",
                                             "ParameterValue": {
                                               "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                                              "SerializeProperty": "=任务成员.任务岗位时薪"
+                                              "SerializeProperty": "=任务成员.岗位时薪"
                                             },
-                                            "ID": "196d48e7e7104eb89b1b40a31d20d3d9"
+                                            "ID": "b103c2acb94742d88008cf0f5c4c2db4"
-                                          },
-                                          {
-                                            "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
-                                            "ParameterName": "时薪计算来源",
-                                            "ParameterValue": "任务岗位时薪",
-                                            "ID": "14e4ee83f2994475987fffe9fb3f8315"
-                                          }
-                                        ],
-                                        "ID": "560d1637-206c-428b-b348-0bc18e17414a"
-                                      },
-                                      {
-                                        "Condition": {
-                                          "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess",
-                                          "SubConditions": [
-                                            {
-                                              "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
-                                              "param": {
-                                                "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon",
-                                                "ParamObject": {
-                                                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                                                  "SerializeProperty": "=项目成员"
-                                                }
-                                              },
-                                              "value": "%Null%",
-                                              "compareType": 1
-                                            },
-                                            {
-                                              "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
-                                              "param": {
-                                                "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon",
-                                                "ParamObject": {
-                                                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                                                  "SerializeProperty": "=项目成员.项目成员时薪"
-                                                }
-                                              },
-                                              "value": "%Null%",
-                                              "compareType": 1
-                                            }
-                                          ]
-                                        },
-                                        "CommandList": [
-                                          {
-                                            "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
-                                            "ParameterName": "计算时薪",
-                                            "ParameterValue": {
-                                              "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                                              "SerializeProperty": "=项目成员.项目成员时薪"
-                                            },
-                                            "ID": "76cd36c904b74af7b79a09aded9e6834"
-                                          },
-                                          {
-                                            "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
-                                            "ParameterName": "时薪计算来源",
-                                            "ParameterValue": "项目成员时薪",
-                                            "ID": "6c7b7dc64b644d0cadaa3e58ae25fb27"
-                                          }
-                                        ],
-                                        "ID": "71243830-5216-40a3-a6b1-5939b0753a02"
-                                      },
-                                      {
-                                        "Condition": {
-                                          "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess",
-                                          "SubConditions": [
-                                            {
-                                              "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
-                                              "param": {
-                                                "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon",
-                                                "ParamObject": {
-                                                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                                                  "SerializeProperty": "=项目成员"
-                                                }
-                                              },
-                                              "value": "%Null%",
-                                              "compareType": 1
-                                            },
-                                            {
-                                              "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
-                                              "param": {
-                                                "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon",
-                                                "ParamObject": {
-                                                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                                                  "SerializeProperty": "=项目成员.项目岗位时薪"
-                                                }
-                                              },
-                                              "value": "%Null%",
-                                              "compareType": 1
-                                            }
-                                          ]
-                                        },
-                                        "CommandList": [
-                                          {
-                                            "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
-                                            "ParameterName": "计算时薪",
-                                            "ParameterValue": {
-                                              "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                                              "SerializeProperty": "=项目成员.项目岗位时薪"
-                                            },
-                                            "ID": "51752bfde1d24e229b44fe75bc41264a"
                                           },
                                           {
                                             "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
                                             "ParameterName": "时薪计算来源",
                                             "ParameterValue": "项目岗位时薪",
-                                            "ID": "3ea9bb1ee1c34288bc51654ef1abf496"
+                                            "ID": "0219a753cc25405babd85823afc50ec5"
                                           }
                                         ],
-                                        "ID": "122e532e-7bf9-416e-8429-2be97ef447db"
+                                        "ID": "d9826fc4-2a66-449f-b29a-2452b63c72bf"
                                       },
                                       {
+                                        "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": "计算时薪",
                                             "ParameterValue": {
                                               "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                                              "SerializeProperty": "=任务成员.参与人默认时薪"
+                                              "SerializeProperty": "=任务成员.用户时薪"
                                             },
-                                            "ID": "1ae2836c5830462a84c4aacaa677c0ee"
+                                            "ID": "f7dc4bc4ab82417fa9ed1963c9f0743d"
                                           },
                                           {
                                             "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
                                             "ParameterName": "时薪计算来源",
                                             "ParameterValue": "用户默认时薪",
-                                            "ID": "2aef2dc2638a4d93b234647dbb3708be"
+                                            "ID": "b63bc48e6b494c45846f26f65967743a"
                                           }
                                         ],
-                                        "ID": "e37a30f6-824b-4309-b099-b50321d85357"
+                                        "ID": "c59d3f3d-1bd7-49ba-ab43-4dbc96ca337b"
+                                      },
+                                      {
+                                        "CommandList": [
+                                          {
+                                            "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
+                                            "ParameterName": "计算时薪",
+                                            "ParameterValue": "0",
+                                            "ID": "7cd27fcd25194f5f945c9f20531f3510"
+                                          },
+                                          {
+                                            "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
+                                            "ParameterName": "时薪计算来源",
+                                            "ParameterValue": "无时薪配置",
+                                            "ID": "fa7dce870a0f4f43982f5750b827a883"
+                                          }
+                                        ],
+                                        "ID": "16505a9b-f55a-4fec-9d40-1778bca56b9c"
                                       }
                                     ]
                                   }
                                 ],
                                 "Comments": "优先使用手动指定的提成金额",
-                                "ID": "3c4043b9-0284-477c-81f1-63f1c8d5119c"
+                                "ID": "b4f70a32-3855-4615-8543-d3692bcc3b15"
                               },
                               {
                                 "CommandList": [
@@ -675,16 +616,16 @@
                                       "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
                                       "SerializeProperty": "=指定时薪单价"
                                     },
-                                    "ID": "0cf4fd422ad24dab99b51a2dd7f131d9"
+                                    "ID": "0c71d002bf8b487e8d5fc68160f1c319"
                                   },
                                   {
                                     "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
                                     "ParameterName": "时薪计算来源",
                                     "ParameterValue": "特殊指定",
-                                    "ID": "c4fead524128456483f3f5a034ef3aac"
+                                    "ID": "33c8559bb723411da60fd2e561aba45d"
                                   }
                                 ],
-                                "ID": "12836376-7996-426b-89ac-c4d2903707c9"
+                                "ID": "62612070-353d-4b57-a5cd-e5dd910a0086"
                               }
                             ],
                             "Comments": "计算成员的时薪"
@@ -783,7 +724,7 @@
                                                 ]
                                               }
                                             },
-                                            "ID": "aa235f64d4ec4cd582472f40f84747c9",
+                                            "ID": "1dd43cf317f3493b811af732e5ecadaa",
                                             "Comments": "从视图统计项目的信息"
                                           },
                                           {
@@ -810,7 +751,7 @@
                                                     "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
                                                     "ParameterName": "提成系数",
                                                     "ParameterValue": "0",
-                                                    "ID": "e18f1034f12e41a7b90d2a1f58090f54"
+                                                    "ID": "c249f655db5648c5b51bd635c133cb01"
                                                   },
                                                   {
                                                     "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
@@ -819,17 +760,17 @@
                                                       "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
                                                       "SerializeProperty": "=个人工时情况.总计划工时-个人工时情况.总实际工时"
                                                     },
-                                                    "ID": "8d0e13be1d7c417b85a401d7241d5a80"
+                                                    "ID": "51190645683e490a89a814befe609269"
                                                   }
                                                 ],
                                                 "Comments": "先检查个人工时余额够不够，如果不够，直接提成为0",
-                                                "ID": "62c323bb-a8fd-4f6a-bef3-c12ba2a4c36e"
+                                                "ID": "e4e63a51-dcfa-4dc3-8364-8d603e88bf62"
                                               }
                                             ]
                                           }
                                         ],
                                         "Comments": "如果分配到人头，则判断该人总计划工时还够不够",
-                                        "ID": "3008b6ad-c950-48cd-b0f1-8e43800742ad"
+                                        "ID": "3c9d4a97-6a13-4418-b0f8-35395c03f392"
                                       },
                                       {
                                         "Condition": {
@@ -889,7 +830,7 @@
                                                 }
                                               }
                                             },
-                                            "ID": "7ed3dcc708d241e7a556334560d7e374",
+                                            "ID": "a23e3a6e89904ac8bea064d536514a50",
                                             "Comments": "从视图统计项目的信息"
                                           },
                                           {
@@ -916,7 +857,7 @@
                                                     "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
                                                     "ParameterName": "提成系数",
                                                     "ParameterValue": "1",
-                                                    "ID": "5ce8a30a1b1f468cb65341bd59a033e0"
+                                                    "ID": "cf6d51b5888145e496e49f2588883112"
                                                   },
                                                   {
                                                     "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
@@ -925,17 +866,17 @@
                                                       "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
                                                       "SerializeProperty": "=任务工时情况.总计划工时-任务工时情况.总实际工时"
                                                     },
-                                                    "ID": "b03b8286df21427fbb48123ef003f896"
+                                                    "ID": "64c79293a58c4332a6ab84d956a1524b"
                                                   }
                                                 ],
                                                 "Comments": "先检查个人工时余额够不够，如果不够，直接提成为0",
-                                                "ID": "5e7fd067-2fb4-4012-bbd2-c5dfa130297e"
+                                                "ID": "e773c715-953c-45e2-9f4e-53f2fc081f9f"
                                               }
                                             ]
                                           }
                                         ],
                                         "Comments": "如果是共用任务工时，则查看任务计划工时够不够",
-                                        "ID": "9388a07b-e142-40cd-916d-9e9611d3e10b"
+                                        "ID": "55623e50-334f-4fd0-a5b0-a077569ac925"
                                       }
                                     ]
                                   },
@@ -977,7 +918,7 @@
                                       },
                                       "TopCount": "1"
                                     },
-                                    "ID": "9531597e7dd04790a8b3d8edf8a056fa",
+                                    "ID": "54aa0a94cc96467d8def3d9040dfa058",
                                     "Comments": "从视图统计项目的信息"
                                   },
                                   {
@@ -987,7 +928,7 @@
                                       "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
                                       "SerializeProperty": "=项目统计信息.总成本+(计算时薪*工时数*任务信息.提成系数)"
                                     },
-                                    "ID": "cff80ff8e246491abd5d9bfe2b4cb20f"
+                                    "ID": "df9bee08799c444f8a091bc840ad8606"
                                   },
                                   {
                                     "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
@@ -1015,13 +956,13 @@
                                             "Message": "该项目预算费用不足，为确保项目成本可控，请联系项目经理增加项目预算后再提交。"
                                           }
                                         ],
-                                        "ID": "94f1c942-3547-4a4f-b90c-80abf2f29da0"
+                                        "ID": "a423dbbd-e703-4443-8fcd-7ae0637a1124"
                                       }
                                     ]
                                   }
                                 ],
                                 "Comments": "如果提交的工时类型等于项目工时的核定方式且开启严格模式就校验本次有没有超标",
-                                "ID": "c218eb9f-1c2a-4ad1-94c2-f987d31caaa3"
+                                "ID": "9531c1de-fd10-4c2a-baff-e95a41c928da"
                               }
                             ]
                           },
@@ -1032,7 +973,7 @@
                               "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
                               "SerializeProperty": "=核定工时"
                             },
-                            "ID": "44bf01bc4c6e4d15a68aa01810cc3a27"
+                            "ID": "45a519cbaf79430590daa0e0f12dcacf"
                           },
                           {
                             "$type": "Forguncy.Model.ServerTransactionCommand, ServerDesignerCommon",
@@ -1056,7 +997,7 @@
                                       "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
                                       "SerializeProperty": "=开始日期+(index-1)"
                                     },
-                                    "ID": "172a3023cda9475a8a67528b152807c3"
+                                    "ID": "56a1af3621d94e629a76af1da3b64d7e"
                                   },
                                   {
                                     "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
@@ -1124,7 +1065,7 @@
                                         ]
                                       }
                                     },
-                                    "ID": "bc9f93f8c0874fefba55401ba5796ea6"
+                                    "ID": "a34519403c17478d8f304509d1773d64"
                                   },
                                   {
                                     "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
@@ -1156,7 +1097,7 @@
                                             "ID": "16367bf85236447fb1f75968ab5e3c35"
                                           }
                                         ],
-                                        "ID": "aec2fbae-83f7-48e5-ab7a-5fae797b336e"
+                                        "ID": "6c6cc11e-8415-440b-b798-bd6138f8f155"
                                       },
                                       {
                                         "CommandList": [
@@ -1170,7 +1111,7 @@
                                             "ID": "e94b98e14b7a4a5ba0254784a076d6cc"
                                           }
                                         ],
-                                        "ID": "4d5a916f-49ba-45ec-bce5-69454395a99c"
+                                        "ID": "5571b65c-d4f6-4ad9-b36b-1035a2879dbb"
                                       }
                                     ]
                                   },
@@ -1218,7 +1159,7 @@
                                                   }
                                                 ],
                                                 "Comments": "如果是按天分配，则需要检测这一天的实际工时是否超出，",
-                                                "ID": "07879862-2b57-48db-9176-57f5de797991"
+                                                "ID": "634fd1b5-ae1e-42d9-bd06-59c68f564ba0"
                                               },
                                               {
                                                 "CommandList": [
@@ -1232,7 +1173,7 @@
                                                     "ID": "f0457ba04eb3495e809ef050fb21fe4f"
                                                   }
                                                 ],
-                                                "ID": "32327428-2991-4210-94d0-fbdfc7587c44"
+                                                "ID": "5c04802d-6a3d-441e-87d1-4e1f58c1353a"
                                               }
                                             ]
                                           },
@@ -1246,7 +1187,7 @@
                                                 "BindingInfo": {
                                                   "TableName": "任务工时表",
                                                   "ColumnName": "项目ID",
-                                                  "GUID": "a3028e2b-e561-42c6-9ee0-c8eb03134e2e"
+                                                  "GUID": "767fbfcb-1360-4ab6-9f72-1ebf9d95e1fb"
                                                 },
                                                 "Value": {
                                                   "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -1257,7 +1198,7 @@
                                                 "BindingInfo": {
                                                   "TableName": "任务工时表",
                                                   "ColumnName": "任务ID",
-                                                  "GUID": "735e3d1d-b8b9-4ba3-a88a-0e21b9765cbb"
+                                                  "GUID": "f1f6eab1-9968-4c05-9d10-6f8c672e6c8c"
                                                 },
                                                 "Value": {
                                                   "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -1268,7 +1209,7 @@
                                                 "BindingInfo": {
                                                   "TableName": "任务工时表",
                                                   "ColumnName": "工时日期",
-                                                  "GUID": "cffbc1e3-052a-486b-89ec-6078865f6e90"
+                                                  "GUID": "64787906-df7b-4ce8-aa3a-496cb71ee756"
                                                 },
                                                 "Value": {
                                                   "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -1279,7 +1220,7 @@
                                                 "BindingInfo": {
                                                   "TableName": "任务工时表",
                                                   "ColumnName": "工时类型",
-                                                  "GUID": "e07c6e0d-1142-463c-a205-880c29183a0d"
+                                                  "GUID": "7b9d8bdd-fc57-4ea4-9ef2-498a8d845b6d"
                                                 },
                                                 "Value": "实际"
                                               },
@@ -1287,7 +1228,7 @@
                                                 "BindingInfo": {
                                                   "TableName": "任务工时表",
                                                   "ColumnName": "执行人",
-                                                  "GUID": "58b7816a-560e-4ab2-95b5-b8a8f04d6c19"
+                                                  "GUID": "728355a2-4c2e-4550-b05c-dbe82160500e"
                                                 },
                                                 "Value": {
                                                   "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -1298,7 +1239,7 @@
                                                 "BindingInfo": {
                                                   "TableName": "任务工时表",
                                                   "ColumnName": "执行内容",
-                                                  "GUID": "083276ff-58a1-47be-89fc-cd4989e8e4d4"
+                                                  "GUID": "6655c619-4df3-4cc3-9336-04204dd60f2d"
                                                 },
                                                 "Value": {
                                                   "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -1309,7 +1250,7 @@
                                                 "BindingInfo": {
                                                   "TableName": "任务工时表",
                                                   "ColumnName": "工时",
-                                                  "GUID": "36adcdcf-f764-4fdd-8bf8-852b9d0af714"
+                                                  "GUID": "c0d0c203-56f8-4652-91a9-7163d5ecd5c5"
                                                 },
                                                 "Value": {
                                                   "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -1320,7 +1261,7 @@
                                                 "BindingInfo": {
                                                   "TableName": "任务工时表",
                                                   "ColumnName": "上报工时",
-                                                  "GUID": "eb754d4a-fdd1-4610-8d64-80882781bdaf"
+                                                  "GUID": "60db6ae4-e852-41a3-8493-c10d6a804906"
                                                 },
                                                 "Value": {
                                                   "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -1331,7 +1272,7 @@
                                                 "BindingInfo": {
                                                   "TableName": "任务工时表",
                                                   "ColumnName": "时薪单价",
-                                                  "GUID": "2787b855-d8ee-4214-8c5e-654f37c81bee"
+                                                  "GUID": "993683e9-e9ef-4c54-8439-82e0a265765c"
                                                 },
                                                 "Value": {
                                                   "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -1342,7 +1283,7 @@
                                                 "BindingInfo": {
                                                   "TableName": "任务工时表",
                                                   "ColumnName": "提成系数",
-                                                  "GUID": "d3df389a-4ca3-4353-aefd-d8035b965e93"
+                                                  "GUID": "2fa54ac7-2777-4f42-bd30-9e43589c2e75"
                                                 },
                                                 "Value": {
                                                   "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -1353,7 +1294,7 @@
                                                 "BindingInfo": {
                                                   "TableName": "任务工时表",
                                                   "ColumnName": "时薪来源",
-                                                  "GUID": "4c3d1a7c-5e48-48dd-9f2f-0e28f5bc1550"
+                                                  "GUID": "fa2a6e7e-b172-4087-86e6-f42a55d6bc70"
                                                 },
                                                 "Value": {
                                                   "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -1369,10 +1310,10 @@
                                               "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
                                               "SerializeProperty": "=ROUNDUP(待分配工时-计算本次分配工时,1)"
                                             },
-                                            "ID": "81a6634be71a43669cbaa18cb041393a"
+                                            "ID": "e446ff2c85514cc681efe1c72c5c0700"
                                           }
                                         ],
-                                        "ID": "dc0a2408-a1e6-4094-84db-1d38ba286103"
+                                        "ID": "92f856e7-b658-42f6-a4eb-240bd631136d"
                                       },
                                       {
                                         "CommandList": [
@@ -1385,7 +1326,7 @@
                                             }
                                           }
                                         ],
-                                        "ID": "a1751d3f-23dc-4468-81ef-939d95acbd61"
+                                        "ID": "52ddc999-8d00-4b25-9376-d97aca3cb66e"
                                       }
                                     ]
                                   }
@@ -1437,7 +1378,7 @@
                             "Message": "报工成功"
                           }
                         ],
-                        "ID": "b728b35b-37b0-4979-9b51-2f3bfcaac0e1"
+                        "ID": "b580b0b9-d9e3-46e2-bc37-c61b3cb2034a"
                       },
                       {
                         "CommandList": [
@@ -1450,12 +1391,12 @@
                             }
                           }
                         ],
-                        "ID": "14c3dd1e-b660-4b79-b4dc-8f55f163e0b4"
+                        "ID": "510fe1b5-99ae-47f9-8cbe-574accde54d2"
                       }
                     ]
                   }
                 ],
-                "ID": "f5991806-add2-4d20-b266-f17d2e60d061"
+                "ID": "4cb9cd97-f93c-47f5-81b3-f39afa131276"
               },
               {
                 "CommandList": [
@@ -1465,7 +1406,7 @@
                     "Message": "成员不在任务内，无法报工！"
                   }
                 ],
-                "ID": "447cf554-6508-427a-ace5-0592f83b8e2e"
+                "ID": "9d15f4b2-4b91-4a4d-9b2a-4c2ec13ca9b3"
               }
             ]
           }

ServerCommands/项目/同步项目参与人列表.json

@@ -1,5 +1,6 @@
 {
-  "Name": "同步项目参与人字段",
+  "Name": "同步项目参与人列表",
+  "Description": "因为统计字段不能设置行权限，所以用此命令专门将参与人存为实体字段",
   "Enabled": true,
   "Triggers": [
     {

ServerCommands/项目/同步项目成员.json

@@ -1,5 +1,6 @@
 {
   "Name": "同步项目成员",
+  "Description": "用户将任务成员反向同步到项目成员内",
   "Enabled": true,
   "Triggers": [
     {
@@ -44,10 +45,26 @@
             "CommandList": [
               {
                 "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
-                "ParameterName": "成员列表",
+                "ParameterName": "任务成员列表",
                 "TableValue": {
                   "TableName": "任务成员表",
                   "BindingInfos": [
+                    {
+                      "BindingInfo": {
+                        "TableName": "任务成员表",
+                        "ColumnName": "ID",
+                        "GUID": "7035b112-fe6a-427f-9078-c93b3323d262"
+                      },
+                      "ColumnName": "ID"
+                    },
+                    {
+                      "BindingInfo": {
+                        "TableName": "任务成员表",
+                        "ColumnName": "项目成员ID",
+                        "GUID": "ac4f4665-cf34-47b6-aae3-7b0e3e4e5879"
+                      },
+                      "ColumnName": "项目成员ID"
+                    },
                     {
                       "BindingInfo": {
                         "TableName": "任务成员表",
@@ -59,18 +76,15 @@
                     {
                       "BindingInfo": {
                         "TableName": "任务成员表",
-                        "ColumnName": "岗位ID",
+                        "ColumnName": "参与人",
-                        "GUID": "dc37147b-37ae-447e-be34-44aa79248cd9"
+                        "GUID": "aea84cec-afdf-4efc-a45c-81c5b2771f3e",
+                        "AttachType": {
+                          "$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess",
+                          "UserColumnAttachType": 5,
+                          "AttachTypeTag": "默认时薪"
+                        }
                       },
-                      "ColumnName": "岗位ID"
+                      "ColumnName": "参与人_默认时薪"
-                    },
-                    {
-                      "BindingInfo": {
-                        "TableName": "任务成员表",
-                        "ColumnName": "任务时薪",
-                        "GUID": "ffd017c3-0213-434a-850a-17e468a25351"
-                      },
-                      "ColumnName": "任务时薪"
                     }
                   ],
                   "SqlCondition": {
@@ -91,7 +105,7 @@
                     }
                   }
                 },
-                "ID": "80ede1174f0e44d08c2ac38bacb1505f"
+                "ID": "37b2711a67d04780bee0b2288c369e0b"
               },
               {
                 "$type": "Forguncy.Model.LoopCommand, ServerDesignerCommon",
@@ -99,17 +113,27 @@
                   "$type": "Forguncy.Model.CountLoopInfo, ServerDesignerCommon",
                   "LoopCount": {
                     "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                    "SerializeProperty": "=成员列表"
+                    "SerializeProperty": "=任务成员列表"
                   },
                   "LoopItemParamName": "Item"
                 },
                 "CommandList": [
                   {
                     "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
-                    "ParameterName": "是否存在",
+                    "ParameterName": "项目成员",
                     "TableValue": {
                       "TableName": "项目成员表",
-                      "TableValueType": 3,
+                      "TableValueType": 1,
+                      "BindingInfos": [
+                        {
+                          "BindingInfo": {
+                            "TableName": "项目成员表",
+                            "ColumnName": "ID",
+                            "GUID": "e2af07f5-6c83-46e4-b1ca-5fd4b03bdd74"
+                          },
+                          "ColumnName": "ID"
+                        }
+                      ],
                       "SqlCondition": {
                         "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess",
                         "SubConditions": [
@@ -139,9 +163,10 @@
                           }
                         ]
                       },
-                      "NullFormulaValueQueryPolicy": 0
+                      "NullFormulaValueQueryPolicy": 0,
+                      "TopCount": "1"
                     },
-                    "ID": "7d2ab957b8a0418499611a4a9ae72922"
+                    "ID": "2ef5575e15a14e598c26b0848f1e49c1"
                   },
                   {
                     "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
@@ -153,10 +178,11 @@
                             "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon",
                             "ParamObject": {
                               "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                              "SerializeProperty": "=是否存在"
+                              "SerializeProperty": "=项目成员"
                             }
                           },
-                          "value": "0"
+                          "value": "%Null%",
+                          "compareType": 1
                         },
                         "CommandList": [
                           {
@@ -169,7 +195,7 @@
                                 "BindingInfo": {
                                   "TableName": "项目成员表",
                                   "ColumnName": "项目ID",
-                                  "GUID": "423a454c-0ebe-4cde-82cb-47c6bf6e7e42"
+                                  "GUID": "4057268f-395b-401d-9689-3f90d1a2084d"
                                 },
                                 "Value": {
                                   "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -180,39 +206,79 @@
                                 "BindingInfo": {
                                   "TableName": "项目成员表",
                                   "ColumnName": "项目成员",
-                                  "GUID": "d6fe68a3-6354-472d-abab-fd66735bb628"
+                                  "GUID": "75fdfeda-ad50-471d-8f74-2cd5d178cef4"
                                 },
                                 "Value": {
                                   "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
                                   "SerializeProperty": "=Item.参与人"
                                 }
                               },
-                              {
-                                "BindingInfo": {
-                                  "TableName": "项目成员表",
-                                  "ColumnName": "岗位ID",
-                                  "GUID": "24cb4c61-d136-428a-bbd8-9be528a51b1e"
-                                },
-                                "Value": {
-                                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                                  "SerializeProperty": "=Item.岗位ID"
-                                }
-                              },
                               {
                                 "BindingInfo": {
                                   "TableName": "项目成员表",
                                   "ColumnName": "默认时薪",
-                                  "GUID": "f539a7b6-27fd-43f6-9422-9e200ee0734b"
+                                  "GUID": "2b8394e9-3685-4fdd-8470-28350509ac88"
                                 },
                                 "Value": {
                                   "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                                  "SerializeProperty": "=Item.任务时薪"
+                                  "SerializeProperty": "=Item.参与人_默认时薪"
                                 }
                               }
                             ]
                           }
                         ],
-                        "ID": "0e3e954f-a095-4305-bc6c-02a4ed9d2c33"
+                        "ID": "0c92cd5d-fd57-468f-bccc-dabc5d3c4f10"
+                      },
+                      {
+                        "Condition": {
+                          "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+                          "param": {
+                            "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon",
+                            "ParamObject": {
+                              "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                              "SerializeProperty": "=Item.项目成员ID"
+                            }
+                          },
+                          "value": {
+                            "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                            "SerializeProperty": "=项目成员.ID"
+                          },
+                          "compareType": 1
+                        },
+                        "CommandList": [
+                          {
+                            "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon",
+                            "TableName": "任务成员表",
+                            "ShowConfirm": false,
+                            "RowsToUpdate": 1,
+                            "RowsToUpdateCondition": {
+                              "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+                              "ColumnBindingInfo": {
+                                "TableName": "任务成员表",
+                                "ColumnName": "ID",
+                                "GUID": "d3e9f378-06c0-475d-9858-23dba71785bd"
+                              },
+                              "Value": {
+                                "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                                "SerializeProperty": "=Item.ID"
+                              }
+                            },
+                            "UpdateBindingValues": [
+                              {
+                                "BindingInfo": {
+                                  "TableName": "任务成员表",
+                                  "ColumnName": "项目成员ID",
+                                  "GUID": "a5b6bfb0-f127-441d-a1f4-e321396a0025"
+                                },
+                                "Value": {
+                                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                                  "SerializeProperty": "=项目成员.ID"
+                                }
+                              }
+                            ]
+                          }
+                        ],
+                        "ID": "51e6605b-79e1-4d6c-b152-55e3fbd686ed"
                       }
                     ]
                   }
@@ -223,7 +289,7 @@
           },
           {
             "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon",
-            "ServerCommandName": "同步项目参与人字段",
+            "ServerCommandName": "同步项目参与人列表",
             "Parameters": [
               {
                 "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon",

ServerCommands/项目/移除项目成员.json

@@ -98,7 +98,7 @@
           ]
         }
       },
-      "ID": "3b0e3f66ab994d029e85d7952bb2800f"
+      "ID": "76f278bfb195492ba46fd874d4750856"
     },
     {
       "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
@@ -156,6 +156,51 @@
                     ]
                   }
                 },
+                {
+                  "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon",
+                  "TableName": "任务成员表",
+                  "ShowConfirm": false,
+                  "RowsToUpdate": 1,
+                  "RowsToUpdateCondition": {
+                    "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess",
+                    "SubConditions": [
+                      {
+                        "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+                        "ColumnBindingInfo": {
+                          "TableName": "任务成员表",
+                          "ColumnName": "项目ID",
+                          "GUID": "6c11b9bb-f57e-445e-aa08-f0710b540c34"
+                        },
+                        "Value": {
+                          "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                          "SerializeProperty": "=项目ID"
+                        }
+                      },
+                      {
+                        "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+                        "ColumnBindingInfo": {
+                          "TableName": "任务成员表",
+                          "ColumnName": "参与人",
+                          "GUID": "bf84ac5f-0e10-47fa-9398-d2b9099cc239"
+                        },
+                        "Value": {
+                          "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                          "SerializeProperty": "=成员用户名"
+                        }
+                      }
+                    ]
+                  },
+                  "UpdateBindingValues": [
+                    {
+                      "BindingInfo": {
+                        "TableName": "任务成员表",
+                        "ColumnName": "项目成员ID",
+                        "GUID": "6307591f-dcb7-47d5-bda8-bca2b7446af2"
+                      },
+                      "Value": "%Null%"
+                    }
+                  ]
+                },
                 {
                   "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon",
                   "TableName": "项目动态",
@@ -166,7 +211,7 @@
                       "BindingInfo": {
                         "TableName": "项目动态",
                         "ColumnName": "项目ID",
-                        "GUID": "0247e828-bc5a-47c7-888b-5b85f15f5ba1"
+                        "GUID": "af87ba88-6365-49bc-a9ab-16badbc39596"
                       },
                       "Value": {
                         "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -177,7 +222,7 @@
                       "BindingInfo": {
                         "TableName": "项目动态",
                         "ColumnName": "项目动态",
-                        "GUID": "a1f2044f-2398-4a49-be13-49c2a5597110"
+                        "GUID": "f1f47cd2-a9c5-4aea-8ce5-46cdacd3cf8a"
                       },
                       "Value": {
                         "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -188,7 +233,7 @@
                       "BindingInfo": {
                         "TableName": "项目动态",
                         "ColumnName": "执行人",
-                        "GUID": "84f04962-b95e-4012-bb85-ec041eab9ef5"
+                        "GUID": "a87dbcdb-9108-443b-8eb4-200fa93ae63b"
                       },
                       "Value": "%CurrentUser%"
                     }
@@ -198,7 +243,7 @@
             },
             {
               "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon",
-              "ServerCommandName": "同步项目成员",
+              "ServerCommandName": "同步项目参与人列表",
               "Parameters": [
                 {
                   "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon",
@@ -218,7 +263,7 @@
               "Message": "删除成功"
             }
           ],
-          "ID": "61ee3711-96d4-48e4-9395-f21a92ac140c"
+          "ID": "684e121b-88f1-49a3-9163-275bbd5655ff"
         },
         {
           "CommandList": [
@@ -228,7 +273,7 @@
               "Message": "该成员已参与到具体任务，请先从任务中剔除后再进行删除！"
             }
           ],
-          "ID": "d70ffc4c-625e-4684-a03f-3370f5e12a83"
+          "ID": "d705c8c2-5d84-41a2-9d3d-49fc417e500d"
         }
       ]
     }

Tables/任务/任务成员表.json

@@ -25,6 +25,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.UserBindingColumnSaveData, ServerDesignerCommon",
       "DatabaseColumnType": "nvarchar",
@@ -32,20 +39,6 @@
       "Name": "参与人",
       "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
     },
-    {
-      "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon",
-      "DatabaseColumnType": "bigint",
-      "MaxLength": -1,
-      "Name": "岗位ID",
-      "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
-    },
-    {
-      "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon",
-      "DatabaseColumnType": "float",
-      "MaxLength": -1,
-      "Name": "任务时薪",
-      "ColumnType": "System.Double, 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",
@@ -85,19 +78,19 @@
       "ForeignColumn": "任务ID",
       "IsDetailTableRelation": true
     },
-    {
-      "PrimaryTable": "项目岗位",
-      "PrimaryColumn": "ID",
-      "ForeignTable": "任务成员表",
-      "ForeignColumn": "岗位ID",
-      "IsDetailTableRelation": true
-    },
     {
       "PrimaryTable": "项目表",
       "PrimaryColumn": "ID",
       "ForeignTable": "任务成员表",
       "ForeignColumn": "项目ID",
       "IsDetailTableRelation": true
+    },
+    {
+      "PrimaryTable": "项目成员表",
+      "PrimaryColumn": "ID",
+      "ForeignTable": "任务成员表",
+      "ForeignColumn": "项目成员ID",
+      "IsDetailTableRelation": true
     }
   ],
   "Indexes": []

Tables/项目/项目表.json

@@ -218,7 +218,9 @@
             "预算方案": 5,
             "已分配计划工时": 5,
             "工时分配方式": 5,
-            "参与人列表": 5
+            "参与人列表": 5,
+            "项目成员数": 5,
+            "项目岗位数": 5
           },
           "subTableOperations": {
             "View_任务工时统计": 5,
@@ -233,7 +235,8 @@
             "项目岗位": 5,
             "项目成员表": 5,
             "项目版本": 5,
-            "项目预算变动表": 5
+            "项目预算变动表": 5,
+            "项目版本环境配置": 5
           },
           "dataFilter": {
             "$type": "Forguncy.RbacPermission.Core.Impl.Data.FieldFilter, Forguncy.RbacPermission.Core"
@@ -277,7 +280,9 @@
             "预算方案": 5,
             "已分配计划工时": 5,
             "工时分配方式": 5,
-            "参与人列表": 5
+            "参与人列表": 5,
+            "项目成员数": 5,
+            "项目岗位数": 5
           },
           "subTableOperations": {
             "View_任务工时统计": 5,
@@ -292,7 +297,8 @@
             "项目岗位": 5,
             "项目成员表": 5,
             "项目版本": 5,
-            "项目预算变动表": 5
+            "项目预算变动表": 5,
+            "项目版本环境配置": 5
           },
           "dataFilter": {
             "$type": "Forguncy.RbacPermission.Core.Impl.Data.FieldFilter, Forguncy.RbacPermission.Core"
@@ -336,7 +342,9 @@
             "预算方案": 5,
             "已分配计划工时": 5,
             "工时分配方式": 5,
-            "参与人列表": 5
+            "参与人列表": 5,
+            "项目成员数": 5,
+            "项目岗位数": 5
           },
           "subTableOperations": {
             "View_任务工时统计": 5,
@@ -351,7 +359,8 @@
             "项目岗位": 5,
             "项目成员表": 5,
             "项目版本": 5,
-            "项目预算变动表": 5
+            "项目预算变动表": 5,
+            "项目版本环境配置": 5
           },
           "dataFilter": {
             "$type": "Forguncy.RbacPermission.Core.Impl.Data.FieldFilter, Forguncy.RbacPermission.Core"
@@ -559,13 +568,13 @@
     {
       "$type": "Forguncy.SaveLoad.StatisticColumnSaveData, ServerDesignerCommon",
       "BindingInfo": {
-        "TableName": "任务成员表",
+        "TableName": "项目成员表",
-        "ColumnName": "参与人",
+        "ColumnName": "项目成员",
-        "GUID": "ba426353-557c-4893-9daf-8991f6d87b25"
+        "GUID": "ae230332-b3f6-4eb8-bb84-b3bba33769d8"
       },
       "AggregateFunction": 5,
-      "DataColumnName": "参与人",
+      "DataColumnName": "项目成员",
-      "DetailTableName": "任务成员表",
+      "DetailTableName": "项目成员表",
       "Name": "参与人列表",
       "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
     },

UserControlPages/聊天列表.json

@@ -267,6 +267,13 @@
           "DataCommitType": 2
         }
       }
+    },
+    "1,0": {
+      "BindingInfo": {
+        "TableName": "对话主题",
+        "ColumnName": "ID",
+        "GUID": "085ad918-ba54-4ee3-9769-9b4b7b54323e"
+      }
     }
   },
   "StyleDatas": {
@@ -289,7 +296,8 @@
     }
   },
   "Spans": [
-    "0,0,1,28"
+    "0,0,1,28",
+    "1,0,1,3"
   ],
   "PageInfo": {
     "$type": "Forguncy.Model.Pages.UserControlPage, ServerDesignerCommon",
@@ -410,4 +418,4 @@
     "PaperSize": {},
     "Margin": {}
   }
-}//pfLFkAiCYndAobWzeJzvauLH7IuxWEI2Kl3SyTclW788NzziflEqHgAmMQZSGmNBo1iNEDSjTbxN2Y4GLgougkfn+bYrhRS9zr/BMVxuVNgkCk+AfbcHUJ1lr1q6pw+e5rPBalB8Tip6wu4mIxzhfQoTEQY5Lf7e2gMhFqglovhfRk3JtHNhaHPkklJnqVu1E/nPvfS7zfYYvV6fu3u4ICJd/GKzdwy7MbQxIEGVN4MAXPj1xZa9j4/3RfC5RzB8gsv0wCTV0nyok9BN24FOZ6EjBbjl6qaHnS0monqWFz1iLk3OmPD2b5xxzPiDN0jwxEVWDOOoBtNatRgAeH/0bRQsyXiJdogXXfTZPOE8Q96el4aR4tbiKhJW+1TKRosYUm6+W2gyvDI4dotPypYpkbEIf8kAn8xCSq24owZb8FJELJBP6uvm/mS5IGgZQjHHuZPLNZvkxXhZ2J/d2G+/zffdMjXTEVdcgNlc7fixk2mPShxPSZqv85pNl2MQKpyfOenq/ixvqHM/jXHBD4Vf7ekcLR1DLXtImx3f6AnLDMi1BWL5oCoOni9waoyR0a+WXlyXpXCTUe4SZfHteoWkJwl2RuH1LZfHekjGVkh1o92VYg6sAXH9IC1OggvpTOu4i0WjFKpTePJVjOzZp2B6CVrKI8cwd/62pgpQUMx3QcW88Dv+ZnMuFhMpOcBn5XIdcfxzyc+kjFpa/+jKaSMcKR5tKsvuwS2Lr+ZTMmfN9NBxsMHCX6Cg37SWGIXnoD/1eaSHvtTN8bprk5cKlHhSRFBIukbXZeM3hEA5pVT6i+E6CIm6eM3pdDb2YGtnuDCkT0UrHUqhImnOzM674QYb0B11XYF6TJU3zdLAdKXlALtp7o5Y92vC08R1o3k8IB1AJ5TmqswaR44qB77SMIc93Q==|920
+}//aVnxszOOhnyHtr/t+ZWIMuTEE9SfjpfjBgIyCnSr5iWoRQewrkj5MN0P3WSRlAHazLNpDqq2PrSMoOAwFymsLEf1h5GyCUKClHEpKrKco+hdVdjO68PGsAlZ+FAu3nQdwPa69bRTzHbRAZy3UNuYv6a+5w2lWCK3RiBEyYP1u4D4G/Ht0zF26lzS0KLikRMMoZ1/JwByyKk2IvVgF4gtS/bX3G8k2ii2ejRxasg141VGNtKGn5mlsfCi9Mr6c0ICqJ33NtyPbhUhjWKaGoDioQ7ZTAcs8H4CpwLdCZbVNqFHsszAmqC2KMi3gcau37frktfjqFRfJ8vLcAw8Iq6kksf8s92rOeif6RpgaCOv6cl6EQ5OyOE0OfBQZ1GLca60HLp6mOtd0iowFJsGnkhNFpoX5Dsr7mEtOp0Jcpsj5vX6JS/JlyjesV0xKcPKyi3iTbD7rCHmLyqkOhIaVa1/p1MNJe5XvjV1FGDwFm33Vwbn75by2BT4DEVAhkjru3xgGXr0RTmACtrWJEFITuIJHTRIWcf/+zbPvnDG+rUu3tXxgel+CREvCUDGxeYSWXiI+WOuHnX1/AO1IU+55M4O64GBmQtj9c5wqSjywqJryzLJPaPws1Unha1EzDxKkLd8GuyFBJr0ITqfw541yC/r2T1DfB/wBQhqQRjki4R3/1usJYQK8nmA8L5mnWsNOrFP6dgAp3HPGbna1ZClwIOaJ99bAJA8AYqcUVnX42SvmKRjM70rI+sJ95lznEI+0k51RKfc2gg+Hf9+mHh1vTpZKDAM6HIP6adPNwDbIcnnaBSMb6zuW7GA5XLwn7ObvAmQBQbNsoBP33mjvlNJjS6JWLYo/BJZ1Y2IkIf46zU59SFbUuMrxIfEQ0DJLwrpmuxVQRZ1uO0g8M6BWJXOI6U7xA==|920