diff --git a/.collaboration b/.collaboration
index 29729756..2cdf8455 100644
--- a/.collaboration
+++ b/.collaboration
@@ -794,31 +794,11 @@
   },
   {
     "ModuleName": "PCPage/任务工时统计",
-    "State": 1,
-    "LockedBy": {
-      "UserName": "超哥",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-07-30T17:46:11.263483+08:00",
-    "ModuleType": 1,
-    "ToRemoveFiles": [
-      "Pages\\工时\\任务工时统计.json",
-      "Pages\\工时\\任务工时统计.rd"
-    ]
+    "ModuleType": 1
   },
   {
     "ModuleName": "PCPage/人员工时统计",
-    "State": 1,
-    "LockedBy": {
-      "UserName": "超哥",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-07-30T17:31:06.0508147+08:00",
-    "ModuleType": 1,
-    "ToRemoveFiles": [
-      "Pages\\工时\\人员工时统计.json",
-      "Pages\\工时\\人员工时统计.rd"
-    ]
+    "ModuleType": 1
   },
   {
     "ModuleName": "Pages/个人中心",
@@ -890,17 +870,7 @@
   },
   {
     "ModuleName": "MasterPCPage/FGC_母版页",
-    "State": 1,
-    "LockedBy": {
-      "UserName": "超哥",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-07-30T17:50:26.5041984+08:00",
-    "ModuleType": 3,
-    "ToRemoveFiles": [
-      "MasterPages\\FGC_母版页.json",
-      "MasterPages\\FGC_母版页.rd"
-    ]
+    "ModuleType": 3
   },
   {
     "ModuleName": "MasterPages/流程母版页面文件夹",
@@ -1444,47 +1414,7 @@
   },
   {
     "ModuleName": "Plugin",
-    "State": 1,
-    "LockedBy": {
-      "UserName": "超哥",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-07-30T18:08:18.1350469+08:00",
-    "ModuleType": 40,
-    "ToRemoveFiles": [
-      "Plugin\\Echarts图表-10_0_3_0.zip",
-      "Plugin\\Editormd-6_0_102_0.zip",
-      "Plugin\\Forguncy.CustomMenu.zip",
-      "Plugin\\JSON 序列化和反序列化-10_0_2_0.zip",
-      "Plugin\\JSON数据源-10_0_2_0.zip",
-      "Plugin\\Lottie动画插图-10_0_2_0.zip",
-      "Plugin\\Notiflix-9_0_103_0.zip",
-      "Plugin\\OPENAI套件-10_0_3_0.zip",
-      "Plugin\\PC组件包-格友工作室定制版-10_0_2_0.zip",
-      "Plugin\\SqlServerWrapper.zip",
-      "Plugin\\Tiny富文本编辑器-10_0_2_0.zip",
-      "Plugin\\UI操作工具箱-9_0_6_0.zip",
-      "Plugin\\Unlayer-9_0_103_0(1).zip",
-      "Plugin\\xTools快速开发工具包-9_0_4_0(1).zip",
-      "Plugin\\发送HTTP请求命令-10_0_2_0.zip",
-      "Plugin\\取消当前行-9_0_103_0.zip",
-      "Plugin\\增强关闭页面-9_0_6.zip",
-      "Plugin\\复制到剪贴板-7_0_3_0.zip",
-      "Plugin\\客户端缓存操作工具库-8_0_0_0.zip",
-      "Plugin\\富文本编辑器-10_0_2_0.zip",
-      "Plugin\\对象与集合操作工具-8_0_0_0.zip",
-      "Plugin\\异步运行命令-9_0_103_0.zip",
-      "Plugin\\支持预览的附件上传-10_0_2_0.zip",
-      "Plugin\\服务端缓存操作工具库-8_0_3_0.zip",
-      "Plugin\\模板引擎操作库-9_0_103_0.zip",
-      "Plugin\\用户管理命令 V2-10_0_2_0.zip",
-      "Plugin\\网络操作库-9_0_102_0.zip",
-      "Plugin\\裁剪并上传图片-9_0_102_0.zip",
-      "Plugin\\设置当前行命令-10_0_2_0.zip",
-      "Plugin\\设置焦点命令-10_0_2_0.zip",
-      "Plugin\\豪~豪插件合集-7_0_102_0(1).zip",
-      "Plugin\\超哥富文本增强工具包-9_0_103_0.zip"
-    ]
+    "ModuleType": 40
   },
   {
     "ModuleName": "PublishSetting",
diff --git a/MasterPages/FGC_母版页.json b/MasterPages/FGC_母版页.json
index 659d2f3d..73ed62e9 100644
--- a/MasterPages/FGC_母版页.json
+++ b/MasterPages/FGC_母版页.json
@@ -281,9 +281,13 @@
             ],
             "CanVisitRoleList": [
               "Administrator",
+              "小组主管",
               "项目经理",
+              "客服经理",
+              "商务经理",
               "项目总监",
               "商务总监",
+              "客服总监",
               "财务"
             ]
           },
@@ -1121,7 +1125,7 @@
                                                           "IsOpenInNewTab": true
                                                         }
                                                       ],
-                                                      "ID": "3b1635e6-f847-4682-82e7-6507d68a5ebb"
+                                                      "ID": "d839f840-c9a9-4750-a9d4-c33754158175"
                                                     },
                                                     {
                                                       "CommandList": [
@@ -1142,12 +1146,12 @@
                                                           ]
                                                         }
                                                       ],
-                                                      "ID": "af15a299-305b-4790-9fe6-77d476bf28f0"
+                                                      "ID": "2a56e2a9-fc31-4ee1-a57d-415055c042de"
                                                     }
                                                   ]
                                                 }
                                               ],
-                                              "ID": "c1e7f114-7ec9-4bc9-b0de-cac83eb2dc63"
+                                              "ID": "c04def1d-1ba4-4c16-a21d-471ea6b0d560"
                                             },
                                             {
                                               "Condition": {
@@ -1197,7 +1201,7 @@
                                                           ]
                                                         }
                                                       ],
-                                                      "ID": "5b1019ab-71f5-477a-94e3-13e4b0db56fd"
+                                                      "ID": "1dfd5dfc-ebe7-4ed3-842f-b85f0f6d093d"
                                                     },
                                                     {
                                                       "Condition": {
@@ -1231,7 +1235,7 @@
                                                           ]
                                                         }
                                                       ],
-                                                      "ID": "77a4c0ee-54c9-4523-a912-3a0267987992"
+                                                      "ID": "7da51805-d2c5-4a5c-ad01-3d1664e14fd1"
                                                     },
                                                     {
                                                       "Condition": {
@@ -1267,7 +1271,7 @@
                                                           ]
                                                         }
                                                       ],
-                                                      "ID": "88dd8ba8-7e08-4830-8790-c2ebe7b49405"
+                                                      "ID": "bec1b13e-bec8-4261-8182-4fa2d0d46d9a"
                                                     },
                                                     {
                                                       "Condition": {
@@ -1302,17 +1306,17 @@
                                                           ]
                                                         }
                                                       ],
-                                                      "ID": "4944ad7b-d0c2-464d-9c12-e193326d38ca"
+                                                      "ID": "348e2b08-294c-45db-854d-8cc42df3e0d8"
                                                     }
                                                   ]
                                                 }
                                               ],
-                                              "ID": "965a9780-0b87-4355-87ff-e929ce0acefc"
+                                              "ID": "5aef6ae3-0a38-4bd1-8051-108ca7a0e4b9"
                                             }
                                           ]
                                         }
                                       ],
-                                      "ID": "0360d767-6777-4099-920d-30eb3a99dde9"
+                                      "ID": "06333351-73cc-48ab-9126-aee165aa1116"
                                     }
                                   ]
                                 }
@@ -1325,7 +1329,7 @@
                             }
                           }
                         ],
-                        "ID": "478f711d-6cdb-4d57-834f-f4e07f9b72e6"
+                        "ID": "a29500f0-a1ca-43fd-a657-40a71b2aa423"
                       },
                       {
                         "Condition": {
@@ -1432,7 +1436,7 @@
                                                           "IsOpenInNewTab": true
                                                         }
                                                       ],
-                                                      "ID": "fa1e6083-8f21-41ae-b2e7-a18305b0f8e0"
+                                                      "ID": "cb92698c-cb95-41cc-9eb4-d543622cb8c7"
                                                     },
                                                     {
                                                       "CommandList": [
@@ -1453,12 +1457,12 @@
                                                           ]
                                                         }
                                                       ],
-                                                      "ID": "395fca7f-0651-472e-b111-2f5c48bf6487"
+                                                      "ID": "a1558a7d-3a37-4835-b3bf-e5e668558368"
                                                     }
                                                   ]
                                                 }
                                               ],
-                                              "ID": "44cd7f28-4e74-491b-8ab1-1543880491b0"
+                                              "ID": "0be59b02-7f3e-4e51-a831-88d8e144b628"
                                             },
                                             {
                                               "Condition": {
@@ -1508,7 +1512,7 @@
                                                           ]
                                                         }
                                                       ],
-                                                      "ID": "defc48b9-9966-43f2-96ce-f9793d0fd482"
+                                                      "ID": "bb52b699-0da0-4b9c-9a71-d86978eb12e1"
                                                     },
                                                     {
                                                       "Condition": {
@@ -1542,7 +1546,7 @@
                                                           ]
                                                         }
                                                       ],
-                                                      "ID": "011eb68a-0085-4143-8779-07e36ab0b0b2"
+                                                      "ID": "ceeec16f-8c3f-464c-9314-bc86c3a26cfb"
                                                     },
                                                     {
                                                       "Condition": {
@@ -1578,7 +1582,7 @@
                                                           ]
                                                         }
                                                       ],
-                                                      "ID": "12d12f57-e63f-410c-875c-cb6bc3f0ac51"
+                                                      "ID": "69fb0336-13fb-4ab9-a02f-b586bfe4831d"
                                                     },
                                                     {
                                                       "Condition": {
@@ -1613,17 +1617,17 @@
                                                           ]
                                                         }
                                                       ],
-                                                      "ID": "1b0364f4-e8bb-459a-93ad-8961983205d2"
+                                                      "ID": "ed824906-9079-439e-a4e0-b2bd9b608f84"
                                                     }
                                                   ]
                                                 }
                                               ],
-                                              "ID": "ee654349-52d2-434a-a73d-05d7657e3576"
+                                              "ID": "e2854e1a-f5d0-4077-87ac-547ee258874d"
                                             }
                                           ]
                                         }
                                       ],
-                                      "ID": "c263206d-3faa-441f-ac79-c34005d9f291"
+                                      "ID": "1440d62a-8d32-42c9-aede-a9cb63772f4c"
                                     }
                                   ]
                                 }
@@ -1636,7 +1640,7 @@
                             }
                           }
                         ],
-                        "ID": "58b7ee1b-7122-4165-9d34-997a6c6ae499"
+                        "ID": "50429e08-8f7a-4fd4-9b35-3f39d68d9406"
                       },
                       {
                         "Condition": {
@@ -1743,7 +1747,7 @@
                                                           "IsOpenInNewTab": true
                                                         }
                                                       ],
-                                                      "ID": "39f0d6dd-fc60-4661-9ebf-78fe6b16cdc7"
+                                                      "ID": "4bfb102f-56f6-4678-98f1-1c36a5150ac1"
                                                     },
                                                     {
                                                       "CommandList": [
@@ -1764,12 +1768,12 @@
                                                           ]
                                                         }
                                                       ],
-                                                      "ID": "12a1f674-b78d-4478-be10-b94eabbfd656"
+                                                      "ID": "3bfd7439-751b-4e7c-ab38-9413e69fbb9f"
                                                     }
                                                   ]
                                                 }
                                               ],
-                                              "ID": "97e4015c-3e1b-4163-8baa-d8de55cc6977"
+                                              "ID": "92ae5aab-8b21-46df-b2cf-1231e7749daa"
                                             },
                                             {
                                               "Condition": {
@@ -1819,7 +1823,7 @@
                                                           ]
                                                         }
                                                       ],
-                                                      "ID": "418f83e1-57a7-493d-a897-26f6a63ec3dc"
+                                                      "ID": "667b1a14-0682-426f-a319-15dccae4c9dd"
                                                     },
                                                     {
                                                       "Condition": {
@@ -1853,7 +1857,7 @@
                                                           ]
                                                         }
                                                       ],
-                                                      "ID": "05650940-6679-4503-9fa1-7de04c579816"
+                                                      "ID": "2da8871e-985d-46d0-867a-33f2e0d5f9b8"
                                                     },
                                                     {
                                                       "Condition": {
@@ -1889,7 +1893,7 @@
                                                           ]
                                                         }
                                                       ],
-                                                      "ID": "b34f844a-f831-4a7d-8134-1d7ec1d912a6"
+                                                      "ID": "92018344-44e5-47a3-9b60-b9f4bfff74c3"
                                                     },
                                                     {
                                                       "Condition": {
@@ -1924,17 +1928,17 @@
                                                           ]
                                                         }
                                                       ],
-                                                      "ID": "8e742b1e-fca1-4b84-9d74-e7ba684b02a7"
+                                                      "ID": "88eabf38-b900-43e6-b4f5-f69c801c62bc"
                                                     }
                                                   ]
                                                 }
                                               ],
-                                              "ID": "eb19d75c-f54c-48a6-8b28-e96e0bb1c8a6"
+                                              "ID": "96b10e37-d791-4f5c-b6c0-0549e20c92e7"
                                             }
                                           ]
                                         }
                                       ],
-                                      "ID": "094b855f-a5d5-42cc-80db-4dc07dd67c66"
+                                      "ID": "e06d3cd8-7dd3-4ef5-b7f9-ceeeeb91cc10"
                                     }
                                   ]
                                 }
@@ -1947,7 +1951,7 @@
                             }
                           }
                         ],
-                        "ID": "11ca15f5-c5de-452a-a414-5b1530a26e30"
+                        "ID": "1ea4c291-f98d-464d-938d-ecfe068268e0"
                       },
                       {
                         "Condition": {
@@ -2054,7 +2058,7 @@
                                                           "IsOpenInNewTab": true
                                                         }
                                                       ],
-                                                      "ID": "7c8bfb19-a3fe-4936-b3a4-fbec04110cee"
+                                                      "ID": "9dd4f741-8d48-4d32-9143-f2dc82292a1b"
                                                     },
                                                     {
                                                       "CommandList": [
@@ -2075,12 +2079,12 @@
                                                           ]
                                                         }
                                                       ],
-                                                      "ID": "f90da67c-2bf2-4767-8665-e2e544466ff0"
+                                                      "ID": "c2651331-a61f-4876-9941-d827a5a829b3"
                                                     }
                                                   ]
                                                 }
                                               ],
-                                              "ID": "6603d559-53ec-4952-af5d-5c28adfd94a1"
+                                              "ID": "79cbaeff-5f84-4dd1-9867-1e093c4c7ed2"
                                             },
                                             {
                                               "Condition": {
@@ -2130,7 +2134,7 @@
                                                           ]
                                                         }
                                                       ],
-                                                      "ID": "e5582fa9-5153-404c-b35f-b84d910ad731"
+                                                      "ID": "15ca4452-fe2f-4062-ad17-0ad90af27ecf"
                                                     },
                                                     {
                                                       "Condition": {
@@ -2164,7 +2168,7 @@
                                                           ]
                                                         }
                                                       ],
-                                                      "ID": "6113b4e0-7665-4b37-ac03-0e8e42e6ba0c"
+                                                      "ID": "372b0823-99be-43e1-8eda-03a060585aaa"
                                                     },
                                                     {
                                                       "Condition": {
@@ -2200,7 +2204,7 @@
                                                           ]
                                                         }
                                                       ],
-                                                      "ID": "7382d13b-fcb5-456d-95bb-e7b6acac6eb7"
+                                                      "ID": "bb60c125-fafb-4a17-8c79-7ea3652a79dc"
                                                     },
                                                     {
                                                       "Condition": {
@@ -2235,17 +2239,17 @@
                                                           ]
                                                         }
                                                       ],
-                                                      "ID": "a7c532fe-560e-4e8e-acde-1a919fa0d4d8"
+                                                      "ID": "94142a47-0672-4c98-841e-7d3ae819e2aa"
                                                     }
                                                   ]
                                                 }
                                               ],
-                                              "ID": "15dc8e8f-2215-4617-b4ca-d9852d184c72"
+                                              "ID": "da7a6c88-452e-4f45-98b5-804a184e8f8a"
                                             }
                                           ]
                                         }
                                       ],
-                                      "ID": "142444da-a098-43b3-a79b-bcfa724829cc"
+                                      "ID": "861ced25-0838-461a-9c66-adfc28f2c887"
                                     }
                                   ]
                                 }
@@ -2258,12 +2262,12 @@
                             }
                           }
                         ],
-                        "ID": "8b168c3f-d2f7-457f-9aec-034962d3c1fc"
+                        "ID": "1cce48f9-1522-4714-aec7-cae19cd6923a"
                       }
                     ]
                   }
                 ],
-                "ID": "a5d1e501-721e-46ba-8214-1a86e9e0221f"
+                "ID": "c05441e3-2ef0-4266-9d4c-f514cf2470c7"
               },
               {
                 "Condition": {
@@ -2346,12 +2350,12 @@
                             }
                           }
                         ],
-                        "ID": "59053883-07ea-4e5e-a25d-100aaf4cc063"
+                        "ID": "af97ca70-6921-47f4-97e8-5199f03b9325"
                       }
                     ]
                   }
                 ],
-                "ID": "5067d0fb-e5af-4fad-9a65-02f8bb6bbcd7"
+                "ID": "bb9d54cf-f0a5-4e87-aea3-83f99d07b78e"
               }
             ]
           }
@@ -2396,7 +2400,7 @@
                     ]
                   }
                 ],
-                "ID": "53069b0e-f1fc-4d89-b814-ed414a3baf64"
+                "ID": "822fbadd-f425-4420-b035-c4cb8abe42b1"
               }
             ]
           }
@@ -2469,4 +2473,4 @@
       "Formula": "FGC_母版页!$C$7"
     }
   ]
-}//Wqu7YmgvtMTsg6VtZuBZXRo6EbICrZzaO/rlzUnkbmu6gOcZUu+uDicsNUuil+uSwESS70Xgag0uwSVfJw+Yttn5NdvZ2lU1/tC2H4rEbhOPmIEMVMaVhgYIju2nBZzWv4ScYRiE3w+GqrLhjg3sGpcG1XenwJZlr9yZ73bB4YRDKZAxDI1CTcgf02Bjxd25D0ZPg4Goc6LI88X/W0hyKNmsHIPZoz0fN97SX7m3Cpf/PdpkbATQVTbssp1UGaZKYL40mu3bFq+TrGHrfU0/3kjPoAWQZ/kKsla+nECEgu/otl+EF1hgrYnQH8aKkRpsJUOEA7oKwAAl6lhSS6L/5KwND7aeNwa/1WYvoz/XgiyB2Evi2Pz5NqG4ykFKTgGNizMDGOXs/ly98O/EWGEqB43QffTpy3zEGtZY4T0FuktJ3tvzBPirF9Dwg/pv44229k1uz9zPWEzYAuPlCv9Wdvj6ca5DMyLj93RfOFZ/Eq4on9sjDLVQBd30q0k7lxiCOk60w6b0Q6Soh3I0KRt11CAajp9NKK2cxbggZ53ZksRZ+fxrkQNripnYXUrEF7snBRq2aKnAGH6nBF1OVYjYebhLAknRJ86ERVHWm2A55M9F9q9cDi4182Hl30n0HOlWYRCLJDeSx9PiHRmC/rV4trfhGbK+HiaPvnCdI/bp1WIv4Kf0ckCMPbXBXV6azZXLxgbgEIIkdDUR0qMj0CWDdEmiE5qtxcQRxC7CFRtgdQ8NGCH+9d36azjll5SKIhBeuEJy/j6L5bUMLtOUSKYbX62er20wsNi28UKeh/Bn95pBgnFNotHVtASgUkzzz1RPoT2sc+WZC+jg3dUzqrFIVui94RNgIHanGfjotfKUNLGP8USoUM0C7j/UJOhwXJI/LtTzjPgv1LZDJesIDYKKqA==|920
\ No newline at end of file
+}//+8Ibe4cN3AmaykhUfmIywaT5/ZtnZNKCXEgyZKps38grV0fcieMCBuzV59sSSCHJmsmyxV74BSH52AjCt63fJXofQI+zMQP/bH4eAmIn03EfKJIMgEe7nkt+je8cVqfbSedo5UM2ynrgROqoc8F19GmGDlT2EShYatBLX4EhZyYha+BahH21RhhpYhcLuK3eFkDAJkPZcSPVul4HJvTuoPigY9e8RtWQZ8XZ+5TP8m5oEmhGIA6CadZrlR7/85Xhm+pYIusYIoUs0VE1SzahRJi5jjRNRw+QUHjK/zsEG/AeYzBpN27PrmPIpMz3Ea7q7civcrkgxHTHWxzxKO//8YLIWrV/0R1BNWOtvphRiOJY7tw7ZVIPpTJhAT0NyUDeX1OOIsFV4xg1W9M4IIYKMQN2lw04D4+jhXcg5eiV/u+Jin4OgDLA3MwMpHpFml9MZ6qUB4PkX98Z20M5LmMrmAYdu2b0JDWmAuaA078L7jEcyBFTObX/2Ru4joVsSrPkZvM75lZ/pIKHPc6LjgsbXsTKLhfuseUFCxjNMlwXpqjk4e/b2lf+s1lYfrALgL56mVV5Fp7PkNTmch8kSEFWVMGDvDvCk26jf3j2nFcau7Ypo5yqsBybYXzgCAHbJyV/ZuV8oINvu4zwdPUDNJuBI2Fph8WAAAPiGVjPfyOMwMenVgUkHk2fM/70HbR28es/J3iCp1fsVb0dfbJINcSnHAx/jYJFlAJZSywbeMxAGr61bPmz/pCKRtXRI/xWxiIpzboMZl/t0jzHzbpyqBSPPbbmAmwboFVBcBeDJL4+j2rzJhEU6koNzktnA5yGoSXxlqU9XHmaAtHdGUBotfX+bFVUD/sIb9N25YoHSrBjl+nsxpTG+epm9j18aw4xKLX09f8ab5/3SxNBONtQXBq1Zw==|920
\ No newline at end of file
diff --git a/Pages/工时/人员工时统计.json b/Pages/工时/人员工时统计.json
index c7c59424..0760e514 100644
--- a/Pages/工时/人员工时统计.json
+++ b/Pages/工时/人员工时统计.json
@@ -6,24 +6,19 @@
           "DesignLengthInPixel": 32.0
         }
       },
-      "1": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 40.0
-        }
-      },
       "2": {
         "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 51.0
+          "DesignLengthInPixel": 15.0
         }
       },
       "3": {
         "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 32.0
+          "DesignLengthInPixel": 40.0
         }
       },
       "4": {
         "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 32.0
+          "DesignLengthInPixel": 51.0
         }
       },
       "5": {
@@ -67,6 +62,16 @@
         }
       },
       "13": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "14": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "15": {
         "GridRowColumnDefinition": {
           "DesignLengthInPixel": 272.0,
           "Mode": 2,
@@ -78,13 +83,46 @@
           }
         }
       },
-      "14": {
+      "16": {
         "GridRowColumnDefinition": {
           "DesignLengthInPixel": 15.0
         }
+      },
+      "20": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 45.0,
+          "IsHidden": true
+        }
+      },
+      "17": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 45.0
+        }
+      },
+      "18": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 45.0
+        }
+      },
+      "19": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 45.0
+        }
+      },
+      "21": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 45.0
+        }
       }
     },
-    "Count": 15,
+    "InLogicalVisibleIndexes": [
+      17,
+      18,
+      19,
+      20,
+      21
+    ],
+    "Count": 22,
     "DefaultSize": 32.0
   },
   "Cols": {
@@ -96,324 +134,503 @@
       },
       "1": {
         "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 49.0,
-          "Mode": 2,
-          "MinLength": {
-            "Unit": 1
-          },
-          "MaxLength": {
-            "Value": 1.0
-          }
+          "DesignLengthInPixel": 32.0
         }
       },
       "2": {
         "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 49.0,
-          "Mode": 2,
-          "MinLength": {
-            "Unit": 1
-          },
-          "MaxLength": {
-            "Value": 1.0
-          }
+          "DesignLengthInPixel": 32.0
         }
       },
       "3": {
         "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 49.0,
-          "Mode": 2,
-          "MinLength": {
-            "Unit": 1
-          },
-          "MaxLength": {
-            "Value": 1.0
-          }
+          "DesignLengthInPixel": 32.0
         }
       },
       "4": {
         "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 49.0,
-          "Mode": 2,
-          "MinLength": {
-            "Unit": 1
-          },
-          "MaxLength": {
-            "Value": 1.0
-          }
+          "DesignLengthInPixel": 32.0
         }
       },
       "5": {
         "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 49.0,
-          "Mode": 2,
-          "MinLength": {
-            "Unit": 1
-          },
-          "MaxLength": {
-            "Value": 1.0
-          }
+          "DesignLengthInPixel": 32.0
         }
       },
       "6": {
         "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 49.0,
-          "Mode": 2,
-          "MinLength": {
-            "Unit": 1
-          },
-          "MaxLength": {
-            "Value": 1.0
-          }
+          "DesignLengthInPixel": 32.0
         }
       },
       "7": {
         "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 49.0,
-          "Mode": 2,
-          "MinLength": {
-            "Unit": 1
-          },
-          "MaxLength": {
-            "Value": 1.0
-          }
+          "DesignLengthInPixel": 32.0
         }
       },
       "8": {
         "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 49.0,
-          "Mode": 2,
-          "MinLength": {
-            "Unit": 1
-          },
-          "MaxLength": {
-            "Value": 1.0
-          }
+          "DesignLengthInPixel": 32.0
         }
       },
-      "9": {
+      "29": {
         "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 49.0,
-          "Mode": 2,
-          "MinLength": {
-            "Unit": 1
-          },
-          "MaxLength": {
-            "Value": 1.0
-          }
+          "DesignLengthInPixel": 32.0
         }
       },
-      "10": {
+      "30": {
         "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 49.0,
-          "Mode": 2,
-          "MinLength": {
-            "Unit": 1
-          },
-          "MaxLength": {
-            "Value": 1.0
-          }
+          "DesignLengthInPixel": 32.0
         }
       },
-      "11": {
+      "31": {
         "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 49.0,
-          "Mode": 2,
-          "MinLength": {
-            "Unit": 1
-          },
-          "MaxLength": {
-            "Value": 1.0
-          }
+          "DesignLengthInPixel": 32.0
         }
       },
-      "12": {
+      "32": {
         "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 49.0,
-          "Mode": 2,
-          "MinLength": {
-            "Unit": 1
-          },
-          "MaxLength": {
-            "Value": 1.0
-          }
+          "DesignLengthInPixel": 32.0
         }
       },
-      "13": {
+      "33": {
         "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 49.0,
-          "Mode": 2,
-          "MinLength": {
-            "Unit": 1
-          },
-          "MaxLength": {
-            "Value": 1.0
-          }
+          "DesignLengthInPixel": 32.0
         }
       },
-      "14": {
+      "34": {
         "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 49.0,
-          "Mode": 2,
-          "MinLength": {
-            "Unit": 1
-          },
-          "MaxLength": {
-            "Value": 1.0
-          }
+          "DesignLengthInPixel": 32.0
         }
       },
-      "15": {
+      "35": {
         "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 49.0,
-          "Mode": 2,
-          "MinLength": {
-            "Unit": 1
-          },
-          "MaxLength": {
-            "Value": 1.0
-          }
+          "DesignLengthInPixel": 32.0
         }
       },
-      "16": {
+      "36": {
         "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 49.0,
-          "Mode": 2,
-          "MinLength": {
-            "Unit": 1
-          },
-          "MaxLength": {
-            "Value": 1.0
-          }
+          "DesignLengthInPixel": 32.0
         }
       },
-      "17": {
+      "37": {
         "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 49.0,
-          "Mode": 2,
-          "MinLength": {
-            "Unit": 1
-          },
-          "MaxLength": {
-            "Value": 1.0
-          }
+          "DesignLengthInPixel": 32.0
         }
       },
-      "18": {
+      "38": {
         "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 49.0,
-          "Mode": 2,
-          "MinLength": {
-            "Unit": 1
-          },
-          "MaxLength": {
-            "Value": 1.0
-          }
+          "DesignLengthInPixel": 32.0
         }
       },
-      "19": {
+      "39": {
         "GridRowColumnDefinition": {
           "DesignLengthInPixel": 15.0
         }
       }
     },
-    "Count": 20,
-    "DefaultSize": 49.0
+    "Count": 40,
+    "DefaultSize": 32.0
   },
   "Values": {
-    "1,1": "执行人",
-    "1,4": "已分配工时",
-    "1,7": "上报工时",
-    "1,10": "核定工时",
-    "1,13": "可核定工时",
-    "1,16": "总计算提成"
-  },
-  "Formulas": {
-    "2,13": "E3-H3"
+    "1,1": "成员",
+    "1,13": "日期",
+    "1,35": "导出原始数据",
+    "17,9": "执行人"
   },
   "AttachInfos": {
-    "1,1": {
+    "1,3": {
+      "CellType": {
+        "$type": "ElementUI.SelectCellType, ElementUI",
+        "CommandList": [],
+        "UIPermissions": [
+          {
+            "Scope": 2,
+            "AllowRoles": [
+              "FGC_Anonymous"
+            ]
+          },
+          {
+            "Scope": 1,
+            "AllowRoles": [
+              "FGC_Anonymous"
+            ]
+          }
+        ],
+        "useBinding": true,
+        "options": [
+          {
+            "value": "黄金糕",
+            "label": "黄金糕"
+          },
+          {
+            "value": "双皮奶",
+            "label": "双皮奶"
+          },
+          {
+            "value": "蚵仔煎",
+            "label": "蚵仔煎"
+          },
+          {
+            "value": "龙须面",
+            "label": "龙须面"
+          },
+          {
+            "value": "北京烤鸭",
+            "label": "北京烤鸭"
+          }
+        ],
+        "bindingOptions": {
+          "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon",
+          "TableName": "用户信息视图",
+          "BindingInfos": [
+            {
+              "GUID": "2fb67ffc-ff4b-4f9f-8aff-69bb4158b375",
+              "BindingInfo": {
+                "TableName": "用户信息视图",
+                "ColumnName": "用户名",
+                "GUID": "1d2a2d3f-a459-42b1-a9ae-9393edaf3b8a"
+              },
+              "ColumnName": "value"
+            },
+            {
+              "GUID": "72dd4b1c-2db0-4698-b1b5-8e7eefc76991",
+              "BindingInfo": {
+                "TableName": "用户信息视图",
+                "ColumnName": "全名",
+                "GUID": "00887b45-028b-4044-a443-e2f12efa3e84"
+              },
+              "ColumnName": "label"
+            }
+          ],
+          "CustomColumns": []
+        },
+        "placeholder": "请选择",
+        "noDataText": "无数据",
+        "filterInServerOptions": {
+          "matchMethod": "contains",
+          "loadingText": "加载中"
+        },
+        "noMatchText": "无匹配数据"
+      }
+    },
+    "1,15": {
+      "CellType": {
+        "$type": "ElementUI.DatePickerCellType, ElementUI",
+        "CommandList": [
+          {
+            "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon",
+            "TargetPageElement": {
+              "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+              "SerializeProperty": "=人员工时统计!P2"
+            },
+            "TargetType": "ElementUI.DatePickerCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560",
+            "MethodName": "GetSelectedRange",
+            "RetrunParamNames": {
+              "StartValue": {
+                "SerializeProperty": "=人员工时统计!开始日期"
+              },
+              "EndValue": {
+                "SerializeProperty": "=人员工时统计!结束日期"
+              }
+            }
+          }
+        ],
+        "UIPermissions": [
+          {
+            "Scope": 2,
+            "AllowRoles": [
+              "FGC_Anonymous"
+            ]
+          },
+          {
+            "Scope": 1,
+            "AllowRoles": [
+              "FGC_Anonymous"
+            ]
+          },
+          {
+            "Scope": 4,
+            "AllowRoles": [
+              "FGC_Anonymous"
+            ]
+          }
+        ],
+        "DefaultValue": {
+          "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+          "SerializeProperty": "=TODAY()&\",\"&TODAY()"
+        },
+        "type": "daterange",
+        "placeholder": "请选择",
+        "startPlaceholder": "开始日期",
+        "rangeSeparator": "至",
+        "endPlaceholder": "结束日期",
+        "format": "yyyy年MM月DD日",
+        "firstDayOfWeek": 1,
+        "DefautWeekFormat": "yyyy 第 WW 周"
+      }
+    },
+    "1,35": {
+      "CellType": {
+        "$type": "Forguncy.ButtonCellType, ServerDesignerCommon",
+        "CommandList": [
+          {
+            "$type": "Forguncy.Model.ExportListViewToExcelCommand, ServerDesignerCommon",
+            "ListViewName": "表格1",
+            "NewOtherName": ""
+          }
+        ],
+        "Text": "导出原始数据",
+        "TemplateKey": "_RS_Main1",
+        "Icon": {
+          "Name": "File/348_excel_file_1.svg",
+          "BuiltIn": true,
+          "Color": "Background 1",
+          "UseCellTypeForeColor": true
+        },
+        "IconSize": 14.0
+      }
+    },
+    "3,1": {
+      "CellType": {
+        "$type": "Forguncy.PivotTableCellType, ServerDesignerCommon",
+        "PivotTableSetting": {
+          "SelectedListViewName": "表格1",
+          "Rows": [
+            {
+              "DatabaseColumnName": "工时日期",
+              "DisplayName": "工时日期",
+              "ColumnCell": {
+                "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                "SerializeProperty": "=人员工时统计!F19"
+              },
+              "Format": "[$-409]yyyy/m/d",
+              "BackgroundValue": {
+                "DatabaseColumnName": "工时日期",
+                "ColumnCell": {
+                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                  "SerializeProperty": "=人员工时统计!F19"
+                }
+              }
+            },
+            {
+              "DatabaseColumnName": "执行人",
+              "DisplayName": "执行人",
+              "ColumnCell": {
+                "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                "SerializeProperty": "=人员工时统计!J19"
+              },
+              "BackgroundValue": {}
+            },
+            {
+              "DatabaseColumnName": "项目名称",
+              "DisplayName": "项目名称",
+              "ColumnCell": {
+                "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                "SerializeProperty": "=人员工时统计!B19"
+              },
+              "BackgroundValue": {}
+            },
+            {
+              "DatabaseColumnName": "任务名称",
+              "DisplayName": "任务名称",
+              "ColumnCell": {
+                "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                "SerializeProperty": "=人员工时统计!D19"
+              },
+              "BackgroundValue": {}
+            }
+          ],
+          "Values": [
+            {
+              "DatabaseColumnName": "工时",
+              "DisplayName": "工时",
+              "ColumnCell": {
+                "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                "SerializeProperty": "=人员工时统计!L19"
+              },
+              "Aggregator": 0,
+              "TotalAggregator": 0,
+              "BackgroundValue": {}
+            }
+          ],
+          "DatabaseColumns": [
+            {
+              "DatabaseColumnName": "项目名称",
+              "ColumnCell": {
+                "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                "SerializeProperty": "=人员工时统计!B19"
+              }
+            },
+            {
+              "DatabaseColumnName": "任务名称",
+              "ColumnCell": {
+                "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                "SerializeProperty": "=人员工时统计!D19"
+              }
+            },
+            {
+              "DatabaseColumnName": "工时日期",
+              "ColumnCell": {
+                "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                "SerializeProperty": "=人员工时统计!F19"
+              }
+            },
+            {
+              "DatabaseColumnName": "工时类型",
+              "ColumnCell": {
+                "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                "SerializeProperty": "=人员工时统计!H19"
+              }
+            },
+            {
+              "DatabaseColumnName": "执行人",
+              "ColumnCell": {
+                "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                "SerializeProperty": "=人员工时统计!J19"
+              }
+            },
+            {
+              "DatabaseColumnName": "工时",
+              "ColumnCell": {
+                "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                "SerializeProperty": "=人员工时统计!L19"
+              }
+            }
+          ],
+          "CollapseRowHeaderIndex": 2,
+          "FrozenColumnIndex": 0
+        },
+        "PivotTableStyle": {
+          "IsDataColumnAutoFitWidth": true,
+          "MinDataColumnWidth": "120",
+          "RowHeaderColumnWidth": "200",
+          "RowHeight": "40",
+          "GrayAreaColor": "Background 1 0",
+          "UseSimpleBar": true
+        },
+        "PivotTableID": "df66c564-bb53-4d48-aab8-a6ff8885bfc2",
+        "TemplateKey": "负荷透视表"
+      }
+    },
+    "17,1": {
       "ListViewInfo": {
         "Name": "表格1",
-        "TableName": "人员工时统计视图",
-        "RowIndex": 1,
+        "TableName": "任务工时表",
+        "RowIndex": 17,
         "ColumnIndex": 1,
-        "RowCount": 13,
-        "ColumnCount": 18,
+        "RowCount": 4,
+        "ColumnCount": 38,
+        "SqlCondition": {
+          "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess",
+          "SubConditions": [
+            {
+              "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+              "ColumnBindingInfo": {
+                "TableName": "任务工时表",
+                "ColumnName": "执行人",
+                "GUID": "8a030d7b-21fd-48a5-92e9-c7a3159e2395"
+              },
+              "Value": {
+                "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                "SerializeProperty": "=人员工时统计!成员"
+              }
+            },
+            {
+              "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+              "CompareType": 3,
+              "ColumnBindingInfo": {
+                "TableName": "任务工时表",
+                "ColumnName": "工时日期",
+                "GUID": "6332ba1b-70bc-4fe1-b800-4a4e3ddfe23a"
+              },
+              "Value": {
+                "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                "SerializeProperty": "=人员工时统计!开始日期"
+              }
+            },
+            {
+              "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+              "CompareType": 5,
+              "ColumnBindingInfo": {
+                "TableName": "任务工时表",
+                "ColumnName": "工时日期",
+                "GUID": "d55aecfd-2c1e-4942-a818-997371d4c9cf"
+              },
+              "Value": {
+                "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                "SerializeProperty": "=人员工时统计!结束日期"
+              }
+            }
+          ]
+        },
         "TopCondition": null,
-        "ListViewStyleName": "pms表格",
+        "ListViewStyleName": "_RS_NewFashionListStyle2",
         "ShowColumnHeaderInDesigner": true,
         "ShowEditStatusIcon": true,
         "UseSimpleBar": true,
-        "SelectionMode": 1,
-        "DisableAutoSelectRow": true,
         "ColumnOperation": 2
       }
     },
-    "2,1": {
-      "NameUsedInJavaScript": "执行人",
-      "TotalRowSetting": {},
-      "IsAutoMergeInListview": true,
+    "18,1": {
+      "NameUsedInJavaScript": "项目名称",
       "BindingInfo": {
-        "TableName": "人员工时统计视图",
+        "TableName": "任务工时表",
+        "ColumnName": "项目ID",
+        "GUID": "eee8d441-96b9-43cb-ab20-79c9eaf2d302",
+        "RelationBinding": {
+          "RelatedTable": "项目表",
+          "RelatedColumn": "ID",
+          "DisplayColumn": "项目名称"
+        }
+      }
+    },
+    "18,3": {
+      "NameUsedInJavaScript": "任务名称",
+      "BindingInfo": {
+        "TableName": "任务工时表",
+        "ColumnName": "任务ID",
+        "GUID": "29945319-8bf4-477d-973f-b6ca687d3737",
+        "RelationBinding": {
+          "RelatedTable": "任务平行视图",
+          "RelatedColumn": "ID",
+          "DisplayColumn": "任务名称"
+        }
+      }
+    },
+    "18,5": {
+      "NameUsedInJavaScript": "工时日期",
+      "BindingInfo": {
+        "TableName": "任务工时表",
+        "ColumnName": "工时日期",
+        "GUID": "a3f2ccc5-af3a-4a07-954f-4473e507f377"
+      }
+    },
+    "18,7": {
+      "NameUsedInJavaScript": "工时类型",
+      "BindingInfo": {
+        "TableName": "任务工时表",
+        "ColumnName": "工时类型",
+        "GUID": "c1d027dc-2a55-4af5-a4fb-66924ea0956d"
+      }
+    },
+    "18,9": {
+      "NameUsedInJavaScript": "执行人",
+      "BindingInfo": {
+        "TableName": "任务工时表",
         "ColumnName": "执行人",
-        "GUID": "646684c6-099f-4b1b-8618-232c95d67ef9",
+        "GUID": "045e4c2d-ae5f-4c0e-8ae0-863748e988ff",
         "AttachType": {
           "$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess",
           "UserColumnAttachType": 1
         }
       }
     },
-    "2,4": {
-      "NameUsedInJavaScript": "总计划工时",
-      "TotalRowSetting": {
-        "FormulaType": 5
-      },
+    "18,11": {
+      "NameUsedInJavaScript": "工时",
       "BindingInfo": {
-        "TableName": "人员工时统计视图",
-        "ColumnName": "总计划工时",
-        "GUID": "988beb4e-7917-40f2-b97d-5046f0577825"
-      }
-    },
-    "2,7": {
-      "NameUsedInJavaScript": "总实际工时",
-      "TotalRowSetting": {
-        "FormulaType": 5
-      },
-      "BindingInfo": {
-        "TableName": "人员工时统计视图",
-        "ColumnName": "总上报工时",
-        "GUID": "c7da112e-841f-45ed-ac90-b30445a36745"
-      }
-    },
-    "2,10": {
-      "NameUsedInJavaScript": "总上报工时",
-      "TotalRowSetting": {
-        "FormulaType": 5
-      },
-      "BindingInfo": {
-        "TableName": "人员工时统计视图",
-        "ColumnName": "总核定工时",
-        "GUID": "b9a7fc9b-8f5e-4440-8c7b-631a9ba25280"
-      }
-    },
-    "2,13": {
-      "NameUsedInJavaScript": "总剩余工时",
-      "TotalRowSetting": {
-        "FormulaType": 5
-      }
-    },
-    "2,16": {
-      "NameUsedInJavaScript": "总计算提成",
-      "TotalRowSetting": {
-        "FormulaType": 5,
-        "StyleInfo": {
-          "Formatter": " ¥#,##0.00_);[Red] ¥(#,##0.00)"
-        }
-      },
-      "BindingInfo": {
-        "TableName": "人员工时统计视图",
-        "ColumnName": "总核定收益",
-        "GUID": "fa541705-7c4d-4799-ac32-7acdc787f6af"
+        "TableName": "任务工时表",
+        "ColumnName": "工时",
+        "GUID": "e477ad89-15cf-47a0-ad44-39ee7b572449"
       }
     }
   },
@@ -421,74 +638,79 @@
     "Styles": [
       {
         "FontFamily": 0,
-        "FontSize": 13.333333333333332,
-        "HorizontalAlignment": 1
-      },
-      {
-        "FontSize": 13.333333333333332,
-        "HorizontalAlignment": 1
+        "FontSize": 13.333333333333332
       },
       {
         "FontFamily": 0,
         "FontSize": 13.333333333333332,
-        "Foreground": 2,
-        "HorizontalAlignment": 1,
-        "WordWrap": true
+        "Formatter": 1
       },
       {
-        "FontSize": 13.333333333333332,
-        "Foreground": 2,
-        "Formatter": 3,
-        "HorizontalAlignment": 1
-      },
-      {
-        "FontSize": 13.333333333333332,
-        "Foreground": 2,
-        "Formatter": 4,
-        "HorizontalAlignment": 1
+        "HorizontalAlignment": 2
       }
     ],
     "Types": {
       "Strs": [
         "Body",
-        "Center",
-        "black",
-        "0.0",
-        "¥#,##0_);[Red](¥#,##0)"
+        "[AUTO]General",
+        "Center"
       ]
     },
     "CellStyles": {
-      "1,1": 0,
-      "1,4": 1,
-      "1,7": 1,
-      "1,10": 1,
+      "1,3": 0,
       "1,13": 1,
-      "1,16": 1,
-      "2,1": 2,
-      "2,4": 3,
-      "2,7": 3,
-      "2,10": 3,
-      "2,13": 3,
-      "2,16": 4
+      "1,14": 0,
+      "1,15": 0,
+      "1,16": 0,
+      "1,17": 0,
+      "1,18": 0,
+      "1,19": 0,
+      "1,20": 0,
+      "1,21": 0,
+      "1,22": 0,
+      "1,23": 0,
+      "1,24": 0,
+      "1,25": 0,
+      "1,26": 0,
+      "1,27": 0,
+      "1,28": 0,
+      "3,1": 2,
+      "17,9": 0,
+      "17,10": 0,
+      "17,11": 0,
+      "17,12": 0,
+      "18,9": 0,
+      "18,10": 0,
+      "18,11": 0,
+      "18,12": 0
     },
     "SheetStyle": {
-      "FontFamily": 0
+      "FontFamily": 0,
+      "FontSize": 13.333333333333332
     }
   },
   "Spans": [
-    "3,1,11,18",
-    "2,1,1,3",
-    "2,4,1,3",
-    "2,16,1,3",
-    "2,13,1,3",
-    "2,7,1,3",
-    "2,10,1,3",
-    "1,1,1,3",
-    "1,4,1,3",
-    "1,7,1,3",
-    "1,10,1,3",
-    "1,13,1,3",
-    "1,16,1,3"
+    "3,1,13,38",
+    "18,1,1,2",
+    "18,3,1,2",
+    "18,5,1,2",
+    "18,7,1,2",
+    "1,1,1,2",
+    "1,13,1,2",
+    "1,15,1,14",
+    "1,3,1,9",
+    "19,1,2,38",
+    "21,1,1,3",
+    "21,4,1,3",
+    "18,9,1,2",
+    "18,11,1,2",
+    "17,1,1,2",
+    "17,3,1,2",
+    "17,5,1,2",
+    "17,7,1,2",
+    "17,9,1,2",
+    "17,11,1,2",
+    "1,35,1,4"
   ],
   "PageInfo": {
     "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
@@ -513,5 +735,19 @@
   "PrintInfo": {
     "PaperSize": {},
     "Margin": {}
-  }
-}//eqePaC6r6U5zpmXDbYi2Yd21OlwCy3KL4DZgKqObqJBW8pXLVSr1Yqj92RXEv9PGj7XSEKIpl+P0SBFfrMD4OvyNAsZjZrvAeYS2VefiBKIsv/jIg8ifDWNKO13U4ft9Fw4E6QYtMiXNAvTJgctawH2vZLSj5I0G2HJECQ4Ac+xi/JTlWn7dwg3MDf/msiNp+UPFmSUZ+OhY6w0UEJLAA9acHls7tTDWOEhrXl3XrofON0cYS8+VuqjB2t0u9DyThj7ZHUP0wprgyOg6TryVPNw0jw+uRnEDzf8kGUuWo2cQUOcHvMAaP5o0Lw9FypEzhIpZbyeICYkSdPQXCFK8+KWh0Yzi0k9HQm15Gs82qh6/b7+C0xvbHHuoRB62LTNNHWcLT7Ars6KOZGFHFaPobi3/IWZLcShrqVIaROeivxwwdrqD6HFv25BS//qQ5BqZTy7PCjGe8My92l/XktJZWAi3TvmuAzSjFJDWfXyySkICaL5hUL/Wr3lC8JAQfFVP0QBIM2TINgn4dLlNvLDEb+7pFWF4vdFJ0UlgXQCSB5XlmKaxHjJkn4DpJYx840VdkTZrx5eJISdj3VKiTPbGdga4scdCO/Kwq4WVMbRppEGmxZKnKGBRfGq/qcwZ+fGMZhaFl85JBYmN4PsmdlxI9RJFskpTRNyjrFSgeUcoNN4q6YbWoMGX0PLNNZnUZ9ox3xqQ2YL3rnxtufYzJA1IMy0b9X3lquG5bRVdxHKu2yGZMgbM7fcSgD2NjVKdA5uFBvmEd4rwtdrYdtDdI2bAJvrSs8AkCi429aM74DeQZBHj7ibVQxLncChYjxhxJw8dTexdeQeKMRzFDHAi3pcBWafaZcM2F22eo3U8UtMIRcSox+2b8k5O1hmWiDcPW5iJy9ICPqu9aeZ0nIayvw2Pug==|920
\ No newline at end of file
+  },
+  "CustomNames": [
+    {
+      "Name": "成员",
+      "Formula": "人员工时统计!$D$2"
+    },
+    {
+      "Name": "开始日期",
+      "Formula": "人员工时统计!$B$22"
+    },
+    {
+      "Name": "结束日期",
+      "Formula": "人员工时统计!$E$22"
+    }
+  ]
+}//e4wbb/0ktl1TlrsiF+UzzNuOzNBn/HjqN2vLoZe7OENXg5AvHN/vwijdwjB52E9ua3nqMELWYyllSP3lq0XeVvSq+9BB5DCX865Uguc78JngDX0+BkJwWSGFori5tBcI6n/UVwIEH/f9IJZ05M5JB3j7fgNiBGbXtuojlv8PAhecNxBv+ynTO+6IrZhVntvEEOuNpzSiULrwdbnHAEQo1voKxVyyF/p7Q0lWJ4S60qibrCR8HYuJLilfbg2auuQ3ncSccTT1j020Zf2NW9YeLxWE0UYJWeqN3mwjaYk6QowV2WJGCuXwypDkFj/tJjv3hQ4ZhwAkE2nk3wnMET1L0AJDIXkDnPVMzbhB9iUZPiDnmmvVTXq95hSn0eTDvlVddkYnGewLnXx45D/c6skKZVixuZuaeofwFDgFOpUSDzX05Gc42k3SDXWA0rW6jKw6NCk1Dhrr546xrY/dDTJ67h6FsT/hxdjGYWn4Jadt7LlQfAcs4tcG0QGqV5deIPAp90Sc1ilKAwo9K6mPLCGG+QzWUZsbGYv32i6NjHw3nnhdl6u2UqKAhfDHDVDnbAUzQkcUmBVNW3sP8/mWCEBRGM8nOHABl/kgo/kgYRCR12n7+THAjpmN9oJpX6yyjqDVQoceEG/Z37hjh+72oSiBLRyRg6Tz5y3RjD2K59Bm3Ob6ZJWzIEobRQ2qiVwNHtd6DjsWsX6dmLEQx+7Wp3kxUTGC9OtqAwx/IO91kMyHKSlcWw4XCS/o7KD99f+82XhyD8ToX1wkrqSsAZesZv65EOJf1in51lyjq0RlVcydJNYhMAUwLoQVbopI5sHzhPFZ1dK69vrfuKPcs9GzmY4UodXnY4cd9ApY3AJ/x/j38x8vQ/wmuXmol6Q1hRyLJbEQfEE61TlbEk2bWdlKRZP5Zg==|920
\ No newline at end of file
diff --git a/Pages/工时/人员工时统计.rd b/Pages/工时/人员工时统计.rd
index d5e3b101..d4eaf85b 100644
--- a/Pages/工时/人员工时统计.rd
+++ b/Pages/工时/人员工时统计.rd
@@ -1,8 +1,19 @@
 {
   "PageType": 0,
-  "ColumnCount": 20,
-  "RowCount": 15,
-  "Formulas": {
-    "2,13": "E3-H3"
-  }
+  "ColumnCount": 40,
+  "RowCount": 22,
+  "CustomNames": [
+    {
+      "Name": "成员",
+      "Formula": "人员工时统计!$D$2"
+    },
+    {
+      "Name": "开始日期",
+      "Formula": "人员工时统计!$B$22"
+    },
+    {
+      "Name": "结束日期",
+      "Formula": "人员工时统计!$E$22"
+    }
+  ]
 }
\ No newline at end of file
diff --git a/Pages/工时/任务工时统计.json b/Pages/工时/任务工时统计.json
index b572ff8a..67d49205 100644
--- a/Pages/工时/任务工时统计.json
+++ b/Pages/工时/任务工时统计.json
@@ -1,21 +1,118 @@
 {
   "Rows": {
     "RowColumnAttachedInfos": {
-      "0": {
+      "2": {
         "GridRowColumnDefinition": {
           "DesignLengthInPixel": 32.0
         }
       },
-      "1": {
+      "3": {
         "GridRowColumnDefinition": {
           "DesignLengthInPixel": 40.0
         }
       },
-      "2": {
+      "4": {
         "GridRowColumnDefinition": {
           "DesignLengthInPixel": 51.0
         }
       },
+      "5": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "6": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "7": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "8": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "9": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "10": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "11": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "12": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "13": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "14": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "15": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 272.0,
+          "Mode": 2,
+          "MinLength": {
+            "Unit": 1
+          },
+          "MaxLength": {
+            "Value": 1.0
+          }
+        }
+      },
+      "16": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 15.0
+        }
+      },
+      "17": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 49.0,
+          "IsHidden": true
+        }
+      }
+    },
+    "InLogicalVisibleIndexes": [
+      17
+    ],
+    "Count": 18,
+    "DefaultSize": 32.0
+  },
+  "Cols": {
+    "RowColumnAttachedInfos": {
+      "0": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 15.0
+        }
+      },
+      "1": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "2": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
       "3": {
         "GridRowColumnDefinition": {
           "DesignLengthInPixel": 32.0
@@ -68,311 +165,82 @@
       },
       "13": {
         "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 272.0,
-          "Mode": 2,
-          "MinLength": {
-            "Unit": 1
-          },
-          "MaxLength": {
-            "Value": 1.0
-          }
+          "DesignLengthInPixel": 32.0
         }
       },
       "14": {
         "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 15.0
-        }
-      }
-    },
-    "Count": 15,
-    "DefaultSize": 32.0
-  },
-  "Cols": {
-    "RowColumnAttachedInfos": {
-      "0": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 15.0
-        }
-      },
-      "1": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 49.0,
-          "Mode": 2,
-          "MinLength": {
-            "Unit": 1
-          },
-          "MaxLength": {
-            "Value": 1.0
-          }
-        }
-      },
-      "2": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 49.0,
-          "Mode": 2,
-          "MinLength": {
-            "Unit": 1
-          },
-          "MaxLength": {
-            "Value": 1.0
-          }
-        }
-      },
-      "3": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 49.0,
-          "Mode": 2,
-          "MinLength": {
-            "Unit": 1
-          },
-          "MaxLength": {
-            "Value": 1.0
-          }
-        }
-      },
-      "6": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 49.0,
-          "Mode": 2,
-          "MinLength": {
-            "Unit": 1
-          },
-          "MaxLength": {
-            "Value": 1.0
-          }
-        }
-      },
-      "7": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 49.0,
-          "Mode": 2,
-          "MinLength": {
-            "Unit": 1
-          },
-          "MaxLength": {
-            "Value": 1.0
-          }
-        }
-      },
-      "8": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 49.0,
-          "Mode": 2,
-          "MinLength": {
-            "Unit": 1
-          },
-          "MaxLength": {
-            "Value": 1.0
-          }
-        }
-      },
-      "11": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 49.0,
-          "Mode": 2,
-          "MinLength": {
-            "Unit": 1
-          },
-          "MaxLength": {
-            "Value": 1.0
-          }
-        }
-      },
-      "12": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 49.0,
-          "Mode": 2,
-          "MinLength": {
-            "Unit": 1
-          },
-          "MaxLength": {
-            "Value": 1.0
-          }
-        }
-      },
-      "13": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 49.0,
-          "Mode": 2,
-          "MinLength": {
-            "Unit": 1
-          },
-          "MaxLength": {
-            "Value": 1.0
-          }
-        }
-      },
-      "14": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 49.0,
-          "Mode": 2,
-          "MinLength": {
-            "Unit": 1
-          },
-          "MaxLength": {
-            "Value": 1.0
-          }
+          "DesignLengthInPixel": 32.0
         }
       },
       "15": {
         "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 49.0,
-          "Mode": 2,
-          "MinLength": {
-            "Unit": 1
-          },
-          "MaxLength": {
-            "Value": 1.0
-          }
+          "DesignLengthInPixel": 32.0
         }
       },
       "16": {
         "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 49.0,
-          "Mode": 2,
-          "MinLength": {
-            "Unit": 1
-          },
-          "MaxLength": {
-            "Value": 1.0
-          }
+          "DesignLengthInPixel": 32.0
         }
       },
       "17": {
         "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 49.0,
-          "Mode": 2,
-          "MinLength": {
-            "Unit": 1
-          },
-          "MaxLength": {
-            "Value": 1.0
-          }
+          "DesignLengthInPixel": 32.0
         }
       },
       "18": {
         "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 49.0,
-          "Mode": 2,
-          "MinLength": {
-            "Unit": 1
-          },
-          "MaxLength": {
-            "Value": 1.0
-          }
+          "DesignLengthInPixel": 32.0
         }
       },
       "19": {
         "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 49.0,
-          "Mode": 2,
-          "MinLength": {
-            "Unit": 1
-          },
-          "MaxLength": {
-            "Value": 1.0
-          }
+          "DesignLengthInPixel": 32.0
         }
       },
       "20": {
         "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 49.0,
-          "Mode": 2,
-          "MinLength": {
-            "Unit": 1
-          },
-          "MaxLength": {
-            "Value": 1.0
-          }
+          "DesignLengthInPixel": 32.0
         }
       },
       "21": {
         "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 49.0,
-          "Mode": 2,
-          "MinLength": {
-            "Unit": 1
-          },
-          "MaxLength": {
-            "Value": 1.0
-          }
+          "DesignLengthInPixel": 32.0
         }
       },
       "22": {
         "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 49.0,
-          "Mode": 2,
-          "MinLength": {
-            "Unit": 1
-          },
-          "MaxLength": {
-            "Value": 1.0
-          }
+          "DesignLengthInPixel": 32.0
         }
       },
       "23": {
         "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 49.0,
-          "Mode": 2,
-          "MinLength": {
-            "Unit": 1
-          },
-          "MaxLength": {
-            "Value": 1.0
-          }
+          "DesignLengthInPixel": 32.0
         }
       },
       "24": {
         "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 49.0,
-          "Mode": 2,
-          "MinLength": {
-            "Unit": 1
-          },
-          "MaxLength": {
-            "Value": 1.0
-          }
+          "DesignLengthInPixel": 32.0
         }
       },
       "25": {
         "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 49.0,
-          "Mode": 2,
-          "MinLength": {
-            "Unit": 1
-          },
-          "MaxLength": {
-            "Value": 1.0
-          }
+          "DesignLengthInPixel": 32.0
         }
       },
       "26": {
         "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 49.0,
-          "Mode": 2,
-          "MinLength": {
-            "Unit": 1
-          },
-          "MaxLength": {
-            "Value": 1.0
-          }
+          "DesignLengthInPixel": 32.0
         }
       },
       "27": {
         "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 49.0,
-          "Mode": 2,
-          "MinLength": {
-            "Unit": 1
-          },
-          "MaxLength": {
-            "Value": 1.0
-          }
+          "DesignLengthInPixel": 32.0
         }
       },
       "28": {
         "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 49.0,
+          "DesignLengthInPixel": 32.0,
           "Mode": 2,
           "MinLength": {
             "Unit": 1
@@ -382,17 +250,179 @@
           }
         }
       },
-      "29": {
+      "43": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "44": {
         "GridRowColumnDefinition": {
           "DesignLengthInPixel": 15.0
         }
       }
     },
-    "Count": 30,
-    "DefaultSize": 49.0
+    "Count": 45,
+    "DefaultSize": 32.0
+  },
+  "Values": {
+    "1,1": "项目",
+    "1,13": "成员"
   },
   "AttachInfos": {
-    "1,1": {
+    "1,3": {
+      "CellType": {
+        "$type": "ElementUI.SelectCellType, ElementUI",
+        "CommandList": [],
+        "UIPermissions": [
+          {
+            "Scope": 2,
+            "AllowRoles": [
+              "FGC_Anonymous"
+            ]
+          },
+          {
+            "Scope": 1,
+            "AllowRoles": [
+              "FGC_Anonymous"
+            ]
+          }
+        ],
+        "useBinding": true,
+        "options": [
+          {
+            "value": "黄金糕",
+            "label": "黄金糕"
+          },
+          {
+            "value": "双皮奶",
+            "label": "双皮奶"
+          },
+          {
+            "value": "蚵仔煎",
+            "label": "蚵仔煎"
+          },
+          {
+            "value": "龙须面",
+            "label": "龙须面"
+          },
+          {
+            "value": "北京烤鸭",
+            "label": "北京烤鸭"
+          }
+        ],
+        "bindingOptions": {
+          "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon",
+          "TableName": "项目表",
+          "BindingInfos": [
+            {
+              "GUID": "c439d303-fcbe-4a63-9440-6557254ad768",
+              "BindingInfo": {
+                "TableName": "项目表",
+                "ColumnName": "ID",
+                "GUID": "ef341ac3-d227-48eb-9d0f-f11ec8c66daa"
+              },
+              "ColumnName": "value"
+            },
+            {
+              "GUID": "111f4ad2-ee50-4142-b38a-45df9ffa488e",
+              "BindingInfo": {
+                "TableName": "项目表",
+                "ColumnName": "项目名称",
+                "GUID": "6455e86d-e2fe-4494-93de-2543943a5061"
+              },
+              "ColumnName": "label"
+            }
+          ],
+          "CustomColumns": []
+        },
+        "placeholder": "请选择",
+        "noDataText": "无数据",
+        "filterable": true,
+        "filterInServer": true,
+        "filterInServerOptions": {
+          "defaultMaxOptionsCount": 10,
+          "matchMethod": "contains",
+          "loadingText": "加载中"
+        },
+        "noMatchText": "无匹配数据",
+        "clearable": true
+      }
+    },
+    "1,15": {
+      "CellType": {
+        "$type": "ElementUI.SelectCellType, ElementUI",
+        "UIPermissions": [
+          {
+            "Scope": 2,
+            "AllowRoles": [
+              "FGC_Anonymous"
+            ]
+          },
+          {
+            "Scope": 1,
+            "AllowRoles": [
+              "FGC_Anonymous"
+            ]
+          }
+        ],
+        "useBinding": true,
+        "options": [
+          {
+            "value": "黄金糕",
+            "label": "黄金糕"
+          },
+          {
+            "value": "双皮奶",
+            "label": "双皮奶"
+          },
+          {
+            "value": "蚵仔煎",
+            "label": "蚵仔煎"
+          },
+          {
+            "value": "龙须面",
+            "label": "龙须面"
+          },
+          {
+            "value": "北京烤鸭",
+            "label": "北京烤鸭"
+          }
+        ],
+        "bindingOptions": {
+          "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon",
+          "TableName": "用户信息视图",
+          "BindingInfos": [
+            {
+              "GUID": "57432504-ea5f-40d4-9e73-b1b1ade374ee",
+              "BindingInfo": {
+                "TableName": "用户信息视图",
+                "ColumnName": "用户名",
+                "GUID": "4c3567e3-8f46-4a54-926d-cffc248e8f8f"
+              },
+              "ColumnName": "value"
+            },
+            {
+              "GUID": "b7a39557-7362-456e-90d5-3be0da4efb41",
+              "BindingInfo": {
+                "TableName": "用户信息视图",
+                "ColumnName": "全名",
+                "GUID": "34f5290f-e7bf-4906-be3b-d077850ad82c"
+              },
+              "ColumnName": "label"
+            }
+          ],
+          "CustomColumns": []
+        },
+        "placeholder": "请选择",
+        "noDataText": "无数据",
+        "filterInServerOptions": {
+          "matchMethod": "contains",
+          "loadingText": "加载中"
+        },
+        "noMatchText": "无匹配数据"
+      }
+    },
+    "3,1": {
       "CellType": {
         "$type": "ElementUI.TableCellType, ElementUI",
         "ElTableName": "EL表格1",
@@ -453,25 +483,7 @@
                   "UserColumnAttachType": 1
                 }
               },
-              "ColumnName": "执行人_全名"
-            },
-            {
-              "GUID": "69b0ad8e-c1c6-4192-8fd0-fb5843b2facc",
-              "BindingInfo": {
-                "TableName": "View_任务工时统计",
-                "ColumnName": "总计划工时",
-                "GUID": "e882534c-13fa-4d95-873d-028620779457"
-              },
-              "ColumnName": "总计划工时"
-            },
-            {
-              "GUID": "a67f1a0b-c41d-413a-9454-44fa5827cd96",
-              "BindingInfo": {
-                "TableName": "View_任务工时统计",
-                "ColumnName": "总上报工时",
-                "GUID": "8dca6a72-c58c-45ee-9bc3-97cf654c328d"
-              },
-              "ColumnName": "总上报工时"
+              "ColumnName": "执行人"
             },
             {
               "GUID": "855501b8-f8ea-4441-991f-8722613d2cfe",
@@ -492,6 +504,35 @@
               "ColumnName": "总剩余工时"
             }
           ],
+          "SqlCondition": {
+            "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess",
+            "SubConditions": [
+              {
+                "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+                "ColumnBindingInfo": {
+                  "TableName": "View_任务工时统计",
+                  "ColumnName": "项目ID",
+                  "GUID": "36f7a2a1-3205-4085-a275-d4ca778baee8"
+                },
+                "Value": {
+                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                  "SerializeProperty": "=任务工时统计!项目"
+                }
+              },
+              {
+                "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+                "ColumnBindingInfo": {
+                  "TableName": "View_任务工时统计",
+                  "ColumnName": "执行人",
+                  "GUID": "599ec82d-26bb-499f-91fa-43097f3d9f38"
+                },
+                "Value": {
+                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                  "SerializeProperty": "=任务工时统计!成员"
+                }
+              }
+            ]
+          },
           "NullFormulaValueQueryPolicy": 1,
           "CustomColumns": []
         },
@@ -565,7 +606,7 @@
           },
           {
             "$type": "ElementUI.ColumnSetting, ElementUI",
-            "dataColumnName": "执行人_全名",
+            "dataColumnName": "执行人",
             "label": "执行人",
             "align": "center",
             "headerAlign": "center",
@@ -585,48 +626,6 @@
               }
             ]
           },
-          {
-            "$type": "ElementUI.ColumnSetting, ElementUI",
-            "dataColumnName": "总计划工时",
-            "label": "总计划工时",
-            "formatStr": "0.00",
-            "align": "center",
-            "headerAlign": "center",
-            "colfixed": "false",
-            "type": "Default",
-            "tagType": "info",
-            "imgType": "cover",
-            "key": "084d3193-f8bc-49ed-af7c-be86ec6f5766",
-            "UIPermissions": [
-              {
-                "Scope": 1,
-                "AllowRoles": [
-                  "FGC_Anonymous"
-                ]
-              }
-            ]
-          },
-          {
-            "$type": "ElementUI.ColumnSetting, ElementUI",
-            "dataColumnName": "总上报工时",
-            "label": "总上报工时",
-            "formatStr": "0.00",
-            "align": "center",
-            "headerAlign": "center",
-            "colfixed": "false",
-            "type": "Default",
-            "tagType": "info",
-            "imgType": "cover",
-            "key": "dd7ec532-6969-40b3-a390-76e849973da0",
-            "UIPermissions": [
-              {
-                "Scope": 1,
-                "AllowRoles": [
-                  "FGC_Anonymous"
-                ]
-              }
-            ]
-          },
           {
             "$type": "ElementUI.ColumnSetting, ElementUI",
             "dataColumnName": "总核定工时",
@@ -719,17 +718,63 @@
     }
   },
   "StyleDatas": {
+    "Styles": [
+      {
+        "FontFamily": 0,
+        "FontSize": 13.333333333333332
+      },
+      {
+        "FontFamily": 0,
+        "FontSize": 13.333333333333332,
+        "Formatter": 1
+      }
+    ],
     "Types": {
       "Strs": [
-        "Body"
+        "Body",
+        "[AUTO]General"
       ]
     },
+    "CellStyles": {
+      "1,1": 0,
+      "1,2": 0,
+      "1,3": 0,
+      "1,4": 0,
+      "1,5": 0,
+      "1,6": 0,
+      "1,7": 0,
+      "1,8": 0,
+      "1,9": 0,
+      "1,10": 0,
+      "1,11": 0,
+      "1,12": 0,
+      "1,13": 1,
+      "1,14": 0,
+      "1,15": 0,
+      "1,28": 0,
+      "1,29": 0,
+      "1,30": 0,
+      "1,31": 0,
+      "1,32": 0,
+      "1,33": 0,
+      "1,34": 0,
+      "1,35": 0,
+      "1,36": 0,
+      "1,37": 0,
+      "1,38": 0,
+      "1,39": 0,
+      "1,40": 0
+    },
     "SheetStyle": {
       "FontFamily": 0
     }
   },
   "Spans": [
-    "1,1,13,28"
+    "3,1,13,43",
+    "1,1,1,2",
+    "1,13,1,2",
+    "1,3,1,9",
+    "1,15,1,13"
   ],
   "PageInfo": {
     "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
@@ -754,5 +799,15 @@
   "PrintInfo": {
     "PaperSize": {},
     "Margin": {}
-  }
-}//ceXJ+8DTa0kdNYiQdUih+p2Vyk1kT58/6JocdkKfR1lWRKFZw4Y/k+GM4GKlincVpo0r4gblGrV5/MTK+QCc7IwiOKFwXHAmJt0SVeGazaKz9LB6Q71JlA2xEFF34/nW230HLE6t1s2S6gGu87FhgxYHp2Dtc93SFKRIUQf2S6VyMyG5ROBJGRJzttLa0xJqoW+6TkUwPglvb02eG1ZbdWZpEormrKeBP1D3X4B+sv6Ndextg4wXVxIjPeNjvsnmrsm8CpEdF4Xs4/exMKUFNJsoO1X2BG0lYa4iIYCtmYIvbGfdJXIK1ZLloUjAr/govn3v83MvvKspqERnkW7UaDAh4Z0BTAgUM0ETpPxr2FL5JhMp9BQiKn7BXAP1OZPsxoSab5CgihLTcoDqcHdMuZ9fUzezfbHVRQMLNcxgpsRFmYEDVYqOf3OvN+T/e1758tMEb93e0hmoIWHUPXC2OsdEVC4fslZApxLGCKBpVdMIK/FweIVSCxSZRGhxXpUiGo8P7gx56sqVCdyfbb6ijRVLlhzYtf2RQxNg34AiKeJ+6B/0Rzh8V04gB8iLwUt4+C5wUpkOoeMY5fg61sds+MH761xGxriw6C36YWUMfE7zTbpCORgZtg7Oqi/iYcah7Ohl5hYyO/jc3AGe+pJCPrFPfY690bYjXFYqDaRbP/gIrM97rUbgTZkQOavfc9BncGIY4cVvLZyflpb1zGbWCJLP6JoUjPF2Zmw12yMCJE2uobM8xVinHNK38dc+R18wfuHBDt80HYBLS9RqNr213cU48GJ3HiSeONOfNKz+LCqde4o0XwF+kfC9iOTr9ff+8fUV58ZSBwhCLNwCYfvOT/bzSjrsVDdrfEbDHtpemAZ3sjA57RHo5ekqJNaKN9MwRBzSQ0u+pSA6rINJVi/N1A==|920
\ No newline at end of file
+  },
+  "CustomNames": [
+    {
+      "Name": "项目",
+      "Formula": "任务工时统计!$D$2"
+    },
+    {
+      "Name": "成员",
+      "Formula": "任务工时统计!$P$2"
+    }
+  ]
+}//liglay8uFGxz29DNZs1o0CFqK05aHqGirFA9vFhoTMxSEaQeODivBlESX1kAlM2jtSrPTVgz87NqyQW5l1leQlc9i1VHKDotCtbn6/2g16uQkDpaRVmCYPvQ1BOcsCsQDmICGq8oaWpIdVoECLfx9uGoeDYSqYX/28sFO9cCV0FN9vmgkIieNukN/0NLb2SThxyX1+VK8rmVLchH3iJWebKrQYEOjf2tUUZvY6KBBwNJXytByiNHw3eEyONUKYCl9fmYjZKiymjf6waxl2q0RLT+uX8lmKpWhIPm6aivaVTAEU1/tcXxjSnlRjS99HfrbpOQuW95wmNCPJqPquFOQ4SXdumYlSpHKphYoD8rJdQrjOuyXsDwRdgc6ylwrmXDVRUQuHs0TaNnx3quFLv8B+DqE9PjFui6jqfpLDU7IF7GGeOg07UGN4u6CkfMbjzPNA7Y48mFo7CTCeREn6eXxhvvg/bKaQTHMvlpIcLrWIiEVkCYjuAcQ1e7iL9ZGCm9jkoExXfInBJi7+BTztd9A5C6SVYTmtJSq93u0xHJQLgnjSJIy39N0rgmKveFNhthbBSw3ZYSbSzB5EhsLnfhRms0HO6RlKxCDUDME8EkwT39jbJHbCPW48mqX3t0a1QQKsdTeUi5+hlSsojIfN7oxutcKWQhkFJpXa7kudc3+tILDiZf9Y59tlXEJrkvB4d3oOpSJ6ozn1A4SM3Z4dTY5nFr0MWq7tm09hExYS1XYWqepftUxwJzDSUubCQOUIw7yLvVghtevUUhaOqm9cOTNyorShZW9pSgt845NIyR+N+F6ctlJp1HEJUx37+p+QT9Susg54HNYGIslmbPJJp3u4oD3YsAcGwj1YS9DjiSN36v6jHiWJxXGtvd2PIHg4pBfmDqtrSx9t7Z0E2wtHbODQ==|920
\ No newline at end of file
diff --git a/Pages/工时/任务工时统计.rd b/Pages/工时/任务工时统计.rd
index b065ec17..32b08ff0 100644
--- a/Pages/工时/任务工时统计.rd
+++ b/Pages/工时/任务工时统计.rd
@@ -1,5 +1,15 @@
 {
   "PageType": 0,
-  "ColumnCount": 30,
-  "RowCount": 15
+  "ColumnCount": 45,
+  "RowCount": 18,
+  "CustomNames": [
+    {
+      "Name": "项目",
+      "Formula": "任务工时统计!$D$2"
+    },
+    {
+      "Name": "成员",
+      "Formula": "任务工时统计!$P$2"
+    }
+  ]
 }
\ No newline at end of file
diff --git a/Plugin/Notiflix-9_0_103_0.zip b/Plugin/Notiflix-9_0_103_0.zip
index 4c4f2a8d..d34b30ff 100644
Binary files a/Plugin/Notiflix-9_0_103_0.zip and b/Plugin/Notiflix-9_0_103_0.zip differ