diff --git a/.collaboration b/.collaboration
index bfda035a..af8f8a6d 100644
--- a/.collaboration
+++ b/.collaboration
@@ -574,31 +574,11 @@
   },
   {
     "ModuleName": "PCPage/任务-基本信息",
-    "State": 1,
-    "LockedBy": {
-      "UserName": "超哥",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-08-05T11:22:48.0609319+08:00",
-    "ModuleType": 1,
-    "ToRemoveFiles": [
-      "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\任务-基本信息.json",
-      "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\任务-基本信息.rd"
-    ]
+    "ModuleType": 1
   },
   {
     "ModuleName": "PCPage/任务首页",
-    "State": 1,
-    "LockedBy": {
-      "UserName": "超哥",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-08-05T12:58:17.4021601+08:00",
-    "ModuleType": 1,
-    "ToRemoveFiles": [
-      "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\任务首页.json",
-      "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\任务首页.rd"
-    ]
+    "ModuleType": 1
   },
   {
     "ModuleName": "PCPage/项目周报列表",
@@ -1054,21 +1034,7 @@
   },
   {
     "ModuleName": "PCPage/TODO-FULL",
-    "State": 1,
-    "LockedBy": {
-      "UserName": "超哥",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-08-05T13:42:50.5160185+08:00",
-    "ModuleType": 1,
-    "ToRemoveFiles": [
-      "Pages\\TODO\\TODO-FULL.json",
-      "Pages\\TODO\\TODO-FULL.rd",
-      "Pages\\6746a656596b44bb908448c6ffc1502.json",
-      "Pages\\6746a656596b44bb908448c6ffc1502.rd",
-      "Pages\\c273b140d3b24036903f81cf5f56c0f.json",
-      "Pages\\c273b140d3b24036903f81cf5f56c0f.rd"
-    ]
+    "ModuleType": 1
   },
   {
     "ModuleName": "Pages/流程页面文件夹",
@@ -1548,16 +1514,7 @@
   },
   {
     "ModuleName": "ServerCommand/任务发起流程前校验",
-    "State": 1,
-    "LockedBy": {
-      "UserName": "超哥",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-08-05T12:48:11.669014+08:00",
-    "ModuleType": 15,
-    "ToRemoveFiles": [
-      "ServerCommands\\任务\\任务发起流程前校验.json"
-    ]
+    "ModuleType": 15
   },
   {
     "ModuleName": "ServerCommandPrivate/递归删除任务",
diff --git a/Pages/6746a656596b44bb908448c6ffc1502.json b/Pages/6746a656596b44bb908448c6ffc1502.json
index e165da74..47a37794 100644
--- a/Pages/6746a656596b44bb908448c6ffc1502.json
+++ b/Pages/6746a656596b44bb908448c6ffc1502.json
@@ -168,7 +168,7 @@
                                   "LoadBindingDataOption": 1
                                 }
                               ],
-                              "ID": "62a58f48-a79f-477b-b6aa-283c25cf426e"
+                              "ID": "d6520964-b72b-41a3-8ecb-5f9d381088b5"
                             },
                             {
                               "Condition": {
@@ -200,7 +200,7 @@
                                   ]
                                 }
                               ],
-                              "ID": "569cebcd-f5c8-47dd-a90c-3eb575bb5248"
+                              "ID": "87f27633-0ae9-4b95-b2d5-51ad4eb2ba0f"
                             },
                             {
                               "Condition": {
@@ -232,12 +232,12 @@
                                   "MethodName": "ExecuteCommand"
                                 }
                               ],
-                              "ID": "6dc9193e-183b-44f1-9f9a-46dce22ba846"
+                              "ID": "8df9e867-311b-4c2c-a57f-4789667967be"
                             }
                           ]
                         }
                       ],
-                      "ID": "ee44ae5d-a43e-420e-8261-7fede4a4835f"
+                      "ID": "dc8b61ec-f505-4c4f-9a52-c1abba4ed74a"
                     }
                   ]
                 }
@@ -357,4 +357,4 @@
     "PaperSize": {},
     "Margin": {}
   }
-}//0yUVIeBoUH4w3rKmGI0VUXb+b0WLbFPx40RsXtSc2HpOqX/fX6775mXY/OP+vJTUzcgzGktnGnHGDmLdmgdhIpNLMoNj5uv/gq2TG8uYPm+QDyOsAEtzWxv+ng42vuUt8dbDQoOWOBjQDjaM235ZpMLMJtLd1e1xcAPzaiYMzaVgJj8Kk7F36uAc7XW5GODqAgw3Bx/YNbuf5BK9foE8iStpbLEsNQ3CAlA/ooPAcoS7+QHPiByaodFEP/A5PY7OpWPU021EQSXDVmBRBm+W3v04peWesmsYtuAopb14rQMHYhKl3laV+rOidws3Kffc27/9GGQmlsAUJlnfvOQYWWVTwKQmQlcmXNhuQc77FPNlG6MFkxlbfaA5EFl+fVCyd0ISOVNf+TCg3ne58rsGXQ+Zd3S6c6PUqPHx56u93SQAIX138HGBpm2rZRvMXiEktmN0EAKoMT3HJnF8NOddFm78qAtGSnnNbWJpHF84ECBS5W9wSuzxqu8pE+bUTSphZnGsB8AOuBrvEEFg3z1Hp3+EYhRcdEZy8ux+dg05h9JTPuY33kWiyn9PPcJ4zWY9RbVstMTSjO73z0Fivd7Cju5k2KBTTWSCEt8XDDRDsj2SaM+WeKByh6ilXzxSAHSbpbNMs9xFwUt/Fc1XjV7x4TVxd20U+JbJdPqvtCkRlr8XaIUF7POG3DQsZxSZtI2IuMmlo4BedS1yucM0pQ7cdihzEYEmOyYD5EZZtBSC/aLOy4f7s0WPmGe24ozAfAOIIuTzMwJioprv641L1qjYkN5juoVaS1tdl8pJFpGqWQnsGUv+JQsB+KBAH7hlWgsfq7Xyl5HdQPN+oP6r3cIIQ929x8jvdLErqEQLAQMvdeOifRGMhsanRhvROe1uqdheiUHktgnoxSzLHsHVWVj8Lg==|920
\ No newline at end of file
+}//ixBIhRVxEBSTt3o8/lvAklHfpcDS+vzpVRTj7H5HjLjna1w+GFNZqUgJwmdeqWH6m2xTbS/o2kkBMsIoCS6O4L4UziPxFUjmNODvzQyKohPquPpKjEoXt32N1sz5zldvJNXZTXF8rTVtpMv7ZlpzJyYY5/wOjU7/CyXDlDyQRBQndQNlDCL0FUcGO3DlXhTKNFBXMLiI/GMG4qxSWIFJvuylsVEivd49UumPcK/qxsUy46xIjiVizowtdZmkcSV+MYzSXBO+/KQvG0HUxHpfem2Dc7ya5Q+1WzwB1DazXqgxL3C0b4YDsofmswZ6F0ukh8BdflD/nanpOeLd6nTrBfRqZYnMMQrxGr+T1Lq/ju8hzYfFJ1JV7UWrDX+B+BJKpPb+pLow+Jvuvb53OtPen92LWPFC7wmr3xZWphE8VbBFyXjEaAGb1zwTl/yRVPvtAruRFyxTMyRyaNCQ0yIXwSU6vWMprgQHCenbZrx56Ya/wXo6R25uU7fTEu55KB6IJKe1RYrHAIaYBvdWtrf/PdE4apr6kz7u8D75EjxCjQk9jmiUadGDlfbSNKaadg6Po8EpQIqkp43PBviC9P8GTCjfXnaIwqgVe+ebGJJUGAWZoygPgew5z2Uc+r2ClF89N7dP+HlTn0larjJviaRKiDJEuLrbU0RWLBzG0EJrAvYE5Zg2chtSAIMVefpBpRNS1I6JPAKjHcRc8sDY9F+9hmUlXJb1JwN7rXHO53ADEKp61QiFMv/rwipERAmI9kC5pXna2fsrIhS0C3xOJag+L85pFTODiQcjfWrLcF9BDnjEO3iQNYZZnMWFneg2LZn09e0Rwj3PzoHFDxUTH4eyqjQS6AF5zjw4yfqj8TkHG9jJ61Z9yO6BOLLMjijMuiIABtRXV2GlKKKxcQilKLfhHQ==|920
\ No newline at end of file
diff --git a/Pages/TODO/TODO-FULL.json b/Pages/TODO/TODO-FULL.json
index 7ceb90b0..e52fc90b 100644
--- a/Pages/TODO/TODO-FULL.json
+++ b/Pages/TODO/TODO-FULL.json
@@ -265,8 +265,8 @@
   },
   "Formulas": {
     "13,4": "IFERROR(ODATA(\"TODO/$count?$filter=用户 eq \"&IF(ISBLANK(当前用户),\"null\",\"'\"&当前用户&\"'\")&\" and 完成 eq 1\"),0)",
-    "12,8": "IFERROR(ODATA(\"TODO/$count?$filter=提醒日期 ne null and 完成 ne 1\"),0)",
-    "12,7": "IFERROR(ODATA(\"TODO/$count?$filter=提醒日期 eq \"&IF(ISBLANK(TODAY()),\"null\",TEXT(TODAY(),\"yyyy-MM-ddThh:mm:ssZ\"))&\" and 完成 ne 1\"),0)"
+    "12,8": "IFERROR(ODATA(\"TODO/$count?$filter=提醒日期 gt \"&IF(ISBLANK(TODAY()),\"null\",TEXT(TODAY(),\"yyyy-MM-ddThh:mm:ssZ\"))&\" and 完成 ne 1\"),0)",
+    "12,7": "ODATA(\"TODO/$count?$filter=提醒日期 ge \"&IF(ISBLANK(TODAY()),\"null\",TEXT(TODAY(),\"yyyy-MM-ddThh:mm:ssZ\"))&\" and 提醒日期 lt \"&IF(ISBLANK(TODAY()+1),\"null\",TEXT(TODAY()+1,\"yyyy-MM-ddThh:mm:ssZ\"))&\" and 完成 ne 1\")"
   },
   "AttachInfos": {
     "1,1": {
@@ -509,14 +509,18 @@
                       "TargetCells": {
                         "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
                         "SerializeProperty": "='TODO-FULL'!筛选日期"
-                      }
+                      },
+                      "Value": "%Null%"
                     },
                     {
                       "TargetCells": {
                         "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
                         "SerializeProperty": "='TODO-FULL'!大于日期"
                       },
-                      "Value": "0"
+                      "Value": {
+                        "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                        "SerializeProperty": "=TODAY()"
+                      }
                     }
                   ]
                 }
@@ -1274,4 +1278,4 @@
       "Formula": "'TODO-FULL'!$E$15"
     }
   ]
-}//cphcSVeZ3eb8U6elXSW0agRqJUvn8hvAQXvH7a3Ku/Z0f5t1dgon4MGDPT0HL/z13YyRE3EJGshBSUgtx8nUmxok6URw0w8Vcq/B4uER3W6RK75IQibYgHLUtnzs2lg9WpriM2lwBH2dIry9C5MxVFqsldKYu+Xu7ZFoiYmjl3kWiVFkKyxCUXuj2tueYFSW/q6ol0wsPvBmH+IK9owwmr8bT6KCPmvUasDX1mvBO1II1O+2v+3TCmydBz7uaxNjG1K4FcC/ugRWcY8xRR/JjmjnyNGECS7zB+6Q2a7hzH1my2QLyA0a3Y9dJo6h44fkex2rhs3XQk+w1IkAa0vhM97Zn0fBEfsWeVOAEDLx/+NSzsAeEOTf9ZiNX6eZH2D2E8LEoZ+JCL9BcXzde+nl6Q+vj0rwBU7vCuNADhuVVKH5CsvXkQ8QouGACPmo7oTqlfLDU/mSZIY0tiMxDlQjTNMciDM/po63a/7cuOCAt4S3KyzO8tj8QxTuL/gKX2xhgKWLvkmao/SOByQuc1BfNPveedrk3VdOw5qpaSe/8GZ6VwxNMlUx/1WS4XJChhRuxL0AEE71azwoxXSDsfTOiSn3Csqlqtl665SUfX5GtziwlSVm5JeTFnQ3lqanR5fEeEaL+FFu9q/dbfAz4IzKI3AdXs6Mt0O3BcJpg795C3u6yYEp/ByFmliCcn207RESp3tr54c2KusEBrEj5YQl6izNBxB22XfkLhIL+k0p8dHqjPIhygR5hPvkHAA4yasIHTSp4kzOfu76DIlVwWiIWxkbXaI0prthwxtYLgjl82eZGzeo/6l+G7e7afHNwTF141FphRgSIR7wjiH9bE1aaRLhUgi6QsNrOROJVZXqy9KDMz+dND3oxo3lHpnaIbxZUbMxQq2Hw5i3bq7X17Iglg==|920
\ No newline at end of file
+}//7EnOwuFLM74ccJsw9pU9iIAU4EeL/JxD+wp+uKABwhGesOuAGRfGc+i/sbsSk6myl739rWeITMGNzdbmVTxdPFFo2sYMWU9aycjxTww0fYzbXLeqE+4lts7H8/HWoYT9Eortn9YRMJr+BO1zJS0qozHU+vcWoGZ4P9C0LKeZQodGPnz8pMQVaOexdyKwhuSoB2vdGOv/fur30mE/ONdzdAbaglil45PS4WxzvDVLE3YA42dks3rrgl5OVo+TbToGjmx1pHK1MHWL1I5ADfXpQwGLKMOn0ISaqAHTB4wwVM64QXpt/2NvzmPg+aLBxpvpyaDm/6vAr3luWn6lmyDvDF8qNf9j+oBOenboUOae6gnc75CHOaF2NVC/4q61BtCfbSngpjyErrztcVaUlbQfMRoTbef6vW2L8YODZd4XtpkujjLOW5lwUaP3X8G+1rjK7184gRS4AMm81Y0maHhqZJt/gyhiQo0ndml3mnb4T5k+tZFgAh1r8Svs7lSlHqJba6n1w9c1nhZlMdnSe3v1Jd03B0zkMOZc/S4b8kcpEPU8jA2d1jCD24oCKfoOj7Cnmf9qkF2eS2qD6tZRFDNXmuQl6Q/GLvsWHEOZltHW7PphPKQ+7nR70mewf15N4rp0Xz4HL2CWyaAKgZ3X0E4q5yBFh+9XIIB5Bvm5WfojWHPhFo9b5qGyOnP8VyIsf7qLO7Af1a7LS2xT0rvOnpRZuCs6QHzTDzHh5IXGgsNkz91+mrt85r212FhkAKl9+mqoY4zygtC4LJKJYwnPkpH9A+VBukL5g1hTJNaQ2iSVM1gs78R2Vu3I5Cs7Semu49feLS2PRjYOXGRjbLCc/aE2W9hZD+GkIP5cD202AvZNhUXxQ4EGpcRaGktB74EQQMkjSHq13inyYyxucZutnq7GzA==|920
\ No newline at end of file
diff --git a/Pages/TODO/TODO-FULL.rd b/Pages/TODO/TODO-FULL.rd
index b3694fa3..8d6b1dec 100644
--- a/Pages/TODO/TODO-FULL.rd
+++ b/Pages/TODO/TODO-FULL.rd
@@ -4,8 +4,8 @@
   "RowCount": 15,
   "Formulas": {
     "13,4": "IFERROR(ODATA(\"TODO/$count?$filter=用户 eq \"&IF(ISBLANK(当前用户),\"null\",\"'\"&当前用户&\"'\")&\" and 完成 eq 1\"),0)",
-    "12,8": "IFERROR(ODATA(\"TODO/$count?$filter=提醒日期 ne null and 完成 ne 1\"),0)",
-    "12,7": "IFERROR(ODATA(\"TODO/$count?$filter=提醒日期 eq \"&IF(ISBLANK(TODAY()),\"null\",TEXT(TODAY(),\"yyyy-MM-ddThh:mm:ssZ\"))&\" and 完成 ne 1\"),0)"
+    "12,8": "IFERROR(ODATA(\"TODO/$count?$filter=提醒日期 gt \"&IF(ISBLANK(TODAY()),\"null\",TEXT(TODAY(),\"yyyy-MM-ddThh:mm:ssZ\"))&\" and 完成 ne 1\"),0)",
+    "12,7": "ODATA(\"TODO/$count?$filter=提醒日期 ge \"&IF(ISBLANK(TODAY()),\"null\",TEXT(TODAY(),\"yyyy-MM-ddThh:mm:ssZ\"))&\" and 提醒日期 lt \"&IF(ISBLANK(TODAY()+1),\"null\",TEXT(TODAY()+1,\"yyyy-MM-ddThh:mm:ssZ\"))&\" and 完成 ne 1\")"
   },
   "CustomNames": [
     {
diff --git a/Pages/c273b140d3b24036903f81cf5f56c0f.json b/Pages/c273b140d3b24036903f81cf5f56c0f.json
index 4a07c54c..57895073 100644
--- a/Pages/c273b140d3b24036903f81cf5f56c0f.json
+++ b/Pages/c273b140d3b24036903f81cf5f56c0f.json
@@ -213,7 +213,7 @@
                                           }
                                         }
                                       ],
-                                      "ID": "3158105e-950c-4a3b-bb51-d3a33482852b"
+                                      "ID": "772b9e18-1953-484c-9ad3-6778cb1fa667"
                                     },
                                     {
                                       "Condition": {
@@ -267,12 +267,12 @@
                                           }
                                         }
                                       ],
-                                      "ID": "9081bdbe-2d9d-4133-b241-b3ea6cfa97a5"
+                                      "ID": "46ed5250-c180-4a87-b726-652906db852a"
                                     }
                                   ]
                                 }
                               ],
-                              "ID": "acee85ad-603e-47be-ac44-b6596816f213"
+                              "ID": "ac2ad4ed-132b-47e0-a832-b940d78feed9"
                             }
                           ]
                         }
@@ -285,7 +285,7 @@
                     "PageName": "列表菜单"
                   }
                 ],
-                "ID": "db7060b5-3aa7-4f97-8bb2-20628bc0229c"
+                "ID": "f633a1b7-aee8-4103-bbb5-533a68a98690"
               },
               {
                 "CommandList": [
@@ -295,7 +295,7 @@
                     "Message": "内置分类不可删除"
                   }
                 ],
-                "ID": "ff5d024b-b5c8-449c-855c-e6a14586a283"
+                "ID": "bf82e0b7-0024-4e38-bebb-6a1bfac2bc8a"
               }
             ]
           }
@@ -408,4 +408,4 @@
     "PaperSize": {},
     "Margin": {}
   }
-}//DpfeXpIkF0gW4vSOFI4K9eIv2zupTPRn04ju7e8wQl4mJnEACA/iSKbxa7r6WMbcEE/+JjFg0h5seCDbCtokR6RjcGLiYsz4HPqsIQ8CmysboNoRIZY2WHIqjdI9zd7VWXxk2HlcirpSNf69skBgsIrjL87CsnW8uw93I6tOAlS7P5HHi1/MFmJDfPG6fVrK5uWGBV8Bt/crK8b8hBrWuvcf4rfCSER7BHPazNnNhIaDqJxaXVSlepS5h4bU7hbeWXoLih3GJVGwV5Lpf2APljk4nDIn2awPd+rGeNg25v9Mj84khF4Q8OnakqCdpl0I6ACv0ha3pSKVhHPgM8p3R6H6nYbnbbdtxFqo/XnCYpQk5tT5wmCdGp//TA+mpH8Pao8Zy5a5EcN42KP81x7kE77E0sMQT6kUy8nHC7Cix+biSLQi6ro0+lDdJJd+yGWMMpTPSNEpla5mNP+9cyArBXOPdM8qfXrfdDaICVQtsU6ii13o9vcIQUF23YaSdyj889ZOJNzkisa9JLmcugZQNRrAWWFGifkHo4C3Cz5XV2qr3TbiM/1j9l3vnE3y0WhT5H+K2PW5Jrxf6GBsWIrGrKkVNRTKhlrsXnVcy89nKddpYl2eUSVVXpCO4V7pxYDuf6D6nQGvqS8FZo29tdqUMddhZIvd6cr3r1xSwwqBtphRVh34SqpavnR8uOBW+SuTRvPUZN15YISoCyWFJSiUWNsCmLcAEB0V40rZKnWTsEkfjIpterqfi7px+4tpnocg0LOSe0kbXXdMmyYpWPSr4ISiaL4F8xYyeyQdJWeckBPqn/HLVCSwwI9ruOGtqgIFYpvWANi6yUtX+hHDLNmlb7EE0b8u3/gYaUPMvohXxIl+wieqZ8x0yhEZPZHXDloPvlG1vFUiu0UcpyWeE5K++g==|920
\ No newline at end of file
+}//SrMqu/P8Bsn4x/V48LvucTAuU2vAo8WpN8A8FSDeADwKN3COOzgUykZ+IRHlPkw23hewEGGNp7MlNiMNSTwciy//Ymre+YWiKOkfNV00MUh5BrdFfHm3C6At4EYIsr34tRoaScSKjNDQY/44NcTQ2xRLcZY21NnyevtpfuRUhrfLEADfuKy8nzd7WuHpIOJUYxIgCU6a2RU/or9mEvXuh4dE2zlB49jr/QNAEbFBt+HW+FFBwrbPMRzAEjnnf8XwG+egYOgJe9JHTXD60YU3p6fB58kMfJ0DIdPAjlsZaJ0cVRaRxR2h0ghxIaUBe+M/qacZ31ODowRDgTRso0m+WOn3Lg0HcipcaaYczPgQzlRkFWFA2Mg5KtP5Tnf4Emqix5vnEzySya6bVaxrW9iHB2RnSzS4vmo4R6SCvked5f6p5rHXnP/XnpC6vZhaRjrhliA+SZJCZj1PwJ3X8eiT1E2ackzZP7HSYHBZsD1Q5CUuugjlYqFwKwJEFvepyXdS025AOQlwYJ0YVKhCyG7s3Kru00UsZbPKAW84Dc0A3Nd017XX+7N3syEoOOehTv8SizDgHhrEclHfg2vliqQMF8qbX2HZunnbAvsa7s+GnsMxGz77a6qKxnYpiNewTXcvywyRmLirk2LUCtjLqs43iep8YO0iwPukXR1N5rm/4ooPVahycMIRFwVspBPS9t62c6qiK3k57KcXtKaeoVqvIB8XCyJoQiAxZReII/1lLeF2+sCDTFi93nXtqrGbkiVY5BYw7PAVwdiyaqTFrfnl6wLJmwTICNQRPX+MuxMKLepycXBujmHRJgBobv5HG6RVKIxalJKpXrSB2xNmPEs1b/d0fVvltV5D5BZCnpbqQld5bdOvPuF7Czso3MfAJtvaxBWwcUSfUJ7qO9HtOXfDlg==|920
\ No newline at end of file
diff --git a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-基本信息.json b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-基本信息.json
index 24c3bba0..e254975d 100644
--- a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-基本信息.json
+++ b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-基本信息.json
@@ -305,7 +305,7 @@
                     ]
                   }
                 ],
-                "ID": "8daca809-7e6a-4d29-89aa-9f5f1367b14c"
+                "ID": "8b6f95e3-cd35-4fa7-88a1-941262ae4213"
               }
             ]
           }
@@ -444,7 +444,7 @@
                                           }
                                         }
                                       ],
-                                      "ID": "afdf1ba7-e48a-4823-8956-5d7e8990e60c"
+                                      "ID": "6fc28e47-aa86-4f90-b2c4-c017480943c1"
                                     },
                                     {
                                       "CommandList": [
@@ -459,12 +459,12 @@
                                           "BtnText": "知道了"
                                         }
                                       ],
-                                      "ID": "39fdc218-9f84-42cf-bceb-da92ff50e882"
+                                      "ID": "2aecc1ab-f37c-464f-8f58-a477c55f89f1"
                                     }
                                   ]
                                 }
                               ],
-                              "ID": "a653cced-18c9-4489-afe7-540c7ec438ca"
+                              "ID": "d7b6c725-cf51-443b-8327-7bbfc3120efe"
                             }
                           ]
                         }
@@ -477,7 +477,7 @@
                   }
                 ],
                 "Comments": "小于进行中",
-                "ID": "7cdef803-243e-4082-be68-de9c3d066c07"
+                "ID": "1f47bb3b-b51f-4663-9ee2-c00c37cca8a2"
               },
               {
                 "CommandList": [
@@ -487,7 +487,7 @@
                     "Message": "任务尚未审批完成，不可修改状态"
                   }
                 ],
-                "ID": "08273184-11d0-4ae0-9e37-f0fd709c0901"
+                "ID": "31c19b47-14ed-4325-9c49-6526a0637946"
               }
             ]
           }
@@ -586,7 +586,7 @@
                     ]
                   }
                 ],
-                "ID": "d3760e79-69b7-45a2-9a24-6b11e61361c3"
+                "ID": "9d9c8702-4a9d-42ef-b16a-657d1ff762e0"
               }
             ]
           }
@@ -766,7 +766,7 @@
                     ]
                   }
                 ],
-                "ID": "3f4e6d6a-e767-4297-8148-0ce3fbcf4a97"
+                "ID": "587caf89-0b4c-4ea3-b2ef-d5a2fcda020d"
               }
             ]
           }
@@ -865,7 +865,7 @@
       "BindingInfo": {
         "TableName": "任务表",
         "ColumnName": "任务预算工时",
-        "GUID": "920d9962-f990-4709-873c-fed76381b5b4"
+        "GUID": "6a2bbf6a-ba5d-4b7e-9b5a-2c142eea9f35"
       },
       "CellType": {
         "$type": "ElementUI.InputNumberCellType, ElementUI",
@@ -890,12 +890,12 @@
                     {
                       "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
                       "param": {
-                        "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon",
-                        "tableData": {
-                          "TableName": "任务表",
-                          "ColumnName": "ID",
-                          "GUID": "48936c6f-dcdf-4171-a25a-36806ab752a5"
-                        }
+                        "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon",
+                        "cellLocations": [
+                          {
+                            "SerializeProperty": "=任务首页!任务ID"
+                          }
+                        ]
                       },
                       "value": "%Null%",
                       "compareType": 1
@@ -903,6 +903,10 @@
                   ]
                 },
                 "CommandList": [
+                  {
+                    "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy",
+                    "Title": "加载中"
+                  },
                   {
                     "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
                     "ConditionAndCommandPairList": [
@@ -913,17 +917,12 @@
                             "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon",
                             "tableData": {
                               "TableName": "任务表",
-                              "ColumnName": "项目ID",
-                              "GUID": "5cbb4f11-c47a-4a8e-ba65-449e7d9877db",
-                              "RelationBinding": {
-                                "RelatedTable": "项目表",
-                                "RelatedColumn": "ID",
-                                "DisplayColumn": "工时分配方式"
-                              }
+                              "ColumnName": "任务状态",
+                              "GUID": "430fb608-3939-479c-b367-96a56fac1b01"
                             }
                           },
-                          "value": "4",
-                          "compareType": 1
+                          "value": "0",
+                          "compareType": 2
                         },
                         "CommandList": [
                           {
@@ -931,153 +930,98 @@
                             "ConditionAndCommandPairList": [
                               {
                                 "Condition": {
-                                  "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
-                                  "param": {
-                                    "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon",
-                                    "tableData": {
-                                      "TableName": "任务表",
-                                      "ColumnName": "任务状态",
-                                      "GUID": "430fb608-3939-479c-b367-96a56fac1b01"
+                                  "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess",
+                                  "SubConditions": [
+                                    {
+                                      "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+                                      "param": {
+                                        "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon",
+                                        "tableData": {
+                                          "TableName": "项目表",
+                                          "ColumnName": "项目经理",
+                                          "GUID": "d7bbed39-1c83-44c7-aecd-0ff8dd03e4a7"
+                                        }
+                                      },
+                                      "value": "%CurrentUser.UserName%"
+                                    },
+                                    {
+                                      "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+                                      "param": {
+                                        "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon",
+                                        "tableData": {
+                                          "TableName": "任务表",
+                                          "ColumnName": "父任务ID",
+                                          "GUID": "fc54712b-b3f4-400a-8acd-23b99feaea99",
+                                          "RelationBinding": {
+                                            "RelatedTable": "任务表",
+                                            "RelatedColumn": "ID",
+                                            "DisplayColumn": "任务负责人"
+                                          }
+                                        }
+                                      },
+                                      "value": "%CurrentUser.UserName%"
                                     }
-                                  },
-                                  "value": "0",
-                                  "compareType": 2
+                                  ],
+                                  "RelationType": 1
                                 },
                                 "CommandList": [
+                                  {
+                                    "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon",
+                                    "ServerCommandName": "修改任务预算工时",
+                                    "Parameters": [
+                                      {
+                                        "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon",
+                                        "ParamName": "任务ID",
+                                        "Value": {
+                                          "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                                          "SerializeProperty": "='任务-基本信息'!任务ID"
+                                        }
+                                      },
+                                      {
+                                        "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon",
+                                        "ParamName": "新预算工时",
+                                        "Value": {
+                                          "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                                          "SerializeProperty": "='任务-基本信息'!任务预算工时"
+                                        }
+                                      }
+                                    ],
+                                    "ResultErrorCodeTo": {
+                                      "SerializeProperty": "code"
+                                    },
+                                    "ResultMessageTo": {
+                                      "SerializeProperty": "msg"
+                                    },
+                                    "ReturnPropertiesTo": [
+                                      {
+                                        "ResultPropertyName": "新工时"
+                                      }
+                                    ],
+                                    "RefreshAfterFinish": true,
+                                    "CheckDataValidation": true
+                                  },
                                   {
                                     "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
                                     "ConditionAndCommandPairList": [
                                       {
                                         "Condition": {
-                                          "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess",
-                                          "SubConditions": [
-                                            {
-                                              "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
-                                              "param": {
-                                                "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon",
-                                                "tableData": {
-                                                  "TableName": "项目表",
-                                                  "ColumnName": "项目经理",
-                                                  "GUID": "d7bbed39-1c83-44c7-aecd-0ff8dd03e4a7"
-                                                }
-                                              },
-                                              "value": "%CurrentUser.UserName%"
-                                            },
-                                            {
-                                              "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
-                                              "param": {
-                                                "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon",
-                                                "tableData": {
-                                                  "TableName": "任务表",
-                                                  "ColumnName": "父任务ID",
-                                                  "GUID": "fc54712b-b3f4-400a-8acd-23b99feaea99",
-                                                  "RelationBinding": {
-                                                    "RelatedTable": "任务表",
-                                                    "RelatedColumn": "ID",
-                                                    "DisplayColumn": "任务负责人"
-                                                  }
-                                                }
-                                              },
-                                              "value": "%CurrentUser.UserName%"
-                                            }
-                                          ],
-                                          "RelationType": 1
-                                        },
-                                        "CommandList": [
-                                          {
-                                            "$type": "Notiflix_Forguncy.Block_Command, Notiflix_Forguncy",
-                                            "Cell": {
-                                              "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                                              "SerializeProperty": "='任务-基本信息'!预算工时"
-                                            },
-                                            "Title": "校验中"
-                                          },
-                                          {
-                                            "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon",
-                                            "ServerCommandName": "修改任务预算工时",
-                                            "Parameters": [
+                                          "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+                                          "param": {
+                                            "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon",
+                                            "cellLocations": [
                                               {
-                                                "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon",
-                                                "ParamName": "任务ID",
-                                                "Value": {
-                                                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                                                  "SerializeProperty": "='任务-基本信息'!任务ID"
-                                                }
-                                              },
-                                              {
-                                                "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon",
-                                                "ParamName": "新预算工时",
-                                                "Value": {
-                                                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                                                  "SerializeProperty": "='任务-基本信息'!L8"
-                                                }
-                                              }
-                                            ],
-                                            "ResultErrorCodeTo": {
-                                              "SerializeProperty": "code"
-                                            },
-                                            "ResultMessageTo": {
-                                              "SerializeProperty": "msg"
-                                            },
-                                            "ReturnPropertiesTo": [
-                                              {
-                                                "ResultPropertyName": "新工时"
-                                              }
-                                            ],
-                                            "RefreshAfterFinish": true,
-                                            "CheckDataValidation": true
-                                          },
-                                          {
-                                            "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
-                                            "ConditionAndCommandPairList": [
-                                              {
-                                                "Condition": {
-                                                  "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
-                                                  "param": {
-                                                    "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon",
-                                                    "cellLocations": [
-                                                      {
-                                                        "SerializeProperty": "=code"
-                                                      }
-                                                    ]
-                                                  },
-                                                  "value": "0",
-                                                  "compareType": 1
-                                                },
-                                                "CommandList": [
-                                                  {
-                                                    "$type": "Notiflix_Forguncy.Report_Command, Notiflix_Forguncy",
-                                                    "FunctionName": "warning",
-                                                    "Title": "温馨提示",
-                                                    "Message": {
-                                                      "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                                                      "SerializeProperty": "='任务-基本信息'!msg"
-                                                    },
-                                                    "BtnText": "知道了"
-                                                  }
-                                                ],
-                                                "ID": "f5050b36-eaf7-4873-bbf5-1482ecb5aa18"
+                                                "SerializeProperty": "='任务-基本信息'!code"
                                               }
                                             ]
                                           },
-                                          {
-                                            "$type": "Notiflix_Forguncy.Block_Command, Notiflix_Forguncy",
-                                            "FunctionName": "remove",
-                                            "Cell": {
-                                              "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                                              "SerializeProperty": "='任务-基本信息'!预算工时"
-                                            },
-                                            "Title": "计算中"
-                                          }
-                                        ],
-                                        "ID": "b8d1a299-b020-4d2c-a243-1287d0af2fba"
-                                      },
-                                      {
+                                          "value": "0",
+                                          "compareType": 1
+                                        },
                                         "CommandList": [
                                           {
                                             "$type": "Notiflix_Forguncy.Report_Command, Notiflix_Forguncy",
                                             "FunctionName": "warning",
-                                            "Title": "请联系项目经理或父任务负责人修改",
+                                            "Title": "温馨提示",
                                             "Message": {
                                               "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
                                               "SerializeProperty": "='任务-基本信息'!msg"
@@ -1085,68 +1029,78 @@
                                             "BtnText": "知道了"
                                           }
                                         ],
-                                        "ID": "bee770f5-af05-4eea-b42a-5ab7ce298205"
+                                        "ID": "b82767d9-5511-40e8-82f9-03547af5da87"
                                       }
                                     ]
                                   }
                                 ],
-                                "ID": "2a54c12e-ce8e-44b9-b6a0-03dfdc33bf9c"
+                                "ID": "3938e5be-6d1b-4269-9027-8a0c975dc9c5"
                               },
                               {
                                 "CommandList": [
                                   {
-                                    "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon",
-                                    "TableName": "任务表",
-                                    "ShowConfirm": false,
-                                    "RowsToUpdate": 1,
-                                    "RowsToUpdateCondition": {
-                                      "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
-                                      "ColumnBindingInfo": {
-                                        "TableName": "任务表",
-                                        "ColumnName": "ID",
-                                        "GUID": "ca8e7467-90d8-4e23-be48-ecfcf70786af"
-                                      },
-                                      "Value": {
-                                        "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                                        "SerializeProperty": "='任务-基本信息'!任务ID"
-                                      }
+                                    "$type": "Notiflix_Forguncy.Report_Command, Notiflix_Forguncy",
+                                    "FunctionName": "warning",
+                                    "Title": "请联系项目经理或父任务负责人修改",
+                                    "Message": {
+                                      "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                                      "SerializeProperty": "='任务-基本信息'!msg"
                                     },
-                                    "UpdateBindingValues": [
-                                      {
-                                        "BindingInfo": {
-                                          "TableName": "任务表",
-                                          "ColumnName": "任务预算工时",
-                                          "GUID": "0ebe4a22-885d-4d86-b56d-3d65edde0876"
-                                        },
-                                        "Value": {
-                                          "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                                          "SerializeProperty": "='任务-基本信息'!预算工时"
-                                        }
-                                      }
-                                    ]
+                                    "BtnText": "知道了"
                                   }
                                 ],
-                                "ID": "412ac2c1-229c-419a-8cba-1f00bd44f899"
+                                "ID": "f444892c-6bb6-497c-95c6-925b24e2c9d7"
                               }
                             ]
                           }
                         ],
-                        "ID": "ea2dff49-1435-4ae4-9a99-027009854ad5"
+                        "ID": "7c99d9f7-1f14-4302-8d63-c9515a12737a"
                       },
                       {
                         "CommandList": [
                           {
-                            "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy",
-                            "FourStandardStyle": "warning",
-                            "Message": "本项目已设置为“不分配”工时模式，无法修改！"
+                            "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon",
+                            "TableName": "任务表",
+                            "ShowConfirm": false,
+                            "RowsToUpdate": 1,
+                            "RowsToUpdateCondition": {
+                              "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+                              "ColumnBindingInfo": {
+                                "TableName": "任务表",
+                                "ColumnName": "ID",
+                                "GUID": "ca8e7467-90d8-4e23-be48-ecfcf70786af"
+                              },
+                              "Value": {
+                                "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                                "SerializeProperty": "='任务-基本信息'!任务ID"
+                              }
+                            },
+                            "UpdateBindingValues": [
+                              {
+                                "BindingInfo": {
+                                  "TableName": "任务表",
+                                  "ColumnName": "任务预算工时",
+                                  "GUID": "ba0dc69c-08fd-494b-89ae-0f5db08834fc"
+                                },
+                                "Value": {
+                                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                                  "SerializeProperty": "='任务-基本信息'!任务预算工时"
+                                }
+                              }
+                            ]
                           }
                         ],
-                        "ID": "4adfb51c-e64c-4f96-85b8-67c2ffb02d7b"
+                        "ID": "6d3d7d3e-5086-4bf4-af5a-a2a3400dca17"
                       }
                     ]
+                  },
+                  {
+                    "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy",
+                    "FunctionName": "remove",
+                    "Title": "加载中"
                   }
                 ],
-                "ID": "87f17796-e985-464a-bf85-2849701a9520"
+                "ID": "d69e2513-b358-4177-bf6c-5a8df1b8fb58"
               }
             ]
           }
@@ -1155,7 +1109,7 @@
           {
             "Scope": 2,
             "AllowRoles": [
-              "项目经理"
+              "FGC_Anonymous"
             ]
           },
           {
@@ -1166,19 +1120,16 @@
           }
         ],
         "DefaultValue": 0,
-        "min": "0",
-        "max": {
-          "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-          "SerializeProperty": "=IF('任务-基本信息'!父任务ID=\"\",'任务-基本信息'!H14,'任务-基本信息'!K14)"
-        },
+        "min": 0,
         "step": 1,
-        "precision": 1,
-        "placeholder": "请选择",
-        "controlsPosition": true,
-        "IsDisabled": true
+        "placeholder": "请输入",
+        "controls": false
+      },
+      "DataValidationInfo": {
+        "IgnoreBlank": false
       },
       "RulesGuidList": [
-        "f7c3f6d5-8b51-481e-abe2-d1a7b9beee5e"
+        "df3364c5-117d-48cb-91e3-8d449209d692"
       ]
     },
     "9,2": {
@@ -1256,7 +1207,7 @@
                     ]
                   }
                 ],
-                "ID": "8b2c68db-807c-4790-b112-0b761bd99722"
+                "ID": "e781d4a3-3363-4ab7-843c-c1d6176946d5"
               }
             ]
           }
@@ -1410,7 +1361,7 @@
                     ]
                   }
                 ],
-                "ID": "2d4b0abf-03c3-4677-80c2-9cf81aefa550"
+                "ID": "867b5583-1c8e-46d1-aa81-3c30de79133e"
               }
             ]
           }
@@ -1574,7 +1525,7 @@
                     ]
                   }
                 ],
-                "ID": "a16b5c78-3209-459b-9844-d2adb7b66260"
+                "ID": "5fb4b1b4-e018-421c-8329-0937f64a968c"
               }
             ]
           }
@@ -1682,7 +1633,7 @@
                     ]
                   }
                 ],
-                "ID": "14988a25-6c47-41bf-a4c8-826a772ccfe4"
+                "ID": "3cbea450-e48e-45d2-93cd-f2549303d14e"
               }
             ]
           }
@@ -1804,6 +1755,9 @@
         "FontSize": 13.333333333333332,
         "BorderLeft": 0
       },
+      {
+        "FontSize": 13.333333333333332
+      },
       {
         "FontFamily": 2,
         "FontSize": -1.0
@@ -1895,13 +1849,7 @@
       "7,8": 5,
       "7,9": 5,
       "7,10": 7,
-      "7,11": 8,
-      "7,12": 5,
-      "7,13": 5,
-      "7,14": 5,
-      "7,15": 5,
-      "7,16": 5,
-      "7,17": 5,
+      "7,11": 11,
       "7,18": 8,
       "7,19": 9,
       "8,0": 5,
@@ -1959,7 +1907,7 @@
       "11,6": 5,
       "11,7": 5,
       "11,8": 5,
-      "11,9": 11,
+      "11,9": 12,
       "11,10": 7,
       "11,11": 5,
       "11,12": 5,
@@ -2006,7 +1954,7 @@
       "13,20": 5
     },
     "ColStyles": {
-      "1": 12
+      "1": 13
     },
     "SheetStyle": {
       "FontFamily": 2,
@@ -2024,10 +1972,10 @@
     "9,11,1,7",
     "11,2,1,7",
     "11,11,1,7",
-    "7,11,1,7",
     "13,11,1,7",
     "5,11,1,7",
-    "13,7,1,3"
+    "13,7,1,3",
+    "7,11,1,7"
   ],
   "PageInfo": {
     "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
@@ -2057,7 +2005,7 @@
                 }
               }
             ],
-            "ID": "b705d64e-69f5-407f-9a3b-b8b6b07ef198"
+            "ID": "0bdf8699-f391-488c-bd47-1dbb4b029e5e"
           }
         ]
       },
@@ -2096,7 +2044,7 @@
                 ]
               }
             ],
-            "ID": "f00c3c1b-52ba-4688-8b49-d0ed7db46df2"
+            "ID": "718874d8-48c9-4b4a-9ff7-3f61375411f3"
           },
           {
             "CommandList": [
@@ -2113,7 +2061,7 @@
                 ]
               }
             ],
-            "ID": "d230b7a8-d0e6-442a-b5a7-c39726a4f834"
+            "ID": "af78636d-a737-4e40-80e5-7b2932ba189e"
           }
         ]
       }
@@ -2137,13 +2085,29 @@
     "RelatedDataTableName": "项目平行视图",
     "ConditionFormatRulesCollection": {
       "Rules": [
+        {
+          "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon",
+          "Formula": {
+            "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+            "SerializeProperty": "=AND('任务-基本信息'!项目经理<>'任务-基本信息'!当前用户,'任务-基本信息'!任务负责人<>'任务-基本信息'!当前用户,'任务-基本信息'!父任务负责人<>'任务-基本信息'!当前用户)"
+          },
+          "Priority": 6,
+          "GUID": "df3364c5-117d-48cb-91e3-8d449209d692",
+          "StyleInfo": {
+            "Underline": null,
+            "Strikethrough": null
+          },
+          "IsDisabled": true,
+          "IsInvisible": false,
+          "IsReadOnly": false
+        },
         {
           "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon",
           "Formula": {
             "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
             "SerializeProperty": "='任务-基本信息'!任务状态码<2"
           },
-          "Priority": 8,
+          "Priority": 7,
           "GUID": "30197b74-993b-48e5-893e-b40b9ff5978d",
           "StyleInfo": {
             "Underline": null,
@@ -2153,22 +2117,6 @@
           "IsInvisible": false,
           "IsReadOnly": true
         },
-        {
-          "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon",
-          "Formula": {
-            "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-            "SerializeProperty": "=AND('任务-基本信息'!工时分配方式<>4,OR('任务-基本信息'!父任务负责人='任务-基本信息'!当前用户,'任务-基本信息'!项目经理='任务-基本信息'!当前用户,'任务-基本信息'!任务ID=\"\"))"
-          },
-          "Priority": 6,
-          "GUID": "f7c3f6d5-8b51-481e-abe2-d1a7b9beee5e",
-          "StyleInfo": {
-            "Underline": null,
-            "Strikethrough": null
-          },
-          "IsDisabled": false,
-          "IsInvisible": false,
-          "IsReadOnly": false
-        },
         {
           "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon",
           "Formula": {
@@ -2292,7 +2240,7 @@
       "Formula": "'任务-基本信息'!$B$2"
     },
     {
-      "Name": "预算工时",
+      "Name": "任务预算工时",
       "Formula": "'任务-基本信息'!$L$8"
     },
     {
@@ -2300,4 +2248,4 @@
       "Formula": "'任务-基本信息'!$C$8"
     }
   ]
-}//xNkDmd1Fac4VvRT2WgXmE2Oq1Zd6AR+GWhHfQWpALljUrs6cCG8t7nVSJXRAkQPX9bj3filh2p23e5PIUC+oT6oyz8AfxRvfbRJQpV5veKyheR0Ini9RG/z5Fbsa2kg2mY/c+Y+ZTbu/IjzgelKft7cc8HArzRy68HzTxizGpaoe5lGGQqQ00RJhYwMxp7nX56nwhClFnrlwACXU9ijDunDsUrY1BUhP0MymHFwuptW5fhh9V2nENwoReBf5JFjJlEcEep6r5Fb6z9nAapifnVXcQzAqv2GYSvfjiPMQz/4sbHOqgv/j61BJqycIwQtro1V5bH4KP734ZGqHQqJTGaLKsPB6onZAOGBS9m1RHqqgxxSvyPgX62zGlg0nbcMdvpm3SUVhI14E1yiZY8wsPfQulHVKiZ0WD3o09t6opaqs5BVAeYbxp3rtars/WCgcLDWRGy6hjPO+nNp0mVOhrOlbk7N/ujqTqXRa8gFQNANWV/QmOnTOzYyevIpNoFrfE5jri1qF8/Z6vdsGeXyYfWQsNbThBD87QgnMXkcYew0WcGGRHWBm1yRXN0fVCppQ8gwi5g/htB2mSJbaA+oHkkDkiGqbwkI8U6Fj32pHGRqbPfHNsXdXjpTA90nbwoe5ddgLHiF5e2I9PTDmhYdh3diURIFXHnezu51MPIFr1WWwtVPcP0jWtmKh1HYtnnLDjJ1CSgSh5W2ZbmF1tn9fb1jDE90jKkVXdYl2a/wMhm2Ta/C0OHguWBua8eniYLo95gnnOmvNt7e2ZdBnfxrClOjE4tushbH8UnucawTi9bWXCKqjVDRbq6958R5kBa4NdExgJEFu1gXTFauqRxLsdcnQLBVTRDlsntzjUJWP3NeLlHfs25UpLeKKRr6oZ/IMwYgyXDZBwxBJYxNxNsiQsQ==|920
\ No newline at end of file
+}//3eVe78lRUnFAjEKodhpiTj41Y+SAGvJgtIEms0WQ/33avL0XR/7IP0vD7zQSZ6R2neIJ4vQi08uYCGzkBj19B4NUiUFfMutOy+xEt3q/eqfKBDrUDv0EIR8AzltoZMiuCdpYrTAs8OkFmMyjUapbE8MLwP8ozxX/sqjvAYgDt5HY7V/YcXVcDmzaZv0kBXKXjbpjcxQcm3BXye5j8jfWDucz7dJlXW/Rod0eCztgpL+ZeWUIdz+EMylmVb346WHk7S/oUpv1cIMwrtbNxbKY/h01nyfJ7deVNXldlDJ/JUaqYSN/5aSxYKWGnJzgO4AvPiArnNGflZtlr3rpAVesO/IHKGR2x0/eNmqOiDdvUDjkL/PFnVl56YIao1nycU5ZZqvKnZWPoZYeWJ6iVzuxeGHImtGr67inSOnNcTJKs+eJrGX/YpcL61oI/fm4aov5sCLPh9VlEkiv9AWtgS2prSPhoNly+D8jQ1lDuLQM9cNqMdqoO9KGnQxZ5zwrRZYoVBGtoj6OMPFo/MzKO1WmgUpT/ZYVhQwELCSTwZkdJyRvkDGzYJwmWJP3KP70GOcMKsp7/n33RUSsSOPV9jmoGSmQ49IAYES6Kkh7vtL9IDaxMImcjCbn3t+Y3OOvm+80OegLjhlDKsqACTWVtcui7W9Kl6xQG1eP+h/Zvp3Zib19K65HwmG4JjE3jtp2W0FZZm8U4/NitkeBNbnUZudvKLFFFqCMNuoXDd+PGvIbqQv4Oniw4FyoG0nh/d2yn7MmWKJZDbJM2p611xusmdOmCIU/zusFRV+0jWkYZV9MhotwZsO94RXb1A9tPiFdAJ4R3mxEFS0C1T+QG613bU6t1ePSLUCBEkA7DLnvmBPM0+dEcF3/saK7RREv+lW1U0q6SE7F5NRNNkD9N62G6hnOAA==|920
\ No newline at end of file
diff --git a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-基本信息.rd b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-基本信息.rd
index 80fb3783..a57cfa46 100644
--- a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-基本信息.rd
+++ b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-基本信息.rd
@@ -36,7 +36,7 @@
       "Formula": "'任务-基本信息'!$B$2"
     },
     {
-      "Name": "预算工时",
+      "Name": "任务预算工时",
       "Formula": "'任务-基本信息'!$L$8"
     },
     {
diff --git a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务首页.json b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务首页.json
index 1fbf2b89..7be24a72 100644
--- a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务首页.json
+++ b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务首页.json
@@ -266,10 +266,6 @@
       "CellType": {
         "$type": "Forguncy.ProcessPanelCellType, ServerDesignerCommon",
         "PreCommands": [
-          {
-            "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy",
-            "Title": "加载中"
-          },
           {
             "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
             "ConditionAndCommandPairList": [
@@ -288,33 +284,8 @@
                 },
                 "CommandList": [
                   {
-                    "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
-                    "ConditionAndCommandPairList": [
-                      {
-                        "Condition": {
-                          "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
-                          "param": {
-                            "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon",
-                            "tableData": {
-                              "TableName": "任务表",
-                              "ColumnName": "ID",
-                              "GUID": "a04039e0-c4a4-439c-8119-e20e50666bea"
-                            }
-                          },
-                          "value": "%Null%"
-                        },
-                        "CommandList": [
-                          {
-                            "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon",
-                            "TableName": "任务表",
-                            "UpdateType": "add",
-                            "ShowConfirm": false
-                          }
-                        ],
-                        "ID": "791a7806-e6f4-4a10-aab3-96e519552a5a"
-                      }
-                    ],
-                    "Disabled": true
+                    "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy",
+                    "Title": "加载中"
                   },
                   {
                     "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon",
@@ -373,12 +344,12 @@
                             "$type": "Forguncy.Model.StopCommand, ServerDesignerCommon"
                           }
                         ],
-                        "ID": "bc67c226-5448-4246-bc6c-0ebe52d784f9"
+                        "ID": "ede39ea8-39e9-4b86-8399-85896b98c721"
                       }
                     ]
                   }
                 ],
-                "ID": "d5ccd767-bc1f-48ed-926c-355ae99e2918"
+                "ID": "bfa4992e-3293-43cd-8f8e-6d6fbe8488a4"
               }
             ]
           }
@@ -426,7 +397,7 @@
                     "ID": "e2e848e0e72d48229c97757429d446a2"
                   }
                 ],
-                "ID": "59198566-e55f-47be-9f29-731b60f59105"
+                "ID": "7c4b0a3d-3755-4b23-9a61-12f66c32da9e"
               }
             ]
           },
@@ -640,7 +611,7 @@
                                 "MethodName": "Refresh"
                               }
                             ],
-                            "ID": "7ac9b29c-dfa8-4a12-825e-de0e25353180"
+                            "ID": "c655f7fe-6b99-40cf-b7d3-57589a206354"
                           },
                           {
                             "CommandList": [
@@ -655,12 +626,12 @@
                                 "BtnText": "知道了"
                               }
                             ],
-                            "ID": "59e82b0e-9c12-4a31-8624-dcac63ee2e05"
+                            "ID": "d535adf6-23fd-4d52-83a3-120534732081"
                           }
                         ]
                       }
                     ],
-                    "ID": "fde3e190-7ef2-41a3-a2be-89f787c94fdd"
+                    "ID": "471fb403-a9b2-4332-a305-c37da1931d6f"
                   }
                 ]
               }
@@ -798,7 +769,7 @@
                                             "ReloadData": true
                                           }
                                         ],
-                                        "ID": "3bd17dc4-5e13-4b65-8960-47c199a24da8"
+                                        "ID": "0d7801c3-f3fe-4e66-a402-6d235c7f0a18"
                                       },
                                       {
                                         "CommandList": [
@@ -813,12 +784,12 @@
                                             "BtnText": "知道了"
                                           }
                                         ],
-                                        "ID": "c1129a31-fcb1-42bc-a955-9d84ddc6168e"
+                                        "ID": "71b08563-6c1b-4096-90c5-7a01ed2fb8c5"
                                       }
                                     ]
                                   }
                                 ],
-                                "ID": "505d433e-c263-43df-9634-86f874dfece5"
+                                "ID": "e4f5d520-c6ac-49a3-bee0-b6d2c505a7b3"
                               },
                               {
                                 "CommandList": [
@@ -833,12 +804,12 @@
                                     "BtnText": "知道了"
                                   }
                                 ],
-                                "ID": "a02907a7-97b3-45ea-b58c-bd698fdaae24"
+                                "ID": "7849d7d2-79b0-41bc-8640-677ae7077e46"
                               }
                             ]
                           }
                         ],
-                        "ID": "8caf677b-db21-496f-8cb7-3473a183fd6f"
+                        "ID": "0e701c97-300d-4df4-b4db-980da2b6e87c"
                       }
                     ]
                   }
@@ -979,7 +950,7 @@
                             }
                           }
                         ],
-                        "ID": "c571a144-b192-4166-bffc-169ad95e0eeb"
+                        "ID": "567dbb19-9fa2-4443-8e14-a89a9f3cc322"
                       }
                     ]
                   },
@@ -1020,12 +991,12 @@
                             }
                           }
                         ],
-                        "ID": "ed870e94-e146-4b52-84a4-edbf909393cd"
+                        "ID": "d3818552-b5db-4e6d-9951-f880b06cc489"
                       }
                     ]
                   }
                 ],
-                "ID": "9a859422-ade9-4dc1-abd6-e32bcfbe3c6c"
+                "ID": "9e28b9c2-9b77-44ac-a97e-855629b10041"
               }
             ]
           }
@@ -1086,7 +1057,7 @@
                     }
                   }
                 ],
-                "ID": "a113c830-d449-4ddb-8266-e31ab39c3869"
+                "ID": "e01c2139-a766-49d0-8e78-352b7cae9987"
               }
             ]
           },
@@ -1127,7 +1098,7 @@
                     }
                   }
                 ],
-                "ID": "04721a90-70c5-4722-a4d6-a6ef5c7ff12c"
+                "ID": "00da299b-7409-4d73-afd4-04b002f9aacc"
               }
             ]
           }
@@ -1242,7 +1213,7 @@
                     "Disabled": true
                   }
                 ],
-                "ID": "2e8b5ac9-668f-4ad1-9c34-cdb70be4d6c4"
+                "ID": "1c69021b-9863-4162-8e76-e2339b362242"
               }
             ]
           }
@@ -1420,7 +1391,7 @@
                     ]
                   }
                 ],
-                "ID": "83a89b02-eb34-487b-ba2a-34bfddd79acf"
+                "ID": "6aa1d6b9-a2a4-4585-91b6-0c8a28b4fd3e"
               },
               {
                 "CommandList": [
@@ -1437,7 +1408,7 @@
                     ]
                   }
                 ],
-                "ID": "92303d8f-45a9-4a24-95af-73fa2612f7ab"
+                "ID": "a79cdf27-ad04-4aa7-b785-9606b10381b2"
               }
             ]
           },
@@ -2211,4 +2182,4 @@
       "Formula": "任务首页!$Y$8"
     }
   ]
-}//hjZ8zWZItALZHkVS2AhaHOGZT3aWnJWZrgnmrHNC13CbtDaFfyn5x0p6VaMwWCUhAgulgzWxlbnmDyb4qkqRCw6hQPKVbXQr2eG4rwBWDMX9cif9XHSpXWSRBlQ7uTyxcQN6m+nSC02mqKlfvT+J++rJCDf1oPIzAnVB9UNMYoh1WHuLaC61kXlfkwokEOtfzQr9Hx+IgAYnmqBJZ7N3vHz7NtVrkkt9axhHZaFBDKhkwA0oFp1Be4uHiKgH8HYfPcEpUAqEs0zrqH9y+fHIpkqV8m0YmefxkOS0vS2meXtjUBAQnG2j8zpwA5ByKfIc4+nSmJZDOVXADr6K7n9uKSaWnoOBCj3ob7f1c6u01RX4CsVrNOY1geBQ4Ad8IfzH5WmVOV2cjv/E69AOJ09CJ/IcmlmhWK4iLuf82JPRNTDLBFV3VEcXAu5w0hfxRrVAkH+3jQ1jOtwlBvv4gmc7nYIjY/TOdSfrfiEmskuPgIohxcziv80bGy6vozvHAEfE77zUCF7PTVm183Fz6G3fjMXq8gLK0jz3ZqrwVP3/6V7Gsw3sZnGZxwlAEUtYlFqnCXarvLvPmlNPEKTgGfGzFggoI0uDWdGGtioDI/6yfcHmUtZjoVBA9x9KQdqTk7g2GeY4hD2OK4edF0fPUK4qqWDcGZU5hfVWpEfknkacdCcfS1OdEongq8+JpxUqkdjNnKeFLaB9jv0lfovvlOKPywLqdTajA22c0VLI8pR0qQI1R1gjrPkROWxHhx5xdqb2Q59TeUwJj1h7CKfJDbGEdmUyEjnXVUlvetL8n4UsRAs1DL8RhHXK2RunyVDaui5tYOQjglsl5NpCtxCMo0ymVnFbkk4QOW/3kfeFIQ8DbxCIvlf0xxpwTsPF6A1TU6iluLrnNZKSIbNKNFjs4jqXdw==|920
\ No newline at end of file
+}//jLYOabpmxvfkYjCLExmB4+GIUm4iOncnBf8Cr2Teuit8cFJpFoMp7wuMlrGgXX/ZESrAv72t3t8mMMFrzCXfOidO4E21NfkvDt2yY9KISECyGC7ndl/tjTJzIgrDArvgRKA+9XccjjTdcIoHOaYn3elER4rmOfS8I7jSfpptg05hW9SUYnpgCEv3PubzEIn7C35USzDh+yvPzRKjWOVPCcp/G2eh6tjjIU5tfy2ejMfsy24L0L7ZShyZYtCg/pfA1Z7Fv/qIUDf9HAJoOiUosbViwF0OooO5/+19BffIyTkvHbZrQHM5vVKI7fQ1ltu5AE4yKzgrX6VLZ30G5ffAhBkB7v5uoujn8VoIXXoC9Yt5ksGH20vsKNLKr2YiQV5hv7AxXTmuZlsk4g7o6NKYJm+hCH5ZvHC9cCr9pmAavkRxov7e8CLBNUVXC599fQnDpzZv35CVdwOrDHCDOHxyGNRspRsDk3sNrJgBjsK61aeYPjRlMePVqXL8uQd0xGokvgEGb6JXBmXKSPwUAsIHfA5HnlW629aBr/WDHN77W1dwRd09UlsEMlOsWXzZiheKEhio9QCN1NsMdVsSsQvQ7hXTKgdHMJOuQISdKL5PImDqABv4+32zpJ6YqdSyPOkzkuuGVgyGADUcIsG9Cr41vhCrTyoF94OMOdd2AjgCRFi0ejOSGyKuW11NBY22H0r/l5KW91DcsBDuIFwBULioG+zg9Nz40aHICh3A0qk11u3YPI2OwV+fx94BYbG0uW6RI9h+9ERW5bjAOSgcdRgBIFUmzTupqbPL3Y6NT2eBz1l2HOGY4iDJx31wwEb5SsNWS0QfAo3P3P6DJWcUmFHb8lURdbmRWyHpgYHBJWLggrmaDCcQe8BzYoHu++wPrLqkPvvWgV9I/Pmowjt0x1Tprw==|920
\ No newline at end of file
diff --git a/ServerCommands/任务/任务发起流程前校验.json b/ServerCommands/任务/任务发起流程前校验.json
index 0d507ad3..c0945006 100644
--- a/ServerCommands/任务/任务发起流程前校验.json
+++ b/ServerCommands/任务/任务发起流程前校验.json
@@ -272,7 +272,7 @@
                     "Message": "请等待项目审批通过后，再提交任务！"
                   }
                 ],
-                "ID": "f8b5e7f3-00ef-4e09-9ce6-b035b4f70847"
+                "ID": "22b2d6de-7bb9-4e3c-8f65-bcd1fd96e82a"
               }
             ]
           },
@@ -316,7 +316,7 @@
                     "Message": "请等待父任务审批后方可发起！"
                   }
                 ],
-                "ID": "ef38b985-d9e1-483a-8626-94d214462be6"
+                "ID": "56e31c0e-11c3-406c-8c8a-6496fd91c8f7"
               }
             ]
           },
@@ -342,7 +342,7 @@
                     "Message": "当前项目未指定项目经理，请指定后再试"
                   }
                 ],
-                "ID": "68eb382f-7448-4f15-861c-5608a56988c3"
+                "ID": "71e77017-c80d-4dfb-9a3b-4b5b388d3188"
               }
             ]
           },
@@ -368,7 +368,7 @@
                     "Message": "请指定任务负责人"
                   }
                 ],
-                "ID": "f7faadeb-4a30-4089-b4d9-fce5ac96f82e"
+                "ID": "70014849-f50b-458d-b818-ac81387b4aed"
               }
             ]
           },
@@ -394,7 +394,7 @@
                     "Message": "请指定任务类型"
                   }
                 ],
-                "ID": "8ff9c322-de33-4e3c-9aa8-8b9cf4cf639d"
+                "ID": "8141318f-3dcc-40f7-b304-803bde2092d7"
               }
             ]
           },
@@ -440,7 +440,7 @@
                             "ID": "dce9e9bfa9454e68a44bc81b7559c096"
                           }
                         ],
-                        "ID": "f9407393-a4db-4779-8f19-4a4bf9677c81"
+                        "ID": "0b704e73-3c18-4106-8f2d-d92e823f930d"
                       },
                       {
                         "CommandList": [
@@ -454,7 +454,7 @@
                             "ID": "149f6070b4f94a4aa8f1b7106553337a"
                           }
                         ],
-                        "ID": "c53a77d0-d7a7-462d-abd3-a3616bfe1a53"
+                        "ID": "3f91d516-4b0f-4106-aa90-a02a3331d719"
                       }
                     ],
                     "Comments": "严格模式下，根据是否有父任务来计算本次预算工时的上限"
@@ -488,42 +488,12 @@
                             }
                           }
                         ],
-                        "ID": "cd14eff8-c261-4f46-8c1d-747354d1eeb2"
-                      }
-                    ]
-                  },
-                  {
-                    "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
-                    "ConditionAndCommandPairList": [
-                      {
-                        "Condition": {
-                          "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
-                          "param": {
-                            "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon",
-                            "ParamObject": {
-                              "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                              "SerializeProperty": "=任务信息.任务预算工时"
-                            }
-                          },
-                          "value": "0",
-                          "compareType": 5
-                        },
-                        "CommandList": [
-                          {
-                            "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon",
-                            "ErrorCode": "400",
-                            "Message": {
-                              "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                              "SerializeProperty": "=\"开启严格模式下，任务预算工时不能为0\""
-                            }
-                          }
-                        ],
-                        "ID": "b0d3ffef-55b3-4e82-907c-d0467ea43287"
+                        "ID": "917fb3b9-fdcc-4270-ad70-f769a27114d4"
                       }
                     ]
                   }
                 ],
-                "ID": "0f7b8557-7b4c-47d0-bd4e-7bcebb9e6326"
+                "ID": "5ccb26b1-c610-439a-bbce-682fd3f1ff6e"
               }
             ],
             "Comments": "校验工时情况是否通过"