{"Message":"重构任务审批流程\r\n重构子任务审批流程\r\n优化任务首页，负责审批、修改等","MessageType":2,"Modules":[{"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":36,"Name":"ShareCommandContainer/打开任务详情"},{"State":1,"Type":9,"Name":"Theme"},{"State":1,"Type":15,"Name":"ServerCommand/任务发起流程前校验"},{"State":1,"Type":28,"Name":"ProcessItem/新增任务流程"},{"State":1,"Type":23,"Name":"TableView/任务平行视图"},{"State":1,"Type":1,"Name":"PCPage/任务审批"},{"State":3,"Type":16,"Name":"TaskScheduler/新增任务事件"},{"State":3,"Type":16,"Name":"TaskScheduler/任务表新增事件"},{"State":3,"Type":15,"Name":"ServerCommand/初始化填充任务数据"},{"State":3,"Type":27,"Name":"ServerCommandPrivate/初始化填充任务数据"}],"Version":"v1"}

.collaboration

@@ -28,16 +28,7 @@
   },
   {
     "ModuleName": "Table/项目表",
-    "State": 1,
+    "ModuleType": 7
-    "LockedBy": {
-      "UserName": "超哥",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-06-19T17:07:16.6736236+08:00",
-    "ModuleType": 7,
-    "ToRemoveFiles": [
-      "Tables\\项目\\项目表.json"
-    ]
   },
   {
     "ModuleName": "Table/项目成员表",
@@ -567,19 +558,7 @@
   },
   {
     "ModuleName": "PCPage/任务列表",
-    "State": 1,
+    "ModuleType": 1
-    "LockedBy": {
-      "UserName": "超哥",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-06-19T17:48:52.1532833+08:00",
-    "ModuleType": 1,
-    "ToRemoveFiles": [
-      "Pages\\项目\\项目首页\\项目首页-容器页面\\任务列表.json",
-      "Pages\\项目\\项目首页\\项目首页-容器页面\\任务列表.rd",
-      "Pages\\a3c94948c8a24e6a9d63fc05ebfd71f.json",
-      "Pages\\a3c94948c8a24e6a9d63fc05ebfd71f.rd"
-    ]
   },
   {
     "ModuleName": "PCPage/项目工时",
@@ -599,21 +578,7 @@
   },
   {
     "ModuleName": "PCPage/项目成员",
-    "State": 1,
+    "ModuleType": 1
-    "LockedBy": {
-      "UserName": "超哥",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-06-19T16:55:58.8216924+08:00",
-    "ModuleType": 1,
-    "ToRemoveFiles": [
-      "Pages\\项目\\项目首页\\项目首页-容器页面\\项目成员.json",
-      "Pages\\项目\\项目首页\\项目首页-容器页面\\项目成员.rd",
-      "Pages\\6899a8cead694b3ba00307b6756dbd7.json",
-      "Pages\\6899a8cead694b3ba00307b6756dbd7.rd",
-      "Pages\\007ea4aa4c7440478a9a092179dace8.json",
-      "Pages\\007ea4aa4c7440478a9a092179dace8.rd"
-    ]
   },
   {
     "ModuleName": "PCPage/项目负荷",
@@ -665,17 +630,7 @@
   },
   {
     "ModuleName": "PCPage/项目审批",
-    "State": 1,
+    "ModuleType": 1
-    "LockedBy": {
-      "UserName": "超哥",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-06-19T16:50:05.5106647+08:00",
-    "ModuleType": 1,
-    "ToRemoveFiles": [
-      "Pages\\项目\\项目流程页面\\项目审批.json",
-      "Pages\\项目\\项目流程页面\\项目审批.rd"
-    ]
   },
   {
     "ModuleName": "Pages/项目/项目首页/预算申请",
@@ -715,77 +670,23 @@
   },
   {
     "ModuleName": "PCPage/任务首页",
-    "State": 1,
+    "ModuleType": 1
-    "LockedBy": {
-      "UserName": "超哥",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-06-19T17:34:27.8361688+08:00",
-    "ModuleType": 1,
-    "ToRemoveFiles": [
-      "Pages\\任务\\任务首页.json",
-      "Pages\\任务\\任务首页.rd"
-    ]
   },
   {
     "ModuleName": "PCPage/任务部分",
-    "State": 1,
+    "ModuleType": 1
-    "LockedBy": {
-      "UserName": "超哥",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-06-19T17:50:27.6419529+08:00",
-    "ModuleType": 1,
-    "ToRemoveFiles": [
-      "Pages\\任务\\任务部分.json",
-      "Pages\\任务\\任务部分.rd"
-    ]
   },
   {
     "ModuleName": "PCPage/任务-侧栏",
-    "State": 1,
+    "ModuleType": 1
-    "LockedBy": {
-      "UserName": "超哥",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-06-19T18:21:53.1320163+08:00",
-    "ModuleType": 1,
-    "ToRemoveFiles": [
-      "Pages\\任务\\任务-侧栏.json",
-      "Pages\\任务\\任务-侧栏.rd",
-      "Pages\\9d9faa04d5a74f1dbf8dd3b2040b6f6.json",
-      "Pages\\9d9faa04d5a74f1dbf8dd3b2040b6f6.rd",
-      "Pages\\b522ad93131845cf87553eda79dfd25.json",
-      "Pages\\b522ad93131845cf87553eda79dfd25.rd"
-    ]
   },
   {
     "ModuleName": "PCPage/任务-基本信息",
-    "State": 1,
+    "ModuleType": 1
-    "LockedBy": {
-      "UserName": "超哥",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-06-19T17:35:28.7771149+08:00",
-    "ModuleType": 1,
-    "ToRemoveFiles": [
-      "Pages\\任务\\任务-基本信息.json",
-      "Pages\\任务\\任务-基本信息.rd"
-    ]
   },
   {
     "ModuleName": "PCPage/任务-任务信息",
-    "State": 1,
+    "ModuleType": 1
-    "LockedBy": {
-      "UserName": "超哥",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-06-19T19:42:53.3428893+08:00",
-    "ModuleType": 1,
-    "ToRemoveFiles": [
-      "Pages\\任务\\任务-任务信息.json",
-      "Pages\\任务\\任务-任务信息.rd"
-    ]
   },
   {
     "ModuleName": "PCPage/任务-关联资源",
@@ -793,19 +694,7 @@
   },
   {
     "ModuleName": "PCPage/任务-子任务列表",
-    "State": 1,
+    "ModuleType": 1
-    "LockedBy": {
-      "UserName": "超哥",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-06-19T17:32:56.1911343+08:00",
-    "ModuleType": 1,
-    "ToRemoveFiles": [
-      "Pages\\任务\\任务-子任务列表.json",
-      "Pages\\任务\\任务-子任务列表.rd",
-      "Pages\\558ca610fafc4ffd8884b819161bfd6.json",
-      "Pages\\558ca610fafc4ffd8884b819161bfd6.rd"
-    ]
   },
   {
     "ModuleName": "PCPage/任务-工时",
@@ -1245,16 +1134,7 @@
   },
   {
     "ModuleName": "ShareCommandContainer/打开任务详情",
-    "State": 1,
+    "ModuleType": 36
-    "LockedBy": {
-      "UserName": "超哥",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-06-19T20:29:37.8627599+08:00",
-    "ModuleType": 36,
-    "ToRemoveFiles": [
-      "ShareCommandContainers\\打开任务详情.json"
-    ]
   },
   {
     "ModuleName": "RdlReport/工时报表",
@@ -1282,20 +1162,7 @@
   },
   {
     "ModuleName": "Theme",
-    "State": 1,
+    "ModuleType": 9
-    "LockedBy": {
-      "UserName": "超哥",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-06-19T20:47:40.6269267+08:00",
-    "ModuleType": 9,
-    "ToRemoveFiles": [
-      "Theme\\CellTypeStyles",
-      "Theme\\ListViewStyles",
-      "Theme\\StyleDefaultNames",
-      "Theme\\ThemeConfig",
-      "Reports\\DefaultTheme.rdlx-theme"
-    ]
   },
   {
     "ModuleName": "image/内置图片",
@@ -2042,30 +1909,11 @@
   },
   {
     "ModuleName": "ServerCommand/任务发起流程前校验",
-    "State": 1,
+    "ModuleType": 15
-    "LockedBy": {
-      "UserName": "超哥",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-06-19T17:19:49.8719392+08:00",
-    "ModuleType": 15,
-    "ToRemoveFiles": [
-      "ServerCommands\\任务\\任务发起流程前校验.json"
-    ]
   },
   {
     "ModuleName": "ProcessItem/新增任务流程",
-    "State": 1,
+    "ModuleType": 28
-    "LockedBy": {
-      "UserName": "超哥",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-06-19T17:25:43.4544577+08:00",
-    "ModuleType": 28,
-    "ToRemoveFiles": [
-      "Process\\新增任务流程.json",
-      "Process\\新增任务流程.bpmn"
-    ]
   },
   {
     "ModuleName": "PCPage/页面反馈录入",
@@ -2113,16 +1961,7 @@
   },
   {
     "ModuleName": "TableView/任务平行视图",
-    "State": 1,
+    "ModuleType": 23
-    "LockedBy": {
-      "UserName": "超哥",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-06-19T17:29:00.0722891+08:00",
-    "ModuleType": 23,
-    "ToRemoveFiles": [
-      "Tables\\任务\\任务平行视图.json"
-    ]
   },
   {
     "ModuleName": "Pages/任务/任务类型管理",
@@ -2262,17 +2101,7 @@
   },
   {
     "ModuleName": "PCPage/任务审批",
-    "State": 1,
+    "ModuleType": 1
-    "LockedBy": {
-      "UserName": "超哥",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-06-19T16:53:37.2178682+08:00",
-    "ModuleType": 1,
-    "ToRemoveFiles": [
-      "Pages\\任务\\任务审批\\任务审批.json",
-      "Pages\\任务\\任务审批\\任务审批.rd"
-    ]
   },
   {
     "ModuleName": "ServerCommand/发起任务（废弃）",
@@ -2296,42 +2125,18 @@
   },
   {
     "ModuleName": "TaskScheduler/新增任务事件",
-    "State": 3,
-    "LockedBy": {
-      "UserName": "超哥",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-06-19T17:04:23.3641147+08:00",
     "ModuleType": 16
   },
   {
     "ModuleName": "TaskScheduler/任务表新增事件",
-    "State": 3,
-    "LockedBy": {
-      "UserName": "超哥",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-06-19T17:11:12.0318592+08:00",
     "ModuleType": 16
   },
   {
     "ModuleName": "ServerCommand/初始化填充任务数据",
-    "State": 3,
-    "LockedBy": {
-      "UserName": "超哥",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-06-19T17:08:13.2061805+08:00",
     "ModuleType": 15
   },
   {
     "ModuleName": "ServerCommandPrivate/初始化填充任务数据",
-    "State": 3,
-    "LockedBy": {
-      "UserName": "超哥",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-06-19T17:10:43.5142069+08:00",
     "ModuleType": 27
   }
 ]

Pages/007ea4aa4c7440478a9a092179dace8.json

@@ -147,27 +147,6 @@
       "ForguncyPictureSourceType": 0,
       "Stretch": 2,
       "PictureCommands": [
-        {
-          "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
-          "ConditionAndCommandPairList": [
-            {
-              "Condition": {
-                "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
-                "param": {
-                  "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon",
-                  "tableData": {
-                    "TableName": "项目表",
-                    "ColumnName": "项目经理",
-                    "GUID": "429e7668-2eff-4079-ab79-72e279153047"
-                  }
-                },
-                "value": {
-                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                  "SerializeProperty": "='007ea4aa4c7440478a9a092179dace8'!B10"
-                },
-                "compareType": 1
-              },
-              "CommandList": [
         {
           "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon",
           "PopupDisplayMode": 1,
@@ -216,7 +195,7 @@
                                 "LoadBindingDataOption": 1
                               }
                             ],
-                                    "ID": "9ad5d746-9f09-4aa9-96c0-bc8b5918099c"
+                            "ID": "38ce1417-7356-4600-8e20-21cc1cb404fe"
                           },
                           {
                             "Condition": {
@@ -231,6 +210,27 @@
                               },
                               "value": "删除"
                             },
+                            "CommandList": [
+                              {
+                                "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
+                                "ConditionAndCommandPairList": [
+                                  {
+                                    "Condition": {
+                                      "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+                                      "param": {
+                                        "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon",
+                                        "tableData": {
+                                          "TableName": "项目表",
+                                          "ColumnName": "项目经理",
+                                          "GUID": "429e7668-2eff-4079-ab79-72e279153047"
+                                        }
+                                      },
+                                      "value": {
+                                        "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                                        "SerializeProperty": "='007ea4aa4c7440478a9a092179dace8'!B10"
+                                      },
+                                      "compareType": 1
+                                    },
                                     "CommandList": [
                                       {
                                         "$type": "Notiflix_Forguncy.Confirm_Command, Notiflix_Forguncy",
@@ -309,22 +309,37 @@
                                                         "BtnText": "知道了"
                                                       }
                                                     ],
-                                                    "ID": "8733c44f-7860-4799-a1a9-78cae72b0755"
+                                                    "ID": "e30be92d-6a27-4924-b9ed-afc638678579"
                                                   }
                                                 ]
                                               }
                                             ],
-                                            "ID": "fc3be921-2381-473c-a141-194aeda25e4d"
+                                            "ID": "07e41453-eabf-471c-9e95-8ca7250a518c"
                                           }
                                         ]
                                       }
                                     ],
-                                    "ID": "a80303da-4278-478f-834d-eecda3b37f41"
+                                    "ID": "1dd85984-44a0-4a5f-9194-b334c83dba4b"
+                                  },
+                                  {
+                                    "CommandList": [
+                                      {
+                                        "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy",
+                                        "FourStandardStyle": "warning",
+                                        "Message": "项目经理为默认项目成员，不允许删除"
+                                      }
+                                    ],
+                                    "ID": "358a6649-3212-47c6-a935-28dec8c4de45"
                                   }
                                 ]
                               }
                             ],
-                            "ID": "a42dbed8-6ea2-4655-bd2d-6405f8de4af7"
+                            "ID": "b684b37f-3e95-4461-b9bb-6fb0d6f4998e"
+                          }
+                        ]
+                      }
+                    ],
+                    "ID": "3eac8bed-2638-4732-a2a6-ceaffa596a4d"
                   }
                 ]
               }
@@ -337,24 +352,9 @@
           "PageName": "编辑删除页面"
         }
       ],
-              "ID": "5f177045-bacf-491b-9784-f2a80dfb2d7b"
-            },
-            {
-              "CommandList": [
-                {
-                  "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy",
-                  "FourStandardStyle": "warning",
-                  "Message": "项目经理为默认项目成员，不允许删除"
-                }
-              ],
-              "ID": "cc3c4bea-4692-4ef8-b00d-7d1f49a4560e"
-            }
-          ]
-        }
-      ],
       "ForegroundFill": "Text 1 50",
       "Location": "113.90476190476193,5.714285714285715",
       "Size": "20,20"
     }
   ]
-}//daey0uqjv9nUgYhhx8owWko9mnUEKy95h8GYTok6Wl5/uIr6Nt8VutSKqF9M+sRMKXL6TYPY6vuXOaaJZDnsNxW9rxBGLdQo/R0BV2vv/+1khu9zbhbp1Nx0JBwa54AvmnijH4A4y73xGur0zqvxSRAB8S1InENJDyNAUbGUmqCr8oXE1vnAvfxyJzfK7ncLjaV05+IgAEBDCyoLZGHnI5QbeL5GpYbvI460h6B9s4VZB6bqqfmT3MAVjtavAXmLMtT/z6YzrnxvJSqxNeZpXxGLzK7Tl9fAc0dyR0qJQWyqF0gjK+KinYcQ3Ytpmvzv1UdqewOaHlHxKy1eqTAuPi2skXVU0pCCvcb0MYGmP43v2GcwcBIkk/zWXh9CZuY+AwLZeb6QPFM99Pkl0LL7JX8SnLQahqVcuBJ3GevAXjXnFOtil5SnnQOAnHsyuiqVEQCTE1LzvRAyScNHjgvA7jSQ1r8V6q9L1454gTFJ/8D5e2x6oLwB549E6ZMOOKlMKpG4U7DOOOVT1/sg4WmLUo7X9+/IzkV3OpoQdZo7RWqCXnc1u5s3xAoRT3r2lCDvCJyPtfE6MtXHkKuuORdTFagqwZQd3wd6ATrp+EpFPcNB74oRzhaCxu3neK2cbDfFYO0/CefW3eOxoCZdLqzaeqC9A8YR2Y9/NGDxCbDABwHOTCYoVquLnJPHbaih82Ehgr9bY6qK47GG506lqow1sidjFytUWR4VpjGPIWPTw/XzqPCu3yzB8x3w8r+4oZvQFwlzWZ1My51fSzVExbERTDzPtkcb/f/8jJnW0Ebyja+9aiQW9//FdlwPzxRcw0HUfmNGe1XmCAJk4U9Ga7YdTpccB4DFkiQuQDWZOwJdP7W/wEqpVww0n68QJi6Z3S0QK5g8Nja0qJhiKpDArA+pbw==|920
+}//2u/gmvcsQGmA/Rl1hRvkUFbyNOipWW66fpQB2rxahGDxuS9QX6c9CnZxiqIi6YdQ/ob0BsYyhWWoLSRjOrobAyc3XMCpRj/Q0im0Bs7oig08RiWrK15gHVyvRSqrK6OeXkU9YPj5AVxLLmhKn4G3Ln/Xr8QzAj4kyZhdEqdbc6aXOPYFMWYps7yR1hqL7glre68B5UvnNCCZlQXAHEr69nD977pSRVtJY9u7A8RcbxBtPNV+GGnXQUTvwZ/dB8tZYSLsv2RmBFX1k0g5pSqKV2ppDWdEi+Hf+Ko+wmLebtReppnlBl8b9Cot6RFib3biIkrgPmGtrs/5K7yO6nW+KsxrLZ0jNmNh3GJojPxlU1dt+df9OBv5Ueo+ClAJjnzaLmdtW1+MsYBLeB6SGjeYCPZvxfny1SxbHqYka4HWBu0GLaoeMWH9/eUFlGKXOYgaYPv76RO27i3FB5ZhUvkVkHBKeg9fy3G7y5D8cLN7u0Lh+DZqe32qPemBUMAqTW4yHWRZeWqrraLVHO+ADMHaArY1o0i2t+o78HzdSsjpZuv92RSUt1ixhwELugRlu/l8H0J8/rBZApc6EmseTgMMTtIuyVx4ErPje9B6wTuZDJTeMx2ZZbP23qWAOmCUZBONKIXPkm9Ju6bBAlFAm3oaRbq16MLW7fh9LcvmBHCaHixBy/ximBhiCTeXX8OPCyT4lCTvNaES6ScR7TYYaO3gxv9nJa7Z2AZadM854a4ZHye69dGkmGxAa6+3Jth0ujXtWSmQCIkVAfXmbiPXaOIJcaoJed5CkkDTY7VIfU3Q89/1N4NAzNMbLsg0dylatCQ/k+q/KvMToDa6cxM3hlxMShvMf8hN9RQat4niT3LxLh7FWFDLBAsB1eykPJB+cPtYJTdSOZe2jCvu08r6auWMBw==|920

Pages/9d9faa04d5a74f1dbf8dd3b2040b6f6.json

@@ -55,10 +55,6 @@
       "CellType": {
         "$type": "ElementUI.AvatarCellType, ElementUI",
         "CommandList": [],
-        "icon": {
-          "$type": "GrapeCity.Forguncy.Plugin.ImageValue, GrapeCity.Forguncy.Plugin",
-          "Name": "默认头像 .png"
-        },
         "showSystemAvatar": true
       },
       "TemplateCellSource": "用户名"
@@ -100,4 +96,4 @@
     "PaperSize": {},
     "Margin": {}
   }
-}//b2uK1UtNDc3vDSVddF2njih6YfSe2Uxwv7M3s1SgDeNRgxZxePt54AQB8mopt9IjKCbAAlY1iGYjmEyxEx6ambsotF/b9WIVSMagClGS1ykaKsn+XPj7E2DyaPyj/7HJ4EuOredcQ/tupSqjgwnsGoVdMcaclLEx7wZ9gT/T7GdTxbCsg8ZeoXIoLNx3WtlcGb/qtabZAc9KocTvng2xlKeNyjxDOXYKvOyGaEnFrnuvRgK05be1/B24mCMOC9TsKz8C6cgXS9ZRdaaxyOGNtSlL9jNjgKNgXSvBhrK0dxHRDP9vY9rUgBtV1D+TLTqqGSspCya98ZQH2b7IWQfoJTEyFGLHUd2mrcFRMeWLJRFMG25lP4E6yfaoL2oQ3hpb8CfvlIHda9sLGaw+kTEvoDvKt6nL1oKYHRhFTlsKh3f2+VQMtM+0iOk3+98cQ3lfZ7oP8mP9G9jussbphZf1Uy9xz6Fvt04IJiXx5nJ8W+m+yXK3bQ5oqsYq7S67H4WI820y3qNmKlUIdZLtUmS5iGAhEumPu6EddyW3Djqi5B3HN17XV+8ccSY0lSC12bcacUrs9WQ3lEAAOnbMy1T9XjHmLuCw1+7ZdA5iJlOPoF8c1VeMJQVkQ9+RXYcT9/qxTlUPZTrKejFhtlsL1nvQh45IGjGpnZC9XM4RhOtgBHWQFvydFLGoNDNo8+772yTMAqsb+Y9eKBKsgQkSQJMJ3OHivFYl6aA4Nz1UnB3lmdIYa2gBmsQZhEyOGym7Pn3kWLmn3xXO98xsrCSmZJU849FwDetw4LMgH7o2A1HCTr6MezNksp2pEyi0d3BavU1wibrIecrNjEi2QdHkbsQGSdSNcCidSIUE5r1kBzkT9BNdBmOqS8v/hnmIAxEe/9iBYvfVB8R0+LptZqRyb3j+Nw==|920
+}//K2stV+wQ1luCG4lCN0o/D2bZo8CuOW35fITRzFL68DlP3DYsdhVcPLS438qvC19E2kAAdb8igkez0791Yfve62IxSgWxGbBXFCzvp0WwBgURJ4iAyMGpqMxxqOJzQ3M5ZJVv3r0rQndw6qcz9omC+BK066JGFR59SPJcUJbHMmM+/cBPyBofuvIbm2Yuk0x8dS2nMxVj2TeMlVhWEbyVBHfG/F4CmPpMvSzc0QhJ66tS50kML6gCXbRIu3wnNJQUzttfhYs5ROUWdfOUgFY/zQzXnl4DFFQt/HZUr5oEzcerFOaad7kE7c9GUGLhWN193iUuB06ZE+Jrd+VnhtFtxoT/RszK/D3e2MHLGzg3V3t9bfUJ+EHKlM4N9gEz7ygBdtniP0P2oHFhPM+NBx3jH9XNtBIJIk1vS9MlO/4Skv2nWDWNpCF2mFbR5UKCtzC/DV7sc3efKTtUxjsm9YhU+0sfqHBO0xLBMlqmkZ5QcxTIRptPvv9FLL9H01fXMEJutTUy5/lmtd2ldxh52WS2NNcRb4VbPES6DSwmn9L+lCckfkmGgT90W2KooySQESv59GywMoV5dCy5t/RVaVuv+gCZmQArTCzkHPybCbG63cZP49JSmgJiPLBxmxoPbvlSAP2xjcmeUMjA86eqVn1/T90aTmAN3qduxxE2dsTeEisI5G5ekZD6W5g1TGA9uyYUakyGUyhS6M5cchp4EwV2KDDHusrjabi1V63TZrmqMrJhUhYmyDSZMjfEPO51mgS+wDzzNUsTRRvFh3/gOvGiTwzvN1g5EVrjKfmFM4E7Dp+GkjUV92C4zh3xQmICxe7VtwEurLKTO/iC6GZ5VI2TRo59JtlwLz/nYnThqxb8UUIIph6t+NEbJg8nYnAbi9J64BSqgHG93fobLQ4aC1GAxQ==|920

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

@@ -297,7 +297,7 @@
                     ]
                   }
                 ],
-                "ID": "fce11cef-6a14-4d79-af6f-b09e2f9e5c02"
+                "ID": "bcee26ff-01a0-4b1a-b225-d154b05ccdb2"
               }
             ]
           }
@@ -420,7 +420,7 @@
                           "MethodName": "ReloadBindingItems"
                         }
                       ],
-                      "ID": "cd17d708-b010-4dbb-b1ef-4d921bef9fe8"
+                      "ID": "6a8926c8-c759-4145-97da-d330124ab7af"
                     }
                   ]
                 }
@@ -510,7 +510,7 @@
                                   ]
                                 }
                               ],
-                              "ID": "d2dcd0c0-7f0c-441d-84b5-a4b5ba700b22"
+                              "ID": "4b3d5b40-d585-440b-9de1-9eeca58c94b0"
                             },
                             {
                               "CommandList": [
@@ -527,12 +527,12 @@
                                   ]
                                 }
                               ],
-                              "ID": "79166c25-857c-4e8d-b104-96beed88f0de"
+                              "ID": "b4871a6b-b11f-4f55-be38-6d03d512b4c5"
                             }
                           ]
                         }
                       ],
-                      "ID": "9faad235-11d7-4b34-abfa-5b8271e0cf23"
+                      "ID": "c0ea09c1-7889-4bc7-b5e5-8e3e145ff17b"
                     }
                   ]
                 }
@@ -602,7 +602,7 @@
                       ]
                     }
                   ],
-                  "ID": "b4cd77df-84cf-4f85-a07a-84633d3f29b4"
+                  "ID": "2805f61b-7dbf-4b60-9b98-2f1166afcea9"
                 },
                 {
                   "CommandList": [
@@ -619,7 +619,7 @@
                       ]
                     }
                   ],
-                  "ID": "c9615878-00fd-43e3-bfe4-3cd38c58b367"
+                  "ID": "6f317660-9d29-40c6-92ac-ee1f4e38104b"
                 }
               ]
             }
@@ -707,7 +707,7 @@
                                   ]
                                 }
                               ],
-                              "ID": "da5688c5-a14e-453b-8607-96b07d942049"
+                              "ID": "58873d98-c095-49fd-8a55-b14c9bbfcd9f"
                             },
                             {
                               "CommandList": [
@@ -724,12 +724,12 @@
                                   ]
                                 }
                               ],
-                              "ID": "ca255871-9f76-4880-a272-5c25ea691da2"
+                              "ID": "1882de71-96ca-44ed-89b4-fa8cf0a4b05e"
                             }
                           ]
                         }
                       ],
-                      "ID": "05f4a0c0-e930-4998-b449-96cc0b6c00c6"
+                      "ID": "6092ec24-6dd6-4853-a2a0-c61abe6f15bb"
                     }
                   ]
                 }
@@ -799,7 +799,7 @@
                       ]
                     }
                   ],
-                  "ID": "a2d9859b-c815-4a56-ab3c-e8dde26c34fb"
+                  "ID": "0d050db1-da36-48e1-a2b1-419312b2354b"
                 },
                 {
                   "CommandList": [
@@ -816,7 +816,7 @@
                       ]
                     }
                   ],
-                  "ID": "f839abe7-c296-4a69-81b9-762c757c4d46"
+                  "ID": "34fda148-33dd-43e3-8963-6913050b4e04"
                 }
               ]
             }
@@ -1080,7 +1080,7 @@
                 ]
               }
             ],
-            "ID": "af025153-c0e9-439a-b492-78d0daca196d"
+            "ID": "6b2a88c8-9d03-48e4-81bb-415ebac95d4f"
           },
           {
             "CommandList": [
@@ -1097,7 +1097,7 @@
                 ]
               }
             ],
-            "ID": "702d5121-b3c7-4529-abea-4bf8845b81f9"
+            "ID": "91dbf291-940e-4138-948f-cbcbdce3ec33"
           }
         ]
       },
@@ -1131,7 +1131,7 @@
                 ]
               }
             ],
-            "ID": "43a41316-6a69-4638-b186-f519e4a5421c"
+            "ID": "19f57f2c-a825-4de9-9508-32c561af30d3"
           },
           {
             "CommandList": [
@@ -1148,7 +1148,7 @@
                 ]
               }
             ],
-            "ID": "4955b4f3-6bf9-4906-a7a6-e53dfb72e043"
+            "ID": "c48a64d8-6a18-4e8e-bf7d-82aa148bdddf"
           }
         ]
       }
@@ -1208,6 +1208,18 @@
     {
       "Name": "折叠任务说明",
       "Formula": "'任务-任务信息'!$S$14"
+    },
+    {
+      "Name": "版本",
+      "Formula": "'任务-任务信息'!$C$4"
+    },
+    {
+      "Name": "任务说明",
+      "Formula": "'任务-任务信息'!$C$7"
+    },
+    {
+      "Name": "备注",
+      "Formula": "'任务-任务信息'!$C$11"
     }
   ]
-}//UdhNoraD62eWCv4AsoBnU4g9VdeF9Z3ydwh9jSts7o19fil4PavI/bmIMlyQ0hghSgaLCB5e2OVsG0gHK8zSMuBraiLHqycl6tKQo1orzlP8YTu/w5BomjQfS1YUVes+8mRzMzZzkbLPh7iLfXoQ6j4hPrcvru9zj5owNAT1WMYh/DT4AQ7IIhAkwMYvTz5HffyDMgsJSH5bp/bfHX33aXyWjU0Rd6zZ/M/Wj7fGFm1zt5d1BIBTWw3U+h0QfdAHeLMODSr02t+HujNvgTzbu3tz9goEgYD2ErGX9WkQ/dnKk0B03JD/63bSIriUPVOvcNfUs2giuaW/8EaT0EdRcxF1Pnbb1+d+qQLLlHKfSYbKYBO6Rsjj13b+0+QVVBs5hruX1P4Vy9ECJNf0Q1HTigoYL6vsoI96gpwOtpQb+aYOb5OdSi1TgexXVt8VHVHGrA+gCgijH1ayIb3aAhvNZBUCoBnxzzfmKj0PUsr0WRPCeq+p3uLlcZgQygKDEzGmERJvMQOqqdb0rti89glY0LZ58uatZx+5LluCgL4+lLZbbpQzTYDl05NRjmBMKV2aH5tECM7sRdnMrU2xrvbCfNJrWGmO/vOQmCWfciHTwU+7bWQPvgcKD7ecGLNyOQqH1NMQ6sCwXNQMu76AU8QsNomg6I3mrQaqQTSjvVKt+AVaJqDhu7AGX+bRyeK5NQ6KaBnAM2/+d65uVOcHwfXsArKdDOQnxfW0NC4lz7ZCXX9TSmyFwGTIYzh1A/6pAT9gb6qL9Q88J+Z7K+MMyTnCeLDZKl8W7Ji6dytM8xbfDWa36I5qMK10JuXRBm1e7/8Inhu6HrtYLKmSS3N3wz39FdWiCfPD21/vbyOzAvDsNx7Vc0t8Cl7eTSzwIcqc7U7hEZZGuBfhs5/ChlLEaP0N5w==|920
+}//5IX/s2D/h6y0pVzNDwa+EKxO6K6n2BYEM19lkI04BsafKDTcczWb3z7rZXatlvLyOfyC90n2d/BBXM77ERdR48tbJTB3ydCEE9Qc0Fl2Jl+dnJrwm9Q/Qw1xVFCkLpzF1UUWUG4JJbAl1zc6ea6MT8QRJZbJG7Jg6HfDMywkAhei1SAC7sZxb8RYDayCL55NphHAagyy6vNJn8kg/dsvf5w4m/WnrrLSZhHaW3SkDtYmaV4XvdT9cCNLwE0tSsWkEnKE/TIVVlfngfU5uFS1tZLTjvIe/S+z4RJsCf2Fo0ReLXp8B+2l1kMoN3lNxts1g1T7Nwcj6G9190h6LExTg598r/0Ian5ThYV6fVC7MkTw6Q7FUJf1VfI16niYBs476XhtaAh4sxT9RrNRLKBcMwOtzW/AunPM4YogP/4sooFO+OWcd2lvh5kdE6/aVy00UeEzSE7iKHOsH05aa4Fr0ASTXevl+Tc5O3xO59sv0e5Ybt/KnDUpc1OQj4Ur99sgY5fW/Z4htz1q1NnEGv7lNVgWd6hiDQxRg8ovlNuzxUNawBMr2mnitcOXYsLdmNXKsn2ttyttPl9N8P7DD7zhyL71K//SZvhNIy44mJh5KNkty7SgkCeNEwk6XslMirZHzwBIOQX2MCQEyro2ArDlPLTTeKRsF9xmO/A2SgHLRDiRkfjjsWLr3Jbc3hn7/DrpAeKonQG3jd3+DRWZK8UD/sa0rXME93F4BKoBxeuufvk4/Vw8bahYEgH6j4pjQHY6gMLFk/AGaxk8nBJj1dsw1mkfr85aXRY51wF5yLiDdLINShfSYPOSXBsPTPmeqnXNtjP/EbfSbxT+i7jmeT+oI0YHx6K3qZ45svZHYkSmvoAjEC3U/4mdnDdZa0fR0d0ScVhpBYekUlbBBB3BVzu2nA==|920

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

@@ -9,6 +9,18 @@
     {
       "Name": "折叠任务说明",
       "Formula": "'任务-任务信息'!$S$14"
+    },
+    {
+      "Name": "版本",
+      "Formula": "'任务-任务信息'!$C$4"
+    },
+    {
+      "Name": "任务说明",
+      "Formula": "'任务-任务信息'!$C$7"
+    },
+    {
+      "Name": "备注",
+      "Formula": "'任务-任务信息'!$C$11"
     }
   ]
 }

Pages/任务/任务-侧栏.json

@@ -195,20 +195,6 @@
                 }
               },
               "ColumnName": "姓名"
-            },
-            {
-              "GUID": "09d394b8-34e9-43b9-82ea-1d3f283287c0",
-              "BindingInfo": {
-                "TableName": "任务成员表",
-                "ColumnName": "任务成员",
-                "GUID": "109ea711-92e6-4c26-a605-07189d7d4a7f",
-                "AttachType": {
-                  "$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess",
-                  "UserColumnAttachType": 5,
-                  "AttachTypeTag": "头像"
-                }
-              },
-              "ColumnName": "头像"
             }
           ],
           "IsListviewDataSource": true,
@@ -283,7 +269,7 @@
                     "ID": "ead92b1c9df1498883eaa4adeefb5174"
                   }
                 ],
-                "ID": "cb204e82-9920-486c-98ca-77f6d27efd80"
+                "ID": "3941c8f3-c8b2-422a-a6d1-b33850f8772f"
               },
               {
                 "Condition": {
@@ -315,7 +301,7 @@
                     "ID": "3b696050194144c7a51203d042e4e1cf"
                   }
                 ],
-                "ID": "a0d9aed6-c50e-46be-a324-403687d76279"
+                "ID": "f277ec41-8c8c-4d71-99bc-3972c6bd32d9"
               },
               {
                 "CommandList": [
@@ -325,7 +311,7 @@
                     "ID": "ebac52583bc449c5a4388b99e7f43d75"
                   }
                 ],
-                "ID": "8e5040ef-2f20-4cc1-b5b1-6b22b0dd741a"
+                "ID": "deb654cf-7f1c-414a-975d-778d91be778d"
               }
             ]
           }
@@ -614,7 +600,7 @@
                           }
                         }
                       ],
-                      "ID": "d0bf5ab5-37ca-449d-9ad2-3818b3effdbb"
+                      "ID": "ff866eb6-bf69-4699-9e05-8e4b28236115"
                     },
                     {
                       "CommandList": [
@@ -627,7 +613,7 @@
                           }
                         }
                       ],
-                      "ID": "b3fc66cc-2e5e-4290-93aa-e6fa795943f0"
+                      "ID": "aa79e416-8945-4fe7-861c-4cecf87073e9"
                     }
                   ]
                 }
@@ -755,4 +741,4 @@
       "Formula": "'任务-侧栏'!$B$9"
     }
   ]
-}//2UKclPEfaznPAYKpwE3fMdvjewZNOH+5i/OPCuwrjMSvSC2su2/kjk0/I9VF65esAewc+5rWCEj5RionJ5Cc4GW5qswuUlMDrKUhegGs5XcSmc0DA8miKFa7gdUiSi9cAMDebSnQeZAM1+I1ZQzR/VUIKFZPstLoe5+O2bHO8tvv2xX1i6L3fJxH6DVr2VmZSe+9zB+TMF8IYgC7/BVdlMeN3Xj2hKW16tkk1GCg+udZUhbClBZwd1BTvbhRi3Bdz9S0bkXxRenFX9dt+jOVjBb6pKc11AbHuPqGPvsLpbjmqjQ3a7Zs3TGZ6FtHAjs97KRwPoU7byY5ZZ+/ZumT9l/XSBP6S7Da7oR8TnPwfJ/Y8Ee4Ultr7V4A8DjAgW6MiKJ6z7sDbKrBcUqwKSN857WeltSVV1Td950+Rjye3cpTwDuoAJL/eWSBWwC2lVP7ipDdHMz5MdoGBUQecKjw8z2QtO4NtspBnkW8v9UrsOO2h3l0gBWvfOjods6ZIj+MmaGyXmsjGF7JxOr6DbUIMKEptoqdfDfiapTJKVKk02XYhNWn62hKQSNsfhrChm9FGqNaxXnAIg80TQuS6Cvwk77p674OM+tsoVGwRuSejn0UiVqJN1vXve/3LsL3r/EWhLuLOnaEGqEOMIMoEuYC6af6RwMYJVap6CMgmfnjd5K1luMa98aqr74Uzj3qOj8rDfXUFwt6Ng1wCWgdwfcmo7l2V1wVXLpv5wkgOhg+o2qmwRAzHRzE+u8/BBxhgAQyR4MSeucv+ZkTiaAM6yiZN+SYcBXmLd0VoMxPK+s86mrE83G+Blr27r0f4IbrUXF/1CseP1QaPyueM4S3Zq/lNlLGQw0BImoYxuBIZVNvjZFZqZultXsfTzVbZKS8ssKdEPpkyfhBg4y5Pzr7omPrXA==|920
+}//Fhpxne7d+jB3qYpukeoqK9blhmnq7iJeh+coKN81ZqJgvksgxbDZilWZovXbUAWy2isiwy+e5VhyvcIi2b87AVna8Puh0uGsPulpyuFCiGRiQArLFOebEWfPVx2HwRvDqCGPIqiNJn9aylwubh3zBDFWIaV+eYEWmXTal3yKoEmcTqtfLA77z7waNuW5KxUyRj6aZVq0D9z+ujIi6WDvlCuLoGlItj/lcQb+VEyfBODacSTdpKirIi4JxM/malQ/e+Qv38FlAQF8Ii9eALETMttGadrYjBJQs+RpvKCzFaOzwjQcGObVkGsNssa1En1Y6rn9oBuovxnFBnoIqxyCsevKeEAQbO+qW4HRrSpsZxbwtNLMIiOOyCgvkYpRJcLjI/43Maf0Pvu3sntYqgvvDA85YibF61Zm7uLjveA7gyXjqduycef7E+l+PCzO1Od8jciPRf50UDUz5qYz4+ldBYHkRFyMV1uTlPrp0v5x953REaCD0EpCTMWPd7vX13O53R1Fv5TPDLVZfGH0cUPUu7tqJIUvD8SnjnH4QlKZov7yjnjpQQuLyPKAdDybluabCY7tvjrB1eS0LctM/wDLa7wW+m7wmFh8/itzED8whUNty+RomrkOSytNeHiOOElBW++Msmtu/KSEc4QjEP1T/DJz9VznGzmsA2LytlyFwc/GWsjeEJXQPF29RAt1pfMSof/y+6aLwK0nWYSFFb8bOR4PUz+vm5QMSLkfMzyNb/HZEcT2tqvdB5ZNpMZLCaO027t1TZ60/30KYKVJaq8bfJtCDMgfHegbJloh8W8owZUJNRAxGgq7yRblkzXhA1UyIYwUm12elCaPgMo6PBfeuHMWt+Ip2EO5M//DW5FfcycxGnHHKBuCWITdvihfBG1uD0gJ6T5YTHOJqo0FIN+cMg==|920

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

@@ -1,19 +1,15 @@
 {
   "PageType": 0,
-  "ColumnCount": 20,
+  "ColumnCount": 21,
-  "RowCount": 16,
+  "RowCount": 14,
   "Formulas": {
-    "11,2": "C16&\",\"&J16",
+    "7,19": "L12-任务总计划工时",
-    "13,17": "C14-任务总计划工时"
+    "7,2": "项目ID"
   },
   "CustomNames": [
-    {
-      "Name": "状态变更回调",
-      "Formula": "'任务-基本信息'!$B$16"
-    },
     {
       "Name": "任务分组",
-      "Formula": "'任务-基本信息'!$K$10"
+      "Formula": "'任务-基本信息'!$L$6"
     },
     {
       "Name": "任务类型",
@@ -21,15 +17,31 @@
     },
     {
       "Name": "执行者",
-      "Formula": "'任务-基本信息'!$C$8"
-    },
-    {
-      "Name": "任务日期",
       "Formula": "'任务-基本信息'!$C$12"
     },
     {
       "Name": "任务名称",
       "Formula": "'任务-基本信息'!$B$2"
+    },
+    {
+      "Name": "父任务ID",
+      "Formula": "'任务-基本信息'!$L$8"
+    },
+    {
+      "Name": "里程碑",
+      "Formula": "'任务-基本信息'!$L$4"
+    },
+    {
+      "Name": "预算工时",
+      "Formula": "'任务-基本信息'!$L$12"
+    },
+    {
+      "Name": "开始日期",
+      "Formula": "'任务-基本信息'!$C$10"
+    },
+    {
+      "Name": "结束日期",
+      "Formula": "'任务-基本信息'!$L$10"
     }
   ]
 }

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

@@ -113,8 +113,7 @@
     "5,17": 1
   },
   "Formulas": {
-    "1,1": "\"子任务（\"&B6&\"）\"",
+    "1,1": "IFERROR(ODATA(\"子任务视图/$count?$filter=父任务ID eq \"&IF(ISBLANK(任务ID),\"null\",任务ID)),0)",
-    "5,1": "IFERROR(ODATA(\"子任务视图/$count?$filter=父任务ID eq \"&IF(ISBLANK(任务ID),\"null\",任务ID)),0)",
     "1,20": "IF(折叠子任务列表,上箭头,下箭头)"
   },
   "AttachInfos": {
@@ -153,98 +152,13 @@
         "$type": "Forguncy.ButtonCellType, ServerDesignerCommon",
         "CommandList": [
           {
-            "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
+            "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon",
-            "ConditionAndCommandPairList": [
+            "TargetPageElement": {
-              {
-                "Condition": {
-                  "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
-                  "param": {
-                    "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon",
-                    "tableData": {
-                      "TableName": "任务表",
-                      "ColumnName": "任务状态",
-                      "GUID": "d1f5930b-e3e2-439f-97c8-9e507d0b2042"
-                    }
-                  },
-                  "value": "2"
-                },
-                "CommandList": [
-                  {
-                    "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon",
-                    "PopupDisplayMode": 3,
-                    "DrawerDirection": 3,
-                    "ShowDrawerHeader": true,
-                    "PageName": "新增任务",
-                    "PassValues": [
-                      {
-                        "Source": {
               "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                          "SerializeProperty": "='任务-子任务列表'!项目ID"
+              "SerializeProperty": "='任务-子任务列表'!新增子任务"
             },
-                        "TargetCell": {
+            "TargetType": "Forguncy.ButtonCellType, ServerDesignerCommon, Version=10.0.3.0, Culture=neutral, PublicKeyToken=967100671921c115",
-                          "SerializeProperty": "=新增任务!项目ID"
+            "MethodName": "ExecuteCommand"
-                        }
-                      },
-                      {
-                        "Source": {
-                          "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                          "SerializeProperty": "='任务-子任务列表'!任务ID"
-                        },
-                        "TargetCell": {
-                          "SerializeProperty": "=新增任务!父任务ID"
-                        }
-                      },
-                      {
-                        "Source": {
-                          "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                          "SerializeProperty": "='任务-子任务列表'!C6"
-                        },
-                        "TargetCell": {
-                          "SerializeProperty": "=新增任务!任务类型"
-                        }
-                      },
-                      {
-                        "Source": {
-                          "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                          "SerializeProperty": "='任务-子任务列表'!F6"
-                        },
-                        "TargetCell": {
-                          "SerializeProperty": "=新增任务!任务分组"
-                        }
-                      },
-                      {
-                        "Source": {
-                          "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                          "SerializeProperty": "='任务-子任务列表'!I6"
-                        },
-                        "TargetCell": {
-                          "SerializeProperty": "=新增任务!任务版本"
-                        }
-                      },
-                      {
-                        "Source": {
-                          "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                          "SerializeProperty": "='任务-子任务列表'!L6"
-                        },
-                        "TargetCell": {
-                          "SerializeProperty": "=新增任务!任务负责人"
-                        }
-                      }
-                    ]
-                  }
-                ],
-                "ID": "27506fa9-b535-4ce2-9eac-76d6e89d98e5"
-              },
-              {
-                "CommandList": [
-                  {
-                    "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy",
-                    "Message": "当前任务状态不允许新增子任务"
-                  }
-                ],
-                "ID": "7168082e-8d57-470b-84d3-ad0374e8b467"
-              }
-            ]
           }
         ],
         "Text": "增加任务",
@@ -387,66 +301,9 @@
         "CommitDataWithCommand": true
       }
     },
-    "5,1": {
-      "CellType": {
-        "$type": "Forguncy.TextCellType, ServerDesignerCommon",
-        "SavedValidators": [
-          {
-            "$type": "Forguncy.CellTypes.Models.UniqueValidadator, ServerDesignerCommon"
-          }
-        ],
-        "TemplateKey": "_RS_NewLittleRoundCorner",
-        "CommandList": [
-          {
-            "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon",
-            "PropertyItemsList": [
-              {
-                "TargetCells": {
-                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                  "SerializeProperty": "='任务-子任务列表'!R6"
-                },
-                "Value": {
-                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                  "SerializeProperty": "='任务-子任务列表'!B6=0"
-                }
-              }
-            ]
-          }
-        ]
-      }
-    },
-    "5,2": {
-      "BindingInfo": {
-        "TableName": "任务表",
-        "ColumnName": "任务类型",
-        "GUID": "ee1c3188-0feb-48ef-af4c-cb8578612442"
-      }
-    },
-    "5,5": {
-      "BindingInfo": {
-        "TableName": "任务表",
-        "ColumnName": "分组ID",
-        "GUID": "cce18a0e-7b0b-400d-a597-5a36c988fc7d"
-      }
-    },
-    "5,8": {
-      "BindingInfo": {
-        "TableName": "任务表",
-        "ColumnName": "版本",
-        "GUID": "d0571e32-50d7-49c1-b141-ba07319d9844"
-      }
-    },
-    "5,11": {
-      "BindingInfo": {
-        "TableName": "任务表",
-        "ColumnName": "任务负责人",
-        "GUID": "32305352-99a9-4271-9300-9d6c8ee7fec6"
-      }
-    },
     "5,17": {
       "CellType": {
         "$type": "Forguncy.CheckBoxCellType, ServerDesignerCommon",
-        "Caption": "折叠",
         "Style": 1,
         "CommandList": [
           {
@@ -474,13 +331,14 @@
         "FontFamily": 0,
         "FontSize": 16.0,
         "Foreground": 1,
-        "HorizontalAlignment": 2
+        "Formatter": 2,
+        "HorizontalAlignment": 3
       },
       {
         "FontFamily": 0,
         "FontSize": 13.333333333333332,
-        "Foreground": 3,
+        "Foreground": 4,
-        "Formatter": 4
+        "Formatter": 5
       },
       {
         "FontFamily": 0,
@@ -489,16 +347,19 @@
       {
         "FontFamily": 0,
         "FontSize": 13.333333333333332,
-        "Foreground": 5,
+        "Foreground": 6,
-        "Formatter": 4,
+        "Formatter": 5,
-        "HorizontalAlignment": 6
+        "HorizontalAlignment": 7
       },
       {
-        "HorizontalAlignment": 6
+        "HorizontalAlignment": 7
       },
       {
-        "Formatter": 7,
+        "FontSize": -1.0,
-        "HorizontalAlignment": 6
+        "Foreground": null
+      },
+      {
+        "FontSize": -1.0
       },
       {
         "Foreground": 8
@@ -508,12 +369,12 @@
       "Strs": [
         "Body",
         "black",
+        "\"子任务(\"0\")\"",
         "Left",
         "Accent 1 0",
         "[AUTO]General",
         "Background 1 -25",
         "Center",
-        "@",
         "Text 1 50"
       ]
     },
@@ -548,17 +409,25 @@
       "4,19": 4,
       "4,20": 4,
       "5,1": 5,
-      "5,2": 4,
+      "5,2": 6,
-      "5,5": 4,
+      "5,3": 6,
-      "5,8": 4,
+      "5,4": 6,
-      "5,11": 4,
+      "5,5": 6,
+      "5,6": 6,
+      "5,7": 6,
+      "5,8": 6,
+      "5,9": 6,
+      "5,10": 6,
+      "5,11": 6,
+      "5,12": 6,
+      "5,13": 6,
       "5,14": 4,
       "5,16": 4,
       "5,17": 4,
       "5,20": 4
     },
     "ColStyles": {
-      "1": 6
+      "1": 7
     },
     "SheetStyle": {
       "FontFamily": 0,
@@ -567,13 +436,9 @@
   },
   "Spans": [
     "3,1,1,20",
-    "5,17,1,3",
-    "5,2,1,3",
-    "5,5,1,3",
-    "5,8,1,3",
-    "5,11,1,3",
     "1,17,1,3",
-    "5,14,1,2"
+    "5,14,1,2",
+    "5,17,1,3"
   ],
   "PageInfo": {
     "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
@@ -648,4 +513,4 @@
       "Formula": "'任务-子任务列表'!$R$6"
     }
   ]
-}//ugIm1VK2S1pPZmrliuje/w9teqq8VtVHohY8j4ZzXDYMI6hL8tHonMzS/niqJcw2H2KHJzo589rARmYs5/1l7+iHPuGZyBlZNw9BQqcF/3rzmEiKMnbIqDGIBr8+zH3E1qr0cBg3mh9TO+hWOInAybDU3X1O4eIsJCNKeXDV3KxTw7TgdtH+P1wTT/QbRJCFhFuNaelLpVHa/Fqr5nV3K7RTCoN9Kgd4RY6i/b7GWSM/Rhb9r46OSrKzMxViucmZkzHsK1usyV2DP3RyRkajKO+znUWFj0tBQKxdaW+8Yb69ax//x5KwRPVHK6ZuzPoLgT56XQmzNLzB3P1ipA4UuSaaTsI7v7/9p06GMVUn65Q5DBqd/jgvmDaz/JPFjZXllhVO50s45v1oSWqFliTlDSh23g8i6BewomCZyuJkZgORW/AOJzjGy1pFTP47iW0aDwVcm8bV3ibaYjUJow0eAS5KcfOQNiYcSDF7iHEFC7XqT0Z7T1i64hCnjSkG/30msre1wGPR4z5W3OX061no/YyT1KMqOpGxbACDrVwsoCNYkXNztVBZ4PC4ePdnPdy/z/Ne4P8LhTJO5mr+gQRlhSx988LOvuRT6OZ9WlLqB2Aun1LAjeKjWbiZ2/7AyGX6LIDmPSA1XMAKO1uMPxGAXt4c1oKbermTTtAFL6fvry76p5gqCD6mBoRLPO7N2wXFSlNs5RCNwH/unQIxAoeWvevwQ1Rjh7xB9wx2N1jtiwvNGUGs75MByPbHlnp0Wv2d7Ka/oBnoW/O9syeW6+HJNc3V8WGr8t4zCLuXU4iwuFV9kHqiuR0kVnMyq9+z5JOTAGy3N+8UIOMaVNHgFLoM0Opn3+lAnrvDzwH5qZ2tvdjW7e6eGUhkS1tB9R60Vos1NNl74ZwRNSEtiY9arrxsuA==|920
+}//xgcCRMGCJ4eqGvpjUDUFr0yr9dY3fbVU5bcjTRMEUcX9xEt7z7QLOyck7datPnmm/pd4cpavS1jFTMI6ik4ZAJEW3yRoU6Pk3qslMEbrEFsYSSGt+Iq3xTcflw2myQP6L5PFAtCgDyvpdDFSIsunMZM2WTikg4reJStbp3fF/73vAErlPn8HrNIqh/rYeLG2abFE4/ymsJ16MeAX+uaunhOxlI3rA5HNSptsCtvt5X9x7U2tlQCRPWwNfP+8chU83UIILQP8BkoB4vvUkFkr2NkXH13HiRyd5rdn6jyVr2dBCG0UT4tMSP+sQ2BMu5EqY1SWrmysgfu2km7FxmrwFQukZ1aEAmkMJWbx23mXt9o1aVEdh0oc+uObWkndi21KMwdx3TYIFC37pQSH1htNne+zYW4QbRJr4HuP5vSF/eFDOHw8En/TWgrXzU4O5ReW9Czr/vmMA35xHErxdXQzyueZ1zagZTL8J4jZiAlr0xkiixAYo6aYyJCK7y3C3iyyhicMnuOm+X1yQDU8+KWGFehcHGdSN2PawkOXASdmU8nN3gYEjEQaGCtdAxMxK7L06hpvlV4yQAvGJ1ZkswqCKn5aqh7Pbu1nNqcrNLB6ZTfbkWVTsp1mKSl7iEJUufJQTC82qNbNmxWWj2BP69CGrngOOM+FCjTWGme1YO22QZ9szotse7CxfBPV4Ewg3tyHJ4aZVS8i8iUrLtemgmDsgdjlczq2pDlEoP/ud6GfXPZ+FAmCJvQIEfqt2YcEjC4J01SR7xKVL1kpN+N75IXIAqERu4x7PTHQleCVKD/OZjtBfd/pGUFj8WgIvgRZR8pO62uxvkyQ/8W86uZrHr8doBuYMcrXIJjsT5yLbhq59UHhfLDOn6EewvDd8hpriXKiy+p5/IFsdOF+IjsbGEQb8g==|920

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

@@ -3,8 +3,7 @@
   "ColumnCount": 21,
   "RowCount": 6,
   "Formulas": {
-    "1,1": "\"子任务（\"&B6&\"）\"",
+    "1,1": "IFERROR(ODATA(\"子任务视图/$count?$filter=父任务ID eq \"&IF(ISBLANK(任务ID),\"null\",任务ID)),0)",
-    "5,1": "IFERROR(ODATA(\"子任务视图/$count?$filter=父任务ID eq \"&IF(ISBLANK(任务ID),\"null\",任务ID)),0)",
     "1,20": "IF(折叠子任务列表,上箭头,下箭头)"
   },
   "CustomNames": [

Pages/任务/任务审批/任务审批.rd

@@ -4,7 +4,7 @@
   "RowCount": 32,
   "Formulas": {
     "15,23": "父任务剩余工时",
-    "6,9": "项目是否开启反馈收集",
+    "13,14": "IF(父任务ID<>\"\",ODATA(\"任务表?$select=分组ID&$filter=ID eq \"&IF(ISBLANK(父任务ID),\"null\",父任务ID)),\"\")",
     "10,1": "B8"
   },
   "CustomNames": [
@@ -67,6 +67,10 @@
     {
       "Name": "备注",
       "Formula": "任务审批!$B$28"
+    },
+    {
+      "Name": "流程实例ID",
+      "Formula": "任务审批!$E$31"
     }
   ]
 }

Pages/任务/任务部分.json

@@ -25,21 +25,18 @@
       },
       "4": {
         "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 5.0,
+          "DesignLengthInPixel": 5.0
-          "IsHidden": true
         }
       },
       "5": {
         "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 5.0,
+          "DesignLengthInPixel": 5.0
-          "IsHidden": true
         }
       },
       "6": {
         "GridRowColumnDefinition": {
           "DesignLengthInPixel": 52.0,
-          "Mode": 1,
+          "Mode": 1
-          "IsHidden": true
         }
       },
       "7": {
@@ -105,14 +102,28 @@
           "DesignLengthInPixel": 39.0,
           "Mode": 1
         }
+      },
+      "19": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 16.0
+        }
+      },
+      "20": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 39.0
+        }
+      },
+      "21": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 39.0
+        }
       }
     },
     "InLogicalVisibleIndexes": [
-      4,
+      20,
-      5,
+      21
-      6
     ],
-    "Count": 19,
+    "Count": 22,
     "DefaultSize": 5.0
   },
   "Cols": {
@@ -240,7 +251,8 @@
     "9,0": "任务-关联资源",
     "12,0": "任务-工时",
     "15,0": "任务-进展",
-    "18,0": "任务-反馈"
+    "18,0": "任务-反馈",
+    "20,1": "新增子任务"
   },
   "AttachInfos": {
     "0,0": {
@@ -284,6 +296,271 @@
         "$type": "Forguncy.ContentContainerCellType, ServerDesignerCommon",
         "PageName": "任务-反馈"
       }
+    },
+    "20,1": {
+      "CellType": {
+        "$type": "Forguncy.ButtonCellType, ServerDesignerCommon",
+        "CommandList": [
+          {
+            "$type": "Notiflix_Forguncy.Block_Command, Notiflix_Forguncy",
+            "Cell": {
+              "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+              "SerializeProperty": "=任务部分!任务信息容器"
+            },
+            "Title": "加载中"
+          },
+          {
+            "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
+            "ParameterName": "任务",
+            "TableValue": {
+              "TableName": "任务表",
+              "TableValueType": 1,
+              "BindingInfos": [
+                {
+                  "GUID": "28e06ebf-624e-41c2-9d46-0b3240ff9059",
+                  "BindingInfo": {
+                    "TableName": "任务表",
+                    "ColumnName": "ID",
+                    "GUID": "4294d8bd-d659-4b2e-ae44-ef6ebb993165"
+                  },
+                  "ColumnName": "ID"
+                },
+                {
+                  "GUID": "1ef5d725-e38a-44f6-a0cd-0f4dbf827ba4",
+                  "BindingInfo": {
+                    "TableName": "任务表",
+                    "ColumnName": "项目ID",
+                    "GUID": "43dc2159-4caa-4a6f-8bb3-845c8f464132"
+                  },
+                  "ColumnName": "项目ID"
+                },
+                {
+                  "GUID": "7ea4c906-4cba-4247-bba2-666e18eacfb5",
+                  "BindingInfo": {
+                    "TableName": "任务表",
+                    "ColumnName": "任务负责人",
+                    "GUID": "5653d413-4555-44da-bfb0-8cea79846aaa"
+                  },
+                  "ColumnName": "任务负责人"
+                },
+                {
+                  "GUID": "0389a574-48c1-407e-9eb9-663c1e024fdc",
+                  "BindingInfo": {
+                    "TableName": "任务表",
+                    "ColumnName": "任务类型",
+                    "GUID": "074bdc22-74e0-4f5b-b87a-53147ff306e3"
+                  },
+                  "ColumnName": "任务类型"
+                },
+                {
+                  "GUID": "9396aa35-1fc7-4153-8b23-f9ac73a93e98",
+                  "BindingInfo": {
+                    "TableName": "任务表",
+                    "ColumnName": "分组ID",
+                    "GUID": "41932d14-9dd1-4533-acfd-508d619c67a6"
+                  },
+                  "ColumnName": "分组ID"
+                },
+                {
+                  "GUID": "3a9a22e1-b044-40b3-99b3-2e54db7b85c5",
+                  "BindingInfo": {
+                    "TableName": "任务表",
+                    "ColumnName": "版本",
+                    "GUID": "b41153c1-a41c-4075-b530-0fbf4ab8f5ce"
+                  },
+                  "ColumnName": "版本"
+                }
+              ],
+              "SqlCondition": {
+                "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+                "ColumnBindingInfo": {
+                  "TableName": "任务表",
+                  "ColumnName": "ID",
+                  "GUID": "c4d71200-d926-4e57-95cf-737adf050399"
+                },
+                "Value": {
+                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                  "SerializeProperty": "=任务部分!任务ID"
+                }
+              },
+              "NullFormulaValueQueryPolicy": 0,
+              "TopCount": "1"
+            },
+            "ID": "39a835c6721f4587af0945467072bb6f"
+          },
+          {
+            "$type": "Forguncy.Model.ProcessStartCommand, ServerDesignerCommon",
+            "ProcessDefinitionResourceName": "新增任务流程",
+            "ProcessInstanceName": {
+              "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+              "SerializeProperty": "=\"项目[\"&任务部分!项目名称&\"]的新任务等待创建\""
+            },
+            "ReturnResultName": "发起流程结果"
+          },
+          {
+            "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
+            "ConditionAndCommandPairList": [
+              {
+                "Condition": {
+                  "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+                  "param": {
+                    "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon",
+                    "cellLocations": [
+                      {
+                        "SerializeProperty": "=任务部分!发起流程结果.ID"
+                      }
+                    ]
+                  },
+                  "value": "%Null%",
+                  "compareType": 1
+                },
+                "CommandList": [
+                  {
+                    "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
+                    "ConditionAndCommandPairList": [
+                      {
+                        "Condition": {
+                          "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+                          "param": {
+                            "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon",
+                            "cellLocations": [
+                              {
+                                "SerializeProperty": "=任务部分!发起流程结果.TaskExists"
+                              }
+                            ]
+                          },
+                          "value": "1"
+                        },
+                        "CommandList": [
+                          {
+                            "$type": "RemoveCurrentRowInfo.RemoveCurrentRowInfoCommand, RemoveCurrentRowInfo",
+                            "TableName": "任务表"
+                          },
+                          {
+                            "$type": "SetCurrentRowCommand.SetCurrentRowCommand, SetCurrentRowCommand",
+                            "CurrentRowInfo": {
+                              "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+                              "ColumnBindingInfo": {
+                                "TableName": "ACT_HI_PROCINST_View",
+                                "ColumnName": "ID_",
+                                "GUID": "7d524bc6-89c0-4911-89f0-99685f28adb2"
+                              },
+                              "Value": {
+                                "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                                "SerializeProperty": "=任务部分!发起流程结果.ID"
+                              }
+                            }
+                          },
+                          {
+                            "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon",
+                            "PropertyItemsList": [
+                              {
+                                "TargetCells": {
+                                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                                  "SerializeProperty": "=任务部分!项目ID"
+                                },
+                                "Value": {
+                                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                                  "SerializeProperty": "=任务部分!任务.项目ID"
+                                }
+                              },
+                              {
+                                "TargetCells": {
+                                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                                  "SerializeProperty": "=任务部分!父任务ID"
+                                },
+                                "Value": {
+                                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                                  "SerializeProperty": "=任务部分!任务.ID"
+                                }
+                              },
+                              {
+                                "TargetCells": {
+                                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                                  "SerializeProperty": "='任务-基本信息'!任务类型"
+                                },
+                                "Value": {
+                                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                                  "SerializeProperty": "=任务部分!任务.任务类型"
+                                }
+                              },
+                              {
+                                "TargetCells": {
+                                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                                  "SerializeProperty": "='任务-基本信息'!任务分组"
+                                },
+                                "Value": {
+                                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                                  "SerializeProperty": "=任务部分!任务.分组ID"
+                                }
+                              },
+                              {
+                                "TargetCells": {
+                                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                                  "SerializeProperty": "='任务-基本信息'!执行者"
+                                },
+                                "Value": {
+                                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                                  "SerializeProperty": "=任务部分!任务.任务负责人"
+                                }
+                              },
+                              {
+                                "TargetCells": {
+                                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                                  "SerializeProperty": "='任务-任务信息'!版本"
+                                },
+                                "Value": {
+                                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                                  "SerializeProperty": "=任务部分!任务.版本"
+                                }
+                              }
+                            ]
+                          },
+                          {
+                            "$type": "SetFocusCommand.SetFocusCommand, SetFocusCommand",
+                            "TargetCell": {
+                              "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                              "SerializeProperty": "=任务部分!任务名称"
+                            }
+                          }
+                        ],
+                        "ID": "7fc5a22f-5e1b-4c1b-9a13-e0199febf4e3"
+                      }
+                    ]
+                  }
+                ],
+                "ID": "d273ffc4-0fad-4ed4-aaf0-66b9ebb2ad44"
+              },
+              {
+                "CommandList": [
+                  {
+                    "$type": "Notiflix_Forguncy.Report_Command, Notiflix_Forguncy",
+                    "FunctionName": "warning",
+                    "Title": "温馨提示",
+                    "Message": {
+                      "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                      "SerializeProperty": "=任务部分!发起流程结果.ErrorMessage"
+                    },
+                    "BtnText": "知道了"
+                  }
+                ],
+                "ID": "15b25a07-8930-4ebd-beb5-b3bda13bc621"
+              }
+            ]
+          },
+          {
+            "$type": "Notiflix_Forguncy.Block_Command, Notiflix_Forguncy",
+            "FunctionName": "remove",
+            "Cell": {
+              "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+              "SerializeProperty": "=任务部分!任务信息容器"
+            },
+            "Title": "加载中"
+          }
+        ],
+        "Text": "新增子任务",
+        "TemplateKey": "_RS_Main1"
+      }
     }
   },
   "StyleDatas": {
@@ -312,6 +589,10 @@
       {
         "FontFamily": 0
       },
+      {
+        "FontFamily": 0,
+        "FontSize": 12.0
+      },
       {
         "Background": null
       }
@@ -684,12 +965,75 @@
       "18,17": 5,
       "18,18": 5,
       "18,19": 0,
-      "18,20": 0
+      "18,20": 0,
+      "19,0": 0,
+      "19,1": 0,
+      "19,2": 0,
+      "19,3": 0,
+      "19,4": 0,
+      "19,5": 0,
+      "19,6": 0,
+      "19,7": 0,
+      "19,8": 0,
+      "19,9": 0,
+      "19,10": 0,
+      "19,11": 0,
+      "19,12": 0,
+      "19,13": 0,
+      "19,14": 0,
+      "19,15": 0,
+      "19,16": 0,
+      "19,17": 0,
+      "19,18": 0,
+      "19,19": 0,
+      "19,20": 0,
+      "20,0": 0,
+      "20,1": 6,
+      "20,2": 5,
+      "20,3": 5,
+      "20,4": 0,
+      "20,5": 0,
+      "20,6": 0,
+      "20,7": 0,
+      "20,8": 0,
+      "20,9": 0,
+      "20,10": 0,
+      "20,11": 0,
+      "20,12": 0,
+      "20,13": 0,
+      "20,14": 0,
+      "20,15": 0,
+      "20,16": 0,
+      "20,17": 0,
+      "20,18": 0,
+      "20,19": 0,
+      "20,20": 0,
+      "21,0": 0,
+      "21,1": 0,
+      "21,2": 0,
+      "21,3": 0,
+      "21,4": 0,
+      "21,5": 0,
+      "21,6": 0,
+      "21,7": 0,
+      "21,8": 0,
+      "21,9": 0,
+      "21,10": 0,
+      "21,11": 0,
+      "21,12": 0,
+      "21,13": 0,
+      "21,14": 0,
+      "21,15": 0,
+      "21,16": 0,
+      "21,17": 0,
+      "21,18": 0,
+      "21,19": 0,
+      "21,20": 0
     },
     "RowStyles": {
-      "0": 6,
+      "0": 7,
-      "1": 6,
+      "1": 7,
-      "2": 6
+      "2": 7
     },
     "SheetStyle": {
       "FontFamily": 0
@@ -708,62 +1052,12 @@
     "10,13,1,7",
     "13,13,1,7",
     "18,0,1,20",
-    "16,13,1,7"
+    "16,13,1,7",
+    "20,1,1,3"
   ],
   "PageInfo": {
     "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
     "PageLoadedCommandList": [
-      {
-        "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
-        "ConditionAndCommandPairList": [
-          {
-            "Condition": {
-              "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
-              "param": {
-                "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon",
-                "tableData": {
-                  "TableName": "任务表",
-                  "ColumnName": "任务状态",
-                  "GUID": "9cfc198e-05b6-4e96-907d-504db33e9079"
-                }
-              },
-              "value": "2"
-            },
-            "CommandList": [
-              {
-                "$type": "Forguncy.Model.SetRowColumnLayoutCommand, ServerDesignerCommon",
-                "PropertyItemsList": [
-                  {
-                    "Location": {
-                      "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                      "SerializeProperty": "=任务部分!5:7"
-                    },
-                    "Value": true
-                  }
-                ]
-              }
-            ],
-            "ID": "4697109e-6c9c-4179-8376-36b1b99154a1"
-          },
-          {
-            "CommandList": [
-              {
-                "$type": "Forguncy.Model.SetRowColumnLayoutCommand, ServerDesignerCommon",
-                "PropertyItemsList": [
-                  {
-                    "Location": {
-                      "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                      "SerializeProperty": "=任务部分!5:7"
-                    },
-                    "Value": false
-                  }
-                ]
-              }
-            ],
-            "ID": "cfb64db2-78d5-4154-888b-91eb4f5be178"
-          }
-        ]
-      },
       {
         "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy",
         "FunctionName": "remove",
@@ -793,8 +1087,36 @@
   },
   "CustomNames": [
     {
-      "Name": "任务基本信息",
+      "Name": "任务信息板块",
       "Formula": "任务部分!$A$1"
+    },
+    {
+      "Name": "新增子任务",
+      "Formula": "任务部分!$B$21"
+    },
+    {
+      "Name": "子任务板块",
+      "Formula": "任务部分!$A$7"
+    },
+    {
+      "Name": "任务说明板块",
+      "Formula": "任务部分!$A$4"
+    },
+    {
+      "Name": "关联资源板块",
+      "Formula": "任务部分!$A$10"
+    },
+    {
+      "Name": "工时详情板块",
+      "Formula": "任务部分!$A$13"
+    },
+    {
+      "Name": "任务进展板块",
+      "Formula": "任务部分!$A$16"
+    },
+    {
+      "Name": "任务反馈板块",
+      "Formula": "任务部分!$A$19"
     }
   ]
-}//rL8W1m8lENUizVdfeeZcujpp4a8dNbfmgd8630fobvC4WjfmrsAioZzMaK+x6E2N2zQFD1xNjmA0eI6AqeclxXyxQJHGo3w9ieML6/L4Poq9MfLiDlBwqjAwN0Ttsc7Nhp711D2rFJq+26XpmFwqZNGyGnX94No5vRdPWTSxuFob3uHhhgPNEzWl/6IvXb5YdCYojS/DPZ+zoT14KBnaQguU7yKZEcva67EufWZFiyRWELPPIt963gpc37hmvmDhQgnmiqbs7GDzzTBjyjJyXuJeMjxuL1oLwQbQzesXvVcdlI4TKHggUKDJF1gMUR33C5MeIzpmOIxm0lcc9Nmrluc69hOWebTH4H+F3CcmEMSgrQ9ThV7X8k2JqfxnacBVNKcxIBgorb3lZUirWEy9cxUUJ1bNmZlsRBEsEBvFz6LARDXIDRqrEwIFbH64fy7Sog920AgPmVhmQB0FaCkqWUvTuHichdj0gD9kpaeDRrB+oTxRQVJyjVNU5+CdLdUe1wfiYFN5e/uhqLSoGzqCLtwmsvCU0Y8RSCaJhENB6Y7YVhaQLtokQtlaO2ezTTCm74VmOYROOgr29guYFZBR5NKGMESfCP5HPTTIQVNNYgiVQ29dwPgRfmv4FUQ20j97ceUCteBD4w3ifC9OZkTVuh5y2NdWr88bG3/4YtyJ8YEAHFSLSOdbUsOXOnXVAINteIPq7apVhHfm8bibi/7fzrB2S90zVsctayzFGuUDZLuNZmdMVkvOZNzUioTvk1ESLRs5qWbozxw6ArXDW/Yi94CwcuF1wjQAh0CVZaqXNpor/b3x3CqskRNOETyGrVKeh66ezEp7bbY0a9e+6F/LoJFsfHqbljKlNT/hE4jp6rRsRFM4xQHsDansRUqD7ReOWjAvVlf2tIrneH5z4rmI0A==|920
+}//Y7XGUOBVcbAKM0D/AthnpENQlTrJDiCKm70bm0cX4/VtRgQp9NB2faDsrnDCGcTEGqHmSOsztJnNBphDwmtERSa57+vykeGWniJuHX3fyiEwemJCG+OsrRwjVlNRZhDvK4LIgyNp6kKRLu0N6Gb+GCEYFxq+8OX6Fpb7LBO1f4hzTmh9ND92mgwPlkj2KqgZYxuYF4kBkgWuRfP7zt8YgCKy72m4bwm8r6qux4ci6MxNcKoamvBNRnr4CPVOQSIYeNtaQdQnlxmjguUI7cHqfa5tkJl847zgHZ3FbQAX5R2bO8lGFYZV+iVhjq4DSDVIwd6ERhvZ5VKvZJx2G9lEynWXTmumCru+L3qsURiAQuJgZLGHA5epSns0uSOmzpg9HdMglTzzJYIU4Fl1GCqkKHmD+K8z6hHxVcMmv+88xXS6orzfxe0aFHF6vAm9yqGGUm9xnpTL87Rl8HTTYs7TaDEzymwTFJqxC+77ZHlvBf4MB4Rouw+P3I1wiyqNCBFNIKZoVeKZO97C9LuZKN5phnrdmjAUNyOSaEPFCdz48WSgfkJkEONY+zdRDNBb8UobhcAhCJvaIAV7s0IA+skd33S1l6N77hwuI8nEpgT/m40iIDn8s4V2o0DzhDHY7jUdiaLiV4l3N4XFgXHRHdyQ/zE+T9O67seaCSqILHlMLS4dNg2hOHasY4iHDSAfUw8dXr9Gm8zChNd6Tp+T9IITfUq3no8H8okDxAlj86RcMexH0COdLFkoYXmixgM1JeTEvZERlCKjDFwz7vounXU8paxIHaj+yFi6NGtSQPy5AkZaOcyhWLeH2uLpVzeOEUbS2KjYhU5wlwtPozmu+heaoA5CPV/GekUIDXBVuvGe2tCGVEOO3roEcWLVw+T4jq0tGlw4JAr9yrBuwvXXUzhXMA==|920

Pages/任务/任务部分.rd

@@ -1,11 +1,39 @@
 {
   "PageType": 0,
   "ColumnCount": 21,
-  "RowCount": 19,
+  "RowCount": 22,
   "CustomNames": [
     {
-      "Name": "任务基本信息",
+      "Name": "任务信息板块",
       "Formula": "任务部分!$A$1"
+    },
+    {
+      "Name": "新增子任务",
+      "Formula": "任务部分!$B$21"
+    },
+    {
+      "Name": "子任务板块",
+      "Formula": "任务部分!$A$7"
+    },
+    {
+      "Name": "任务说明板块",
+      "Formula": "任务部分!$A$4"
+    },
+    {
+      "Name": "关联资源板块",
+      "Formula": "任务部分!$A$10"
+    },
+    {
+      "Name": "工时详情板块",
+      "Formula": "任务部分!$A$13"
+    },
+    {
+      "Name": "任务进展板块",
+      "Formula": "任务部分!$A$16"
+    },
+    {
+      "Name": "任务反馈板块",
+      "Formula": "任务部分!$A$19"
     }
   ]
 }

Pages/任务/任务首页.rd

@@ -1,14 +1,15 @@
 {
   "PageType": 0,
   "ColumnCount": 32,
-  "RowCount": 9,
+  "RowCount": 10,
   "Formulas": {
-    "1,27": "IF(收起侧栏,AB8,Z8)"
+    "1,27": "IF(收起侧栏,L10,K10)",
+    "3,30": "IF(任务状态码=2,\"任务-侧栏\",\"FGC_审批记录\")"
   },
   "CustomNames": [
     {
       "Name": "参与人数",
-      "Formula": "任务首页!$S$7"
+      "Formula": "任务首页!$R$8"
     },
     {
       "Name": "工时分配方式",
@@ -24,15 +25,15 @@
     },
     {
       "Name": "上箭头",
-      "Formula": "任务首页!$W$8"
+      "Formula": "任务首页!$N$10"
     },
     {
       "Name": "收起侧栏",
-      "Formula": "任务首页!$V$7"
+      "Formula": "任务首页!$E$10"
     },
     {
       "Name": "下箭头",
-      "Formula": "任务首页!$V$8"
+      "Formula": "任务首页!$M$10"
     },
     {
       "Name": "项目ID",
@@ -40,15 +41,27 @@
     },
     {
       "Name": "折叠全部",
-      "Formula": "任务首页!$Z$7"
+      "Formula": "任务首页!$H$10"
     },
     {
       "Name": "刷新任务",
-      "Formula": "任务首页!$X$8"
+      "Formula": "任务首页!$B$10"
     },
     {
-      "Name": "流程ID",
+      "Name": "流程实例ID",
-      "Formula": "任务首页!$S$8"
+      "Formula": "任务首页!$R$7"
+    },
+    {
+      "Name": "项目名称",
+      "Formula": "任务首页!$E$9"
+    },
+    {
+      "Name": "任务状态码",
+      "Formula": "任务首页!$R$9"
+    },
+    {
+      "Name": "任务信息容器",
+      "Formula": "任务首页!$A$5"
     }
   ]
 }

Pages/项目/项目流程页面/项目审批.json

@@ -305,17 +305,17 @@
     "6,1": "项目经理：",
     "6,5": "%CurrentUser.UserName%",
     "6,12": "项目分组：",
-    "6,23": "严格模式：",
+    "6,23": "管理模式：",
     "6,27": false,
     "8,1": "客户名称：",
     "8,12": "客户部门：",
     "8,23": "客户联系人：",
-    "10,1": "预算工时：",
+    "10,1": "预算工时(小时)：",
-    "10,12": "预算费用：",
+    "10,12": "预算费用(元)：",
     "10,23": "工时分配方式：",
     "12,1": "计划开始日期：",
     "12,12": "计划完成日期：",
-    "12,23": "计划工期：",
+    "12,23": "计划工期(天)：",
     "12,27": "=DATEDIF(F12,Q12)",
     "14,1": "项目方案：",
     "17,1": "预算方案："
@@ -408,6 +408,7 @@
           }
         ],
         "type": "text",
+        "placeholder": "项目名称",
         "resize": "none"
       }
     },
@@ -427,21 +428,6 @@
                 "Condition": {
                   "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess",
                   "SubConditions": [
-                    {
-                      "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess",
-                      "SubConditions": [
-                        {
-                          "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
-                          "param": {
-                            "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon",
-                            "tableData": {
-                              "TableName": "项目表",
-                              "ColumnName": "ID",
-                              "GUID": "07985b86-59b9-432c-ad29-7de8c9c06283"
-                            }
-                          },
-                          "value": "%Null%"
-                        },
                     {
                       "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
                       "param": {
@@ -453,9 +439,6 @@
                         ]
                       },
                       "value": "创建项目"
-                        }
-                      ],
-                      "RelationType": 1
                     },
                     {
                       "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
@@ -532,12 +515,38 @@
                             "$type": "Forguncy.Model.StopCommand, ServerDesignerCommon"
                           }
                         ],
-                        "ID": "76b2d2d9-37ec-4804-9638-6f1bb1233425"
+                        "ID": "1649ece3-faeb-4e55-807d-9cd4aad6e861"
                       }
                     ]
                   }
                 ],
-                "ID": "ea12726d-cf72-47a0-bc50-d0be126331ee"
+                "ID": "bdacaec8-cd8f-4f4a-8b43-7ef3b5f564eb"
+              },
+              {
+                "Condition": {
+                  "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+                  "param": {
+                    "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon",
+                    "cellLocations": [
+                      {
+                        "SerializeProperty": "=Action.Name"
+                      }
+                    ]
+                  },
+                  "value": "暂存"
+                },
+                "CommandList": [
+                  {
+                    "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon",
+                    "TargetPageElement": {
+                      "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                      "SerializeProperty": "=项目审批!V2"
+                    },
+                    "TargetType": "Forguncy.ProcessPanelCellType, ServerDesignerCommon, Version=10.0.3.0, Culture=neutral, PublicKeyToken=967100671921c115",
+                    "MethodName": "Refresh"
+                  }
+                ],
+                "ID": "b93ad683-ee8c-4358-b742-eb4d809188d0"
               }
             ]
           }
@@ -641,6 +650,7 @@
           }
         ],
         "type": "text",
+        "placeholder": "项目描述...",
         "resize": "none"
       }
     },
@@ -1034,7 +1044,8 @@
         ],
         "type": "text",
         "resize": "none",
-        "ReadOnly": true
+        "ReadOnly": true,
+        "IsDisabled": true
       }
     },
     "10,5": {
@@ -1900,6 +1911,7 @@
   ],
   "PageInfo": {
     "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
+    "Title": "立项",
     "PermissionData": {
       "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionData, Forguncy.RbacPermission.Core",
       "permissionResource": {
@@ -1928,4 +1940,4 @@
       "Formula": "项目审批!$I$21"
     }
   ]
-}//w/uTApDVqi2Oa7iME23ocnPHYzx0S/Fjit62yPdM1Y7WMIc3QZx7jsz4h/7LuFHUlSgzucZkbMZYs3lY9s2Sfu2DKY++vn0+5AMhxE8DKQMf4/X8ux75p0e2ESj8fGCiZPH0XB42A404Xq4X9IlyrGRazndL+Gubq7EXa8wQaDmzHHjopwWyGPKUfXdb6hu4NbmI6jmybRIODIIPt6tKJnA+r0WFNqWQrK0z204x98O8En3k0F2PIGEZrWMQvJmKnGQvVwN70kF7wSuW+I1z4UaeXF3g3i2STA+cOhicsylHZGGprPTkfcz4oS6Tw2fE9CLxmFqt6Y0ZOuJTm4gDmGz0OMCjWQwCfQDAy2CMmpZ6O5FWiAu9kSAw3jhVOpj5E+xMIfGKDbzmC8EUd/S9rxrXHCbTBmJ8P/QeA1APxT3JpGPLEJrtgmzeuoqJyJn6SFBFmJoe6AAMqYxg7oqF4txLKrUbp2eZ6sYYhZMN085w9g8crHvQR4f7cer0Xqvo62I1KJpSvCKd271Gx+mfEfhYpgsu7I9w6x6Ub+AB0cdXo03a1ExXwbG+1BCmZtSl/DX/XTh3yUJ7sL83MT7CEkY/vHFHGsEumBmI09sIOGg51hAAS8z1VfmtAZ6/QybH7jB+eegQIRAaYeexVhK3cGrIWfVL8Di+kyfVUlDavEdNQMX/jjMUk1o9n1qE6h1k0lILftrj+uENBdUdf45xbcm9aWhr/QmYaJmPkYU/JAEl13TdSRsp9jpqpiGsx3MImvSud114jOScxFnjNgf470KDh8AuyLsa7Md8Jcn7T07Fo8E0fO8sP6VU6RgzRkaz33VJ/RV+EuZQhiTqlLj0iP8u2mOEOW0c+eHNPokXQS6Qb2cXHGI/8k1PDPl8JKqEgEXjjUGBG6Pft+C9iE1hlg==|920
+}//9V5QVHf1EYXxhPFznlYkLWQVUIsuUps8PK34bYo1hiI4D85VLmYrxI+XFWxNT1P9uOqCAXRAhOd8AqVCHNPyjAuTnQ17K1ejj1OOa+ZCz76l4ZMqwOd2BqU0QjSasUSfW9vBUhQJPx0KhtVSPcvxmpX4hrU9bKJu15mWd4uchAi/9HBWz41h84qg2sltlrYSQ3AM4iXAD6uSAJoQLQ6KtP7Hh0dqZX+YSL87ijhmrbRzXHSBcGdBar5L1DonUVI1RJAu5zYKDZ+e8kVY+7YHL30Wt3uSgU6uZQNUTLUwiPnYTwcRbirK47dyetWgayLehsxxOnFNhbHS1arI/9/WvftCpxVf5OBH/pyeTZ9yzM0UadShoQIm3NAaJ4Aq9EGe/YHBizXOHb3RmVmVEBrK0lrCQ+YfCAbQPdSOgh7n4zBEKxRhYbSCtNmMR3Z+apTsEC+3vl0x5bG+35/JGrR/LS6D4lkfsFoWNsZK9nGvuqdEx0pM4Uj/NeTwvqi5hNt+f8O8DNhHajxmlsjYaHq6RbSOXh/r/3XjvzXJJv6pCX2u4Xw4ZpfWjnWGxTBdNSwOsFCM+Xu3FfVjGN1eV74HNReTB61aCcFJcn430dq2QcmHMQZ2Imb9PuoTREw/h5q5sIpkkqC9cO8Hj2MUv3zO06TIHd7MS7rRQ+O1SkcmaDeD9DQ/hQrmE1Zzcz8CZluVZQBxcxbZTBvJtD0YNmiFaAJgo2tQQUQwnGLBcbm11HyL2zE8ndC2pAODy4QLyo50dV5bL7krg+crxVF/f/G06AcKDcgKpAopJ+CMh5i32tUFWikYofq/AX2vwl/SREciiapJTbi0Z4IYXH6+MHuPXuwZmKG5+jrJ2vAyHghK6hEBXPTTmb13kr2GxyTf1qR6xbk0NjBlofRK9VQZt9R/Pg==|920

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

@@ -495,7 +495,7 @@
                     "LoadBindingDataOption": 1
                   }
                 ],
-                "ID": "e773542e-10b3-4ced-b89d-8821113d9667"
+                "ID": "ea072306-af79-49d0-b829-e11cc3f69e5d"
               },
               {
                 "Condition": {
@@ -529,7 +529,7 @@
                     ]
                   }
                 ],
-                "ID": "a9be571c-8f3a-4c1e-8206-cf7495a80969"
+                "ID": "05992dab-e806-4678-b0f9-7b289d9ff745"
               },
               {
                 "CommandList": [
@@ -579,6 +579,24 @@
                                 "CommandList": [
                                   {
                                     "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon",
+                                    "PopupDisplayMode": 4,
+                                    "ShowDrawerHeader": true,
+                                    "ClosePopupCallbackCommand": {
+                                      "Commands": [
+                                        {
+                                          "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon",
+                                          "TargetPageElement": {
+                                            "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                                            "SerializeProperty": "=任务列表!K6"
+                                          },
+                                          "TargetType": "ElementUI.VirtualizedTableCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560",
+                                          "MethodName": "ResetTable"
+                                        }
+                                      ],
+                                      "ParamProperties": {
+                                        "IsOK": "是否为确定"
+                                      }
+                                    },
                                     "ValueFormula": {
                                       "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
                                       "SerializeProperty": "=任务列表!发起流程结果.Page"
@@ -590,16 +608,24 @@
                                           "SerializeProperty": "=任务列表!项目ID"
                                         },
                                         "CellName": "=项目ID"
+                                      },
+                                      {
+                                        "Source": {
+                                          "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                                          "SerializeProperty": "=任务列表!发起流程结果.ID"
+                                        },
+                                        "CellName": "流程实例ID"
+                                      }
+                                    ],
+                                    "LoadBindingDataOption": 2
+                                  }
+                                ],
+                                "ID": "6c4d6215-0a81-406c-b411-d287a01361aa"
                               }
                             ]
                           }
                         ],
-                                "ID": "7f376a57-e3a7-49a5-8e3b-e56e421035d4"
+                        "ID": "ad8175d3-3608-4f75-9c7a-a5ed7b5785d7"
-                              }
-                            ]
-                          }
-                        ],
-                        "ID": "4c2bfc01-ca4a-43fa-bfc5-7b01b5128b59"
                       },
                       {
                         "CommandList": [
@@ -614,12 +640,12 @@
                             "BtnText": "知道了"
                           }
                         ],
-                        "ID": "2d19ec24-ce10-4515-b79e-31982159a8ab"
+                        "ID": "ed264fc5-090b-4596-abcf-bad2a95a8917"
                       }
                     ]
                   }
                 ],
-                "ID": "e9aa3ed9-727e-4398-97c8-409bb661218d"
+                "ID": "10d31287-9011-4698-b974-ccb9fcc30d63"
               }
             ]
           }
@@ -786,7 +812,13 @@
                     "SerializeProperty": "=任务列表!行数据.value"
                   }
                 }
-              ]
+              ],
+              "ResultErrorCodeTo": {
+                "SerializeProperty": "code"
+              },
+              "ResultMessageTo": {
+                "SerializeProperty": "msg"
+              }
             }
           ],
           "ParamProperties": {
@@ -798,9 +830,10 @@
             "执行者4": "行数据.执行者",
             "开始时间5": "行数据.开始时间",
             "结束时间6": "行数据.结束时间",
-            "总计划工时7": "行数据.总计划工时",
+            "任务预算工时7": "行数据.任务预算工时",
-            "总实际工时8": "行数据.总实际工时",
+            "成员计划工时8": "行数据.成员计划工时",
-            "参与人数9": "行数据.参与人数"
+            "成员实际工时9": "行数据.成员实际工时",
+            "成员数量10": "行数据.成员数量"
           }
         },
         "DataType": "treeTable",
@@ -1599,6 +1632,10 @@
     {
       "Name": "当前分组",
       "Formula": "任务列表!$B$13"
+    },
+    {
+      "Name": "任务EL表格",
+      "Formula": "任务列表!$K$6"
     }
   ]
-}//F6Otkx6I5oJ+KLWZElZWr/EMk9wcek0oLKVJXUxKi+G09TXQosXw9vgDaXtnpqOp7FTYehplY6TQApFVGJI8qhSotYy/tLjySq7i4IKrU05Izoya9tCbsPVvmphLUpczXq2vRBxsiiXSPxonAqp3cAI1OMNzLkEvORRnWNj771VwNYK4N6PB8fho3Sx/erTvBui7+IxFKkxh3FPN7U7H2xRrj5bBgSxzH4ftTRGHXisAFIlzY3SzCfuuD4bUgtS+zgMZ6rQ4DO1Rrts6a0irOgMBfdtf9l0y7D3NIppawuVeY+RymfYGeaYBeSuFvBTyL+WFboIm0bphYVaM1NLNuPZkUwXox0ZPA+gBpS7+W6YtSs5i1BIXIx6cvleHX4oPXr9QwHdAZeKo5M8MMNkJfZqQ6lgBJmVVHzcBTRRNYVbTLBK1LaOwsbp+kmYXmYdEgqnqmHwXGBxaIp35LoIpokCVNwB6dyy5uJqYTYQPUjwJez2eNhUiZ9dsRD/aYGtHCkAzQTzAut2RmmmCWLr+Ncb1IFEIlI92l7U1Q7F1L1cFA7UoadokjwzCRwEFzgEzLBe8WcxAdQ+u5uEM7QKKuOGb0Fg25SKLMEe6deySIxQ7eXfDQkB8G0KbHwuXqjYewCLZgByrDg6Psofsnu+kS8RsDlIFCohPV8nBR9t5dHUOrBxqw+hj/eatPnKSdmYYJ6HzYtQ/KsS+L0wcSy2MSGPIEgvCnJ1a0/zhh1LSfXrV6wj1xEWk2bVpQq285nPcIuAZxU2J+cEHkhzJ5XrnTep/t9wVA5R2gRUz1SnyghnniYw4FQ9wp/crpNPWPG4PUiflhYjGgqF9mQ8RYPREOUnLDrEGxbsQVMNiSQrHdSnI8WSqy1vIfxj/EBjghSwFk1zuEBthD+arm3EfArFt5g==|920
+}//kV73BZCx4FEq3+p/xnEY/NYMR9F6XY9sy3AInLr2YCKUfHsXpcK42YRL/JQJxGT6DEKZHyrkmgdHBc5OCa25RqBmybvINIF+Y9RTE0S4zTmUmnSHsCmwQyNRVAqA+HwZKqaq/nC2PjYXGizQxcGbCTGjHXRACYj531fU2BbXRWm0pzMKMOZngoV70jI2nIbCS4YEtkSnHHI/3uBA574OCZ8hl/5gy/bQ+0Y4eLCzNj/Z8p4LDCC5PuXfIq51WS2Q85cXvzg00/uk4h15w0EwDJrdztwN7/fc3N2wrfZWTc6d+D/c1377VUsatk0hsRnT/jfh3qVUnGcz29/q0uzjMpTnam2hY5P3ZU3t6zFB8E+za4GhqFsRt8JmHoD/hl/X7xWoizDBeT4cdxUd37QejKH3+Z6p69HqVrSSYQMBAF6dWN6rGRuvHLJwbwC48MQdzq9e6e2g1XXwyeKMFGOnNOuAalxvzZDszHvvTLQrhTy+TTVsMiIDJfylDOsNcJFuYvYbO1bsQOwx8pYY41FPA715OkqdInS0WT6L23EcIVmhhLl7qmIjJpz0Xv2AEqdMMChYtmmVk8N8u27l/6XZYOUCHwNa188GBxZObFMIBtNeGoQvfyMtyhNUI5nGmhmxnrF2YTPNmrGxzdrkfMyRF1noPUWDkyfGh/rXBJG7kSSuNEPwLidAd6RRquo8KCtvXSRMyLsYINmSNZTmcs/yNQDgx1FxRdOJiZ/Vm5t5UOoDpICIFMhe1lVVWiE7EEHa0xP982U4bAjqKfXZRhxxY0XJnZLswUQds5N91tCG6U361PlvhhMaJZXQeZYSCdQBsYrbRf1lZCCpH+cLiAtQAdwfGmT7bAHnHNtcqN8AzO4cYcQmSKrOxTwj1dZBC7ePrNWiVAevB0BqSHdHSfzWpA==|920

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

@@ -10,6 +10,10 @@
     {
       "Name": "当前分组",
       "Formula": "任务列表!$B$13"
+    },
+    {
+      "Name": "任务EL表格",
+      "Formula": "任务列表!$K$6"
     }
   ]
 }

SchedulerTasks/任务表新增事件.json

@@ -0,0 +1,52 @@
+{
+  "Name": "任务表新增事件",
+  "Enabled": true,
+  "Triggers": [
+    {
+      "$type": "Forguncy.SaveLoad.EndDBInsertTriggerSaveData, ServerDesignerCommon",
+      "DataParamName": "变更数据",
+      "TableNameParamName": "数据表名",
+      "PrimaryKeyParamName": "主键",
+      "OperatorParamName": "操作人",
+      "OperationTimeParamName": "操作时间",
+      "SelectTables": [
+        "任务表"
+      ]
+    }
+  ],
+  "Commands": [
+    {
+      "$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": {
+        "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+        "SerializeProperty": "=code"
+      },
+      "Message": {
+        "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+        "SerializeProperty": "=msg"
+      }
+    }
+  ]
+}

ServerCommands/任务/任务发起流程前校验.json

@@ -43,7 +43,7 @@
               "TableValueType": 1,
               "BindingInfos": [
                 {
-                  "GUID": "0c58d519-5722-4971-b425-4dd9cde10693",
+                  "GUID": "ba455dea-c603-4f25-85ad-acf820a7e0c0",
                   "BindingInfo": {
                     "TableName": "任务表",
                     "ColumnName": "项目ID",
@@ -52,7 +52,7 @@
                   "ColumnName": "项目ID"
                 },
                 {
-                  "GUID": "c27895d0-8cfc-4b48-bf35-974a06bf7bda",
+                  "GUID": "900d46b7-3532-4567-91cb-57aca96a546e",
                   "BindingInfo": {
                     "TableName": "任务表",
                     "ColumnName": "父任务ID",
@@ -61,7 +61,21 @@
                   "ColumnName": "父任务ID"
                 },
                 {
-                  "GUID": "ba805a37-b202-475f-8213-572c32498c28",
+                  "GUID": "d73e44fd-2e43-4116-b585-333ca2562fc6",
+                  "BindingInfo": {
+                    "TableName": "任务表",
+                    "ColumnName": "父任务ID",
+                    "GUID": "7471e7c8-3650-42a7-b438-3a775347aef8",
+                    "RelationBinding": {
+                      "RelatedTable": "任务表",
+                      "RelatedColumn": "ID",
+                      "DisplayColumn": "任务状态"
+                    }
+                  },
+                  "ColumnName": "父任务任务状态"
+                },
+                {
+                  "GUID": "da8b6abf-5d57-46f6-874a-3fc3147afcd7",
                   "BindingInfo": {
                     "TableName": "任务表",
                     "ColumnName": "项目ID",
@@ -80,7 +94,7 @@
                   "ColumnName": "项目预算工时"
                 },
                 {
-                  "GUID": "8f962fdb-572f-41f3-b839-82289968e80e",
+                  "GUID": "e74e3554-e9ed-45bd-b47c-1f1d33211bd3",
                   "BindingInfo": {
                     "TableName": "任务表",
                     "ColumnName": "项目ID",
@@ -99,7 +113,7 @@
                   "ColumnName": "已分配任务工时"
                 },
                 {
-                  "GUID": "b1571501-4565-433c-bd5a-dd2d15732b81",
+                  "GUID": "818c62b8-cdcd-46ea-8ea9-ae9858011d1b",
                   "BindingInfo": {
                     "TableName": "任务表",
                     "ColumnName": "项目ID",
@@ -113,7 +127,7 @@
                   "ColumnName": "项目经理"
                 },
                 {
-                  "GUID": "04346963-ece3-4343-aa49-00a623085c56",
+                  "GUID": "2f826e88-d8ea-4d6d-84ae-9ed11f948656",
                   "BindingInfo": {
                     "TableName": "任务表",
                     "ColumnName": "项目ID",
@@ -127,7 +141,7 @@
                   "ColumnName": "工时分配方式"
                 },
                 {
-                  "GUID": "8373b1a5-4f1d-4430-9e6e-48bafa5fc9f2",
+                  "GUID": "931496b5-6162-4e8c-890a-14c022b7b92a",
                   "BindingInfo": {
                     "TableName": "任务表",
                     "ColumnName": "任务预算工时",
@@ -136,7 +150,7 @@
                   "ColumnName": "任务预算工时"
                 },
                 {
-                  "GUID": "d510731a-043f-4ac8-87a5-d01b59525866",
+                  "GUID": "b325857a-1e57-4233-93d0-78ca004b9f8a",
                   "BindingInfo": {
                     "TableName": "任务表",
                     "ColumnName": "项目ID",
@@ -150,7 +164,7 @@
                   "ColumnName": "严格模式"
                 },
                 {
-                  "GUID": "7d9ce8af-1f30-408c-88b7-625e862d65a9",
+                  "GUID": "ad0b06ae-6b5e-4d6f-9a57-5c2918c2cf04",
                   "BindingInfo": {
                     "TableName": "任务表",
                     "ColumnName": "任务负责人",
@@ -159,7 +173,7 @@
                   "ColumnName": "执行者"
                 },
                 {
-                  "GUID": "8938b87e-a377-46f6-9c37-87274a3aaab1",
+                  "GUID": "a0d5f139-812d-4bea-9a3f-cc0ee388f3dc",
                   "BindingInfo": {
                     "TableName": "任务表",
                     "ColumnName": "任务类型",
@@ -168,7 +182,7 @@
                   "ColumnName": "任务类型"
                 },
                 {
-                  "GUID": "b5514c64-6496-44d5-abdc-971db1e10b77",
+                  "GUID": "64cb157e-5ff8-41b9-a1cc-eabdd1e74f85",
                   "BindingInfo": {
                     "TableName": "任务表",
                     "ColumnName": "版本",
@@ -177,7 +191,7 @@
                   "ColumnName": "版本"
                 },
                 {
-                  "GUID": "eb4b96b1-7064-4679-b72d-bdf2268020db",
+                  "GUID": "c52c4d94-9d70-4366-a948-2799e4043614",
                   "BindingInfo": {
                     "TableName": "任务表",
                     "ColumnName": "任务状态",
@@ -201,7 +215,34 @@
               "NullFormulaValueQueryPolicy": 0,
               "TopCount": "1"
             },
-            "ID": "44a682b6e37b4e54bdb53729203bff36"
+            "ID": "05732b16f68a40aea1411edf257a1a75"
+          },
+          {
+            "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
+            "ConditionAndCommandPairList": [
+              {
+                "Condition": {
+                  "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+                  "param": {
+                    "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon",
+                    "ParamObject": {
+                      "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                      "SerializeProperty": "=任务信息.父任务任务状态"
+                    }
+                  },
+                  "value": "2",
+                  "compareType": 1
+                },
+                "CommandList": [
+                  {
+                    "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon",
+                    "ErrorCode": "400",
+                    "Message": "请等待父任务审批后方可发起！"
+                  }
+                ],
+                "ID": "0ffd4993-3dcd-4726-bd66-951c44d1ce9d"
+              }
+            ]
           },
           {
             "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
@@ -225,7 +266,7 @@
                     "Message": "当前项目未指定项目经理，请指定后再试"
                   }
                 ],
-                "ID": "62329720-a822-4cca-99e2-a2444ca1f95e"
+                "ID": "03745930-4d16-4d69-9c87-a81e35683b88"
               }
             ]
           },
@@ -251,7 +292,7 @@
                     "Message": "请指定任务执行者"
                   }
                 ],
-                "ID": "2475b524-68de-4f7e-b688-2b9687af5b22"
+                "ID": "e244e7d0-6f12-499f-bac0-3e6e3adee3d9"
               }
             ]
           },
@@ -277,7 +318,7 @@
                     "Message": "请指定任务类型"
                   }
                 ],
-                "ID": "f51663db-7687-44bb-9f3b-1cce2682d013"
+                "ID": "1c3d6abb-4f24-4101-8804-9d9f17fcd996"
               }
             ]
           },
@@ -303,7 +344,7 @@
                     "Message": "请为任务指定版本"
                   }
                 ],
-                "ID": "8eab7c16-ea96-4d8d-b9e0-07546d7b5504"
+                "ID": "81e2f52f-7bca-4c27-9a80-e4a9b7a4df10"
               }
             ]
           },
@@ -346,16 +387,10 @@
                               "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
                               "SerializeProperty": "=任务信息.项目预算工时-任务信息.已分配任务工时"
                             },
-                            "ID": "c115c6615384449597ebf4a85443befa"
+                            "ID": "f067411d74064d7b94eaa375d9410597"
-                          },
-                          {
-                            "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
-                            "ParameterName": "层级",
-                            "ParameterValue": "1",
-                            "ID": "8f419b6c4a3f4fb5bcf81a653a34fefc"
                           }
                         ],
-                        "ID": "5c733c8d-ac2b-4705-933a-d789b7385dd6"
+                        "ID": "42b18717-7bb8-4288-96d3-22c208d5ce83"
                       },
                       {
                         "CommandList": [
@@ -367,7 +402,7 @@
                               "TableValueType": 1,
                               "BindingInfos": [
                                 {
-                                  "GUID": "5d2a5ccc-6b93-49a8-b231-a1864b3f684c",
+                                  "GUID": "8468e5ee-2d0c-4653-b414-2845ded5b828",
                                   "BindingInfo": {
                                     "TableName": "任务平行视图",
                                     "ColumnName": "层级",
@@ -376,7 +411,7 @@
                                   "ColumnName": "层级"
                                 },
                                 {
-                                  "GUID": "c22ed7dd-0caf-4173-92c6-bc83deba41f4",
+                                  "GUID": "36f92afd-5705-417e-b76c-db3eda355d94",
                                   "BindingInfo": {
                                     "TableName": "任务平行视图",
                                     "ColumnName": "任务预算工时",
@@ -385,13 +420,13 @@
                                   "ColumnName": "任务预算工时"
                                 },
                                 {
-                                  "GUID": "717b4db9-b7be-437d-a09c-3733dc19c3bf",
+                                  "GUID": "6201715b-2e80-4961-88aa-230d8c064dac",
                                   "BindingInfo": {
                                     "TableName": "任务平行视图",
-                                    "ColumnName": "成员计划工时",
+                                    "ColumnName": "子任务预算工时",
-                                    "GUID": "85fd954d-c52d-494e-8e51-5b191456133c"
+                                    "GUID": "04e49339-f18b-4166-80b6-4153098333d3"
                                   },
-                                  "ColumnName": "总计划工时"
+                                  "ColumnName": "子任务预算工时"
                                 }
                               ],
                               "SqlCondition": {
@@ -409,28 +444,19 @@
                               "NullFormulaValueQueryPolicy": 0,
                               "TopCount": "1"
                             },
-                            "ID": "92012003801d4554a27aa6d1c1b5f7fe"
+                            "ID": "7bd17b4b5c814c7f97e0cdcd18390d41"
                           },
                           {
                             "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
                             "ParameterName": "预算工时上限",
                             "ParameterValue": {
                               "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                              "SerializeProperty": "=父任务.任务预算工时-父任务.总计划工时"
+                              "SerializeProperty": "=父任务.任务预算工时-父任务.子任务预算工时"
                             },
-                            "ID": "e8645f329ef5428084e2e9f931213182"
+                            "ID": "d9c75d72e3cb44e1928346d49e88b7da"
-                          },
-                          {
-                            "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
-                            "ParameterName": "层级",
-                            "ParameterValue": {
-                              "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                              "SerializeProperty": "=父任务.层级+1"
-                            },
-                            "ID": "ac58e4cdd43c49fe9f9575e244e3479b"
                           }
                         ],
-                        "ID": "dab745d7-5c78-4474-bf71-cf1ec4230570"
+                        "ID": "6bf73aa0-951b-4080-b09e-8c0b2c968796"
                       }
                     ],
                     "Comments": "严格模式下，根据是否有父任务来计算本次预算工时的上限"
@@ -464,12 +490,12 @@
                             }
                           }
                         ],
-                        "ID": "319fc2fe-698a-44cf-8bef-21fe1aadfee7"
+                        "ID": "51343141-8cfe-414d-ac01-7a82d052ac51"
                       }
                     ]
                   }
                 ],
-                "ID": "c2608868-26f2-4627-8905-c9fcb7328ffb"
+                "ID": "5a4607f9-f6cf-4e93-a344-74c178029992"
               }
             ],
             "Comments": "校验工时情况是否通过"

ServerCommands/任务/初始化填充任务数据.json

@@ -0,0 +1,227 @@
+{
+  "Name": "初始化填充任务数据",
+  "Enabled": true,
+  "Triggers": [
+    {
+      "$type": "Forguncy.SaveLoad.InvokeTriggerSaveData, ServerDesignerCommon",
+      "Parameters": [
+        {
+          "Name": "ID",
+          "DataValidationInfo": {
+            "IgnoreBlank": false
+          }
+        }
+      ]
+    }
+  ],
+  "Commands": [
+    {
+      "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
+      "ParameterName": "任务",
+      "TableValue": {
+        "TableName": "任务表",
+        "TableValueType": 1,
+        "BindingInfos": [
+          {
+            "GUID": "91f87b24-b074-4377-85af-0ce3a70290e7",
+            "BindingInfo": {
+              "TableName": "任务表",
+              "ColumnName": "项目ID",
+              "GUID": "2db90e41-be4a-4d26-8609-617a412e10f7"
+            },
+            "ColumnName": "项目ID"
+          },
+          {
+            "GUID": "419da719-9510-441d-80cc-4ee11afff767",
+            "BindingInfo": {
+              "TableName": "任务表",
+              "ColumnName": "任务负责人",
+              "GUID": "3809e1e6-a6cb-430c-8b14-5fd27956f40b"
+            },
+            "ColumnName": "任务负责人"
+          },
+          {
+            "GUID": "2adf5ff9-eb3d-4034-ba1a-b8e6e07dab95",
+            "BindingInfo": {
+              "TableName": "任务表",
+              "ColumnName": "FGC_Creator",
+              "GUID": "146030b3-56bb-4ae5-bbc3-0be8e8942b45"
+            },
+            "ColumnName": "创建者"
+          }
+        ],
+        "SqlCondition": {
+          "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+          "ColumnBindingInfo": {
+            "TableName": "任务表",
+            "ColumnName": "ID",
+            "GUID": "ecfa2ad0-5d11-4646-8955-455c7da0d276"
+          },
+          "Value": {
+            "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+            "SerializeProperty": "=ID"
+          }
+        },
+        "NullFormulaValueQueryPolicy": 0,
+        "TopCount": "1"
+      },
+      "ID": "6e987fc3b65147938edbce374b633fb9"
+    },
+    {
+      "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
+      "ConditionAndCommandPairList": [
+        {
+          "Condition": {
+            "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+            "param": {
+              "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon",
+              "ParamObject": {
+                "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                "SerializeProperty": "=任务"
+              }
+            },
+            "value": "%Null%",
+            "compareType": 1
+          },
+          "CommandList": [
+            {
+              "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
+              "ConditionAndCommandPairList": [
+                {
+                  "Condition": {
+                    "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+                    "param": {
+                      "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon",
+                      "ParamObject": {
+                        "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                        "SerializeProperty": "=任务.任务负责人"
+                      }
+                    },
+                    "value": "%Null%",
+                    "compareType": 1
+                  },
+                  "CommandList": [
+                    {
+                      "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon",
+                      "TableName": "任务成员表",
+                      "UpdateType": "add",
+                      "ShowConfirm": false,
+                      "UpdateBindingValues": [
+                        {
+                          "BindingInfo": {
+                            "TableName": "任务成员表",
+                            "ColumnName": "项目ID",
+                            "GUID": "36c3d1cc-3690-4afc-8177-b12641d9ab8b"
+                          },
+                          "Value": {
+                            "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                            "SerializeProperty": "=任务.项目ID"
+                          }
+                        },
+                        {
+                          "BindingInfo": {
+                            "TableName": "任务成员表",
+                            "ColumnName": "任务ID",
+                            "GUID": "faca65dc-c031-453d-a5c5-0cb188d381df"
+                          },
+                          "Value": {
+                            "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                            "SerializeProperty": "=ID"
+                          }
+                        },
+                        {
+                          "BindingInfo": {
+                            "TableName": "任务成员表",
+                            "ColumnName": "任务成员",
+                            "GUID": "97b2d16a-cadb-469d-8384-e083836f69d2"
+                          },
+                          "Value": {
+                            "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                            "SerializeProperty": "=任务.任务负责人"
+                          }
+                        }
+                      ]
+                    },
+                    {
+                      "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
+                      "ConditionAndCommandPairList": [
+                        {
+                          "Condition": {
+                            "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+                            "param": {
+                              "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon",
+                              "ParamObject": {
+                                "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                                "SerializeProperty": "=任务.任务负责人"
+                              }
+                            },
+                            "value": {
+                              "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                              "SerializeProperty": "=任务.创建者"
+                            },
+                            "compareType": 1
+                          },
+                          "CommandList": [
+                            {
+                              "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon",
+                              "TableName": "任务成员表",
+                              "UpdateType": "add",
+                              "ShowConfirm": false,
+                              "UpdateBindingValues": [
+                                {
+                                  "BindingInfo": {
+                                    "TableName": "任务成员表",
+                                    "ColumnName": "项目ID",
+                                    "GUID": "253894ad-5983-4e92-9989-ee208aaf15c9"
+                                  },
+                                  "Value": {
+                                    "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                                    "SerializeProperty": "=任务.项目ID"
+                                  }
+                                },
+                                {
+                                  "BindingInfo": {
+                                    "TableName": "任务成员表",
+                                    "ColumnName": "任务ID",
+                                    "GUID": "bd4be969-2724-4c5c-a4a6-51406fdf4d33"
+                                  },
+                                  "Value": {
+                                    "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                                    "SerializeProperty": "=ID"
+                                  }
+                                },
+                                {
+                                  "BindingInfo": {
+                                    "TableName": "任务成员表",
+                                    "ColumnName": "任务成员",
+                                    "GUID": "6d96f870-c7c3-45c8-9e50-7040600cebcf"
+                                  },
+                                  "Value": {
+                                    "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                                    "SerializeProperty": "=任务.创建者"
+                                  }
+                                }
+                              ]
+                            }
+                          ],
+                          "ID": "0662859e-4b63-4a68-a42c-fed8435d4fb4"
+                        }
+                      ]
+                    }
+                  ],
+                  "ID": "13d48185-1d81-453b-963f-9c97cef10a68"
+                }
+              ]
+            }
+          ],
+          "ID": "e3454c0f-d8fb-4315-b8bc-ef8080c4bf69"
+        }
+      ]
+    },
+    {
+      "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon",
+      "ErrorCode": "0",
+      "Message": "执行完毕"
+    }
+  ]
+}

ShareCommandContainers/打开任务详情.json

@@ -42,6 +42,31 @@
       "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon",
       "PopupDisplayMode": 4,
       "ShowDrawerHeader": true,
+      "ClosePopupCallbackCommand": {
+        "Commands": [
+          {
+            "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon",
+            "TargetPageElement": {
+              "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+              "SerializeProperty": "=任务EL表格"
+            },
+            "TargetType": "ElementUI.TableCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560",
+            "MethodName": "ResetTable",
+            "ParameterValues": {
+              "clearSort": true,
+              "clearFilter": true
+            }
+          },
+          {
+            "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon",
+            "ErrorCode": "0",
+            "Message": "页面关闭"
+          }
+        ],
+        "ParamProperties": {
+          "IsOK": "是否为确定"
+        }
+      },
       "PageName": "任务首页",
       "LoadBindingDataOption": 1
     }

Tables/任务/任务平行视图.json

@@ -4,7 +4,6 @@
     {
       "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon",
       "Required": true,
-      "AutoIncrement": true,
       "DatabaseColumnType": "bigint",
       "MaxLength": -1,
       "Name": "ID",
@@ -186,6 +185,20 @@
       "Name": "任务成员",
       "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
     },
+    {
+      "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon",
+      "DatabaseColumnType": "float",
+      "MaxLength": -1,
+      "Name": "子任务预算工时",
+      "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
+    },
+    {
+      "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon",
+      "DatabaseColumnType": "int",
+      "MaxLength": -1,
+      "Name": "子任务数量",
+      "ColumnType": "System.Int32, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
+    },
     {
       "$type": "Forguncy.SaveLoad.StatisticColumnSaveData, ServerDesignerCommon",
       "BindingInfo": {
@@ -245,7 +258,7 @@
     "ConnectionId": "业务表",
     "SourceTableName": "任务平行视图",
     "SourceTableSchema": "dbo",
-    "CreateViewSql": "SELECT\r\n  [ID],\r\n  [项目ID],\r\n  [父任务ID],\r\n  [层级],\r\n  [任务名称],\r\n  [任务负责人],\r\n  [开始时间],\r\n  [结束时间],\r\n  [任务类型],\r\n  [分组ID],\r\n  [版本],\r\n  [任务说明],\r\n  [备注],\r\n  [关联资源],\r\n  [任务预算工时],\r\n  [前置任务],\r\n  [工期],\r\n  [次序],\r\n  [里程碑],\r\n  [进度],\r\n  [功能名称],\r\n  [功能描述],\r\n  [收集反馈],\r\n  [任务状态],\r\n  [流程实例ID],\r\n  (\r\n    SELECT\r\n      STRING_AGG([任务成员], ',')\r\n    FROM\r\n      [任务成员表]\r\n    WHERE\r\n      [任务ID] = [任务表].ID\r\n  ) AS 任务成员\r\nFROM\r\n  [任务表];",
+    "CreateViewSql": "SELECT\r\n  a.[ID],\r\n  a.[项目ID],\r\n  a.[父任务ID],\r\n  a.[层级],\r\n  a.[任务名称],\r\n  a.[任务负责人],\r\n  a.[开始时间],\r\n  a.[结束时间],\r\n  a.[任务类型],\r\n  a.[分组ID],\r\n  a.[版本],\r\n  a.[任务说明],\r\n  a.[备注],\r\n  a.[关联资源],\r\n  a.[任务预算工时],\r\n  a.[前置任务],\r\n  a.[工期],\r\n  a.[次序],\r\n  a.[里程碑],\r\n  a.[进度],\r\n  a.[功能名称],\r\n  a.[功能描述],\r\n  a.[收集反馈],\r\n  a.[任务状态],\r\n  a.[流程实例ID],\r\n  (\r\n    SELECT\r\n      STRING_AGG([任务成员], ',')\r\n    FROM\r\n      [任务成员表]\r\n    WHERE\r\n      [任务ID] = a.ID\r\n  ) AS 任务成员,\r\n  SUM(b.[任务预算工时]) AS 子任务预算工时,\r\n  count(b.ID) AS 子任务数量\r\nFROM\r\n  [任务表] a\r\n  LEFT JOIN [任务表] b ON a.ID = b.[父任务ID]\r\n  AND b.[任务状态] > 0\r\nGROUP BY\r\na.[ID],\r\n  a.[项目ID],\r\n  a.[父任务ID],\r\n  a.[层级],\r\n  a.[任务名称],\r\n  a.[任务负责人],\r\n  a.[开始时间],\r\n  a.[结束时间],\r\n  a.[任务类型],\r\n  a.[分组ID],\r\n  a.[版本],\r\n  a.[任务说明],\r\n  a.[备注],\r\n  a.[关联资源],\r\n  a.[任务预算工时],\r\n  a.[前置任务],\r\n  a.[工期],\r\n  a.[次序],\r\n  a.[里程碑],\r\n  a.[进度],\r\n  a.[功能名称],\r\n  a.[功能描述],\r\n  a.[收集反馈],\r\n  a.[任务状态],\r\n  a.[流程实例ID];",
     "ViewInfo": {
       "ViewName": "任务平行视图",
       "QueryColumns": [

Tables/项目/项目表.json

@@ -595,7 +595,7 @@
     },
     {
       "$type": "Forguncy.SaveLoad.FormulaColumnSaveData, ServerDesignerCommon",
-      "Formula": "DATEDIF([计划开始日期],[计划完成日期],\"d\")",
+      "Formula": "IF([计划开始日期]=\"\",\"\",IF([计划完成日期]=\"\",\"\",DATEDIF([计划开始日期],[计划完成日期],\"d\")))",
       "Name": "计算计划工期",
       "ColumnType": "System.Int32, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
     },