diff --git a/.collaboration b/.collaboration
index cd1be788..eeba45ad 100644
--- a/.collaboration
+++ b/.collaboration
@@ -822,17 +822,7 @@
   },
   {
     "ModuleName": "PCPage/汇报管理",
-    "State": 1,
-    "LockedBy": {
-      "UserName": "TYFEIKELE\\tyfeikele",
-      "Email": "example@example.com"
-    },
-    "LockDateTime": "2024-06-25T17:21:40.2552353+08:00",
-    "ModuleType": 1,
-    "ToRemoveFiles": [
-      "Pages\\汇报\\汇报管理.json",
-      "Pages\\汇报\\汇报管理.rd"
-    ]
+    "ModuleType": 1
   },
   {
     "ModuleName": "Pages/汇报/项目周报",
@@ -1556,29 +1546,11 @@
   },
   {
     "ModuleName": "ServerCommand/根据汇报模板生成内容",
-    "State": 1,
-    "LockedBy": {
-      "UserName": "TYFEIKELE\\tyfeikele",
-      "Email": "example@example.com"
-    },
-    "LockDateTime": "2024-06-25T17:32:19.8029075+08:00",
-    "ModuleType": 15,
-    "ToRemoveFiles": [
-      "ServerCommands\\汇报\\根据汇报模板生成内容.json"
-    ]
+    "ModuleType": 15
   },
   {
     "ModuleName": "ServerCommandPrivate/单日自动生成工作日报",
-    "State": 1,
-    "LockedBy": {
-      "UserName": "TYFEIKELE\\tyfeikele",
-      "Email": "example@example.com"
-    },
-    "LockDateTime": "2024-06-25T17:33:07.2366354+08:00",
-    "ModuleType": 27,
-    "ToRemoveFiles": [
-      "ServerCommands\\汇报\\单日自动生成工作日报.json"
-    ]
+    "ModuleType": 27
   },
   {
     "ModuleName": "ServerCommands/Gitee",
@@ -1842,17 +1814,7 @@
   },
   {
     "ModuleName": "UserControlPage/汇报卡片",
-    "State": 1,
-    "LockedBy": {
-      "UserName": "TYFEIKELE\\tyfeikele",
-      "Email": "example@example.com"
-    },
-    "LockDateTime": "2024-06-25T17:23:00.6243499+08:00",
-    "ModuleType": 31,
-    "ToRemoveFiles": [
-      "UserControlPages\\汇报卡片.json",
-      "UserControlPages\\汇报卡片.rd"
-    ]
+    "ModuleType": 31
   },
   {
     "ModuleName": "Table/汇报模板对应表",
@@ -2201,33 +2163,11 @@
   },
   {
     "ModuleName": "PCPage/汇报详情",
-    "State": 1,
-    "LockedBy": {
-      "UserName": "TYFEIKELE\\tyfeikele",
-      "Email": "example@example.com"
-    },
-    "LockDateTime": "2024-06-25T17:07:59.2281651+08:00",
-    "ModuleType": 1,
-    "ToRemoveFiles": [
-      "Pages\\汇报\\个人日报\\汇报详情.json",
-      "Pages\\汇报\\个人日报\\汇报详情.rd"
-    ]
+    "ModuleType": 1
   },
   {
     "ModuleName": "PCPage/汇报列表",
-    "State": 1,
-    "LockedBy": {
-      "UserName": "TYFEIKELE\\tyfeikele",
-      "Email": "example@example.com"
-    },
-    "LockDateTime": "2024-06-25T17:04:01.8406877+08:00",
-    "ModuleType": 1,
-    "ToRemoveFiles": [
-      "Pages\\汇报\\个人日报\\汇报列表.json",
-      "Pages\\汇报\\个人日报\\汇报列表.rd",
-      "Pages\\3609617039444daea57da1978344c4f.json",
-      "Pages\\3609617039444daea57da1978344c4f.rd"
-    ]
+    "ModuleType": 1
   },
   {
     "ModuleName": "PCPage/汇报详情(废弃)",
diff --git a/Pages/3609617039444daea57da1978344c4f.json b/Pages/3609617039444daea57da1978344c4f.json
index f8e36c58..fb617633 100644
--- a/Pages/3609617039444daea57da1978344c4f.json
+++ b/Pages/3609617039444daea57da1978344c4f.json
@@ -109,7 +109,7 @@
                     },
                     "Value": {
                       "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                      "SerializeProperty": "='3609617039444daea57da1978344c4f'!B2"
+                      "SerializeProperty": "='3609617039444daea57da1978344c4f'!B4"
                     }
                   }
                 }
@@ -283,4 +283,4 @@
     "PaperSize": {},
     "Margin": {}
   }
-}//G6mXZzjQ9EVP0foWgleQDlDuOA93fMrI2hPLZGGsPKs8mxurWfVjVQb8SXcjSE9lD/8x0mYGoRcDuoVw3JLsq3u9zis5D05KrlBK11gcqBHuHswSO1RS75E2iZRCJmPDHdVEptcXukj6YtEAR9x71z26/JSqmHTMahrrHk72G13utqJ1ZqwKDikB0s9JH7TADsV4p9qSyTTUESq2iHG2uUINessG6vPSZMqyRUgP1diV+zUE7ZEAgXXi+SqpK7uw7kqPOD/2NBYl7FxVdrUxjSiV/1+XAdiX0S7z5GZwgMrhpf4t0r2gUgMXoKzvj7Aa5cIDcy92wRG+PKB9UQSjc5/zwZnHJux+t2GrztRFvi1h3N7kPuXU/gzS07CYv8XpUEEC5aw8TfPcsnZcd5SHYoeFN9LjbQGccrTepWEw1njalC+vAa0ulfBVzY9L3SMJkEewNEpQ+A4k+JexELM7eqDyd2kVbYPLaBpiomDlufEgH2n6Fh6a7QpL0cLjNNfuSX3d0CYDCD4vcKlr9z4wxuMb0mOlwVtrbHjLSye0RFVpy3gUeCGNfQNDP3/r9hpj4NdePpR7z+4EX0+OuzP/kZ9ir7cfS8M5UHoSJTFc04A08hql7ztxPFY2wirv5tw/50hLKmV8hnpVyz4tuf6wQehj+D+A23kudt7GDCCozAvfoS8x53sB//a/vFbJzQf7UnAwi93rqQDHZmAlUz0kr1o0L/BUUoHelxg+mAgloVFN7kpHWp82yLvyn9SIsEUt5CZOxPiLagAtp6EOG3Gn2R4QIfDtHgxszATxQ5zsGg9abQqlI6SGbsvyZzug3os1h8nwM7I7z9EbioDjuMyelIzDuTlM3PedmwEp5VsyKNogZXyXUrhHbDN9PRyUP4ouYVTz+P0cIRK1I/PkuuVWrw==|920
\ No newline at end of file
+}//Q3STBhSb011n+WHXqPSsJCcYmmzhZZe6dtyk433yR1CpClG8KziqHst1tTCfkPAXfZ7XaNzaUoKABZrUYzsh6LH98L7XkbmHjHZH0pCGUtjSW+g9LIW+fQTgcpVDRAohdqz1ZzyKG7puUibwk0I4tSUBZlBGL7xeMtIIGK1gWt5N+oVTHdLTuyysGhnwHGi20ySfM7oQMrLq0ZROWYThcgjt2DtIQKHExBXhI3IrKw33YIHZ17oqV4Qp5O7gIYjEvpjR5ayxSH7bf46n0943hzPbR9IV4pmaqVcl3WhJsSQ7C6ooSLxyu7kxDL1LjzClG+OYJ4NBBZ/smOy7HC2QoaW1nY8tffTIoVRPC1DRYb1OikHyQGS4qoHkBKHemyvUTKqN3EA10jqpZsquzx8fEOotF2UrBFXk5npTldNyDY4uCOLpityqLrQBlqkk+JTfA4lYYIgvCzh/WNT3V4eftQU1Jd0lITXP2U7s8xfB+OlcVghSbtWuMkDFaY3A5FhHXFaO2snXUI8y78ZJeoMVkrbARnFCIshbIxfBRkth9oCkPEq7K4o9nfpgh22gidI59QmqmUfLl8aqJ1ngLUs5XXoiylcy4YsvM7njPiHeJnPdvWhwAUBKaZSiV5m+Ae7h4caguKr+8HkDdoEsRWt9v0jICMZ+p0AB5eAmFm0/3tANsywt++g38BGyl6F+GEt6uRMyQKiBgy0pYUZ9F0ndG75aF39OSlTpYpAC2r/kH+Cn/oYYB3LDB+83RAcEy4yEHurbWh9oGemA7vwMnogciTN9JSzbG6DmuIprsHO/9vpYEa0cjJx08LlVQsDgi+lByP2SCP0a11FZblohDKepYmebTE7cKnqMCzz3x60EMwfqKCX+S1Yfbi06OCreHwiCaaTx1Bx+nplNDsisy85q/g==|920
\ No newline at end of file
diff --git a/Pages/3609617039444daea57da1978344c4f.rd b/Pages/3609617039444daea57da1978344c4f.rd
index 289a20c7..5acc3600 100644
--- a/Pages/3609617039444daea57da1978344c4f.rd
+++ b/Pages/3609617039444daea57da1978344c4f.rd
@@ -1,5 +1,5 @@
-{
-  "PageType": 2,
-  "ColumnCount": 15,
-  "RowCount": 5
+{
+  "PageType": 2,
+  "ColumnCount": 15,
+  "RowCount": 5
 }
\ No newline at end of file
diff --git a/Pages/汇报/个人日报/汇报列表.json b/Pages/汇报/个人日报/汇报列表.json
index dd7a8957..6b6bd610 100644
--- a/Pages/汇报/个人日报/汇报列表.json
+++ b/Pages/汇报/个人日报/汇报列表.json
@@ -445,7 +445,15 @@
           "CustomColumns": []
         },
         "DataSourceListviewName": "图文列表表格1",
-        "IsLoadOnDemand": true
+        "IsLoadOnDemand": true,
+        "LoadOnDemandCount": 31,
+        "NoItemSetting": {
+          "ImageForNoItem": {
+            "Name": "暂无内容 (1).png"
+          },
+          "NoItemImageSize": 25.0,
+          "TextForNoItem": "暂无内容"
+        }
       }
     }
   },
@@ -509,4 +517,4 @@
       "Formula": "汇报列表!$A$2"
     }
   ]
-}//SGTI4RorTsoDMiwl8efWRWLf6N3W0nZ2I6EEk0jDsHCecc10b06zQw3Udhki93COr6EQPsg659DxBRWA1c0/1Yl7VkVB752Qbe88iOROiCuhZs1IgICuTcuFAqDKAZpjJxae7SN9eXxKRoqgdrug5+sytH5mv0Qbc3jGnEcjbKOfGWoouNaWyCeDFMknD2/1riphVgMtx02nemcqeS5R7gtOj7Z/fKjHQ9kW/9J9cLplZ4Qxem1wp5N85P0jZcuxlaz4wovW3BdA/p2FAIHHcRUDWb8QVfNFf7wEnjtd2GaHSXJ2sgVwc4ewn4cULoCwrEdHl7bdn6RI7/ER+IVZCts9SL4RxO0af9U9q5nPSIB/N2l2T/JSBEYCJoJ46PHn2iMheIBD0zvHEXZ0qJqGDqvHyDgWTofFRjWW84hcTwBUOdMaElS3sFOcW1JdiaB5mw3rJh7fIwnZtmG56XlpMRQgq0gy/uqLLgUbZVG3gJyRNFbu+yIjYmhRRLFSB+UzyldBsfXDRb1UUUJbR33ojlOOmzzE5dr+hDYCG7nAtkzfwHTOWYihNiJe7hzoglj7pb61uMQ/eFsMX53ZkbxRlKSuHqBbvmL+3Bx1dtRerAdGLUnolBASm5mz8uhCXTakiRISF5PYtzmOm7CWCIlXzYPpmnW/+wVYe7GjkSZAwSKiiQQRtapYekT2VKXtsTUevnbKR5OzeQ2bmafuAfBcriOTvw9BDIsQEEZEnzRoXsE54Tcx4FwOP4ZvqyCm2L/bIer4l+CVOmOo/BQW5qDVdk46j6crLuoZOnXA85Vfm4ZOF3lgqbiEltukrQAbpyE8SXWgM5PmeOvVxqoe2PIjgfD6vDIHwHEnnh5jb3JQFEhIwJjgFF/MOGKs5fojSBLgU5zVDkOPPZuKOREb8tOU3w==|920
\ No newline at end of file
+}//byOUhG2DOlmO6yTBaYm07U8XS/Uctym8PWj+OOeE5hYlvPh4uoryJEWFEkA0razQ8c0acptZ28CdfQp8Q1EaTSIegguAL7W33U1eMYYKWSs7TiPGX+vi6ElJZhrcq1L42oF4InPq6dd/VjPwZb/QN42ky4GRfW7+tmqg/zxKJyLr8zXEpTVD+mTsronIO70bYNFw5VKnE6KdRlUrGj9z+C9R2E3hRM5X8f+6MGHF1P7S8JtzqPZOfjjqqjwtbm6aGjQ84FQHmH0nMvGQ7VB8NblDqXKx4K1Vreka8MpxMsxjRfbaXFMPJixEWWx4wNlt0FZe6b433F1EQLHDuCIpLDncpQczrUktSy8mTeR658whi1WiOiprP0ZiL5/acdQVEq8c29fZoncZrGI3TS13UliXbMhsPbUVa5Ti9H1VwxbfDFXGIvTyG8vDDW2AXOKFQKMh451yYwiYVCSGN8NMN5Rgwry/wv4mPG8C7wz+swXqSpQo85Rxuhr+9Lo1/T6Lv0NsNVzaqJCmwZHwy6/T9I/uuDN1Lz8Tl04iMcSic4e2hu95mgz8VFa6uTDTa9mkqVUJ69kTtN+Zv9kablELUTuaF3/IfP1lmAJRGdBnxWYj7T3GwhgAb7/IvfVEXFW0kZr/c7nTyiTDfwtLTveArKngoGvJSCsZnmE8Oj6664dudOP4H0k5Hfk+9/iE3ZzQqzJGhXXabWpXUUJkVPneyp4Wug5O2dXI3x8AjIjzcgaaFr2XDx0u8EWrqOZPLBKEsURE5ay9wi/WfiEBIte3yQ2UZ3rs6ZUKcIx1XavVeIrw4e2hIUSjgVfmip4byzRJ96zFXJ/qTFHXPCq4/84WNSN+4lMXuSP8kri7BALhNn4RSKvIuEWnCD4XuUzftNvG8Uj0xKpsy9lyK+gvVLOLeA==|920
\ No newline at end of file
diff --git a/Pages/汇报/个人日报/汇报列表.rd b/Pages/汇报/个人日报/汇报列表.rd
index 8faed6d1..031dbc44 100644
--- a/Pages/汇报/个人日报/汇报列表.rd
+++ b/Pages/汇报/个人日报/汇报列表.rd
@@ -1,11 +1,11 @@
-{
-  "PageType": 0,
-  "ColumnCount": 31,
-  "RowCount": 5,
-  "CustomNames": [
-    {
-      "Name": "个人日报表格",
-      "Formula": "汇报列表!$A$2"
-    }
-  ]
+{
+  "PageType": 0,
+  "ColumnCount": 31,
+  "RowCount": 5,
+  "CustomNames": [
+    {
+      "Name": "个人日报表格",
+      "Formula": "汇报列表!$A$2"
+    }
+  ]
 }
\ No newline at end of file
diff --git a/Pages/汇报/个人日报/汇报详情.json b/Pages/汇报/个人日报/汇报详情.json
index 78895e47..6f2af5fe 100644
--- a/Pages/汇报/个人日报/汇报详情.json
+++ b/Pages/汇报/个人日报/汇报详情.json
@@ -266,7 +266,7 @@
                     ]
                   }
                 ],
-                "ID": "cd05eb4b-edf6-486c-ae36-3580c89d717d"
+                "ID": "4e15fc28-f895-4676-9e18-1225b2438862"
               },
               {
                 "Condition": {
@@ -302,7 +302,7 @@
                     ]
                   }
                 ],
-                "ID": "dbdd90c6-46b0-4b93-a30b-83f6ace0b03b"
+                "ID": "87318262-7636-4591-9d4b-aa27818442c5"
               },
               {
                 "Condition": {
@@ -338,7 +338,7 @@
                     ]
                   }
                 ],
-                "ID": "f3646d57-d85c-4560-8450-c7c6a16f1dcf"
+                "ID": "b53c03d9-fa1e-470e-8484-398ec0d16ddc"
               }
             ]
           }
@@ -378,7 +378,8 @@
           "matchMethod": "contains",
           "loadingText": "加载中"
         },
-        "noMatchText": "无匹配数据"
+        "noMatchText": "无匹配数据",
+        "IsDisabled": true
       }
     },
     "3,15": {
@@ -425,7 +426,8 @@
           "matchMethod": "contains",
           "loadingText": "加载中"
         },
-        "noMatchText": "无匹配数据"
+        "noMatchText": "无匹配数据",
+        "IsDisabled": true
       },
       "DataValidationInfo": {
         "IgnoreBlank": false
@@ -589,7 +591,8 @@
           "matchMethod": "contains",
           "loadingText": "加载中"
         },
-        "noMatchText": "无匹配数据"
+        "noMatchText": "无匹配数据",
+        "IsDisabled": true
       },
       "DataValidationInfo": {
         "NumberType": 9,
@@ -634,7 +637,7 @@
                     "ErrorCode": "0"
                   }
                 ],
-                "ID": "7b355823-87a8-47cf-875d-cc3a673dd694"
+                "ID": "49ae3608-768c-44c2-8f91-ec53223a1c25"
               },
               {
                 "CommandList": [
@@ -644,7 +647,7 @@
                     "Message": "必须指定成员"
                   }
                 ],
-                "ID": "8cd4e8e7-ab30-4abe-abd9-cbb2cdcc814d"
+                "ID": "af937fff-2e98-4250-9733-e3c5e1a95887"
               }
             ]
           }
@@ -1029,7 +1032,7 @@
                     "ErrorCode": "0"
                   }
                 ],
-                "ID": "0c83ede8-f0fa-4585-87cd-6a7071d5cbad"
+                "ID": "7bc3fa65-34ae-467f-a925-84fdbb583713"
               },
               {
                 "CommandList": [
@@ -1039,7 +1042,7 @@
                     "Message": "必须指定团队"
                   }
                 ],
-                "ID": "f2f79a94-2477-4885-b484-9bd10728dd6b"
+                "ID": "1e4bf32e-9e8f-4e2c-bfb1-8e6acb31cc3a"
               }
             ]
           }
@@ -1170,7 +1173,7 @@
                     "ErrorCode": "0"
                   }
                 ],
-                "ID": "263b6c06-3e3e-437c-8868-accf0059ddab"
+                "ID": "d3a1ee3e-97bf-419c-9420-4e9e4b470432"
               },
               {
                 "CommandList": [
@@ -1180,7 +1183,7 @@
                     "Message": "必须指定项目"
                   }
                 ],
-                "ID": "da7b1235-a850-43a7-a492-2441f00e8ad6"
+                "ID": "42fbe9e7-f300-4124-9fd4-ed750b38e4de"
               }
             ]
           }
@@ -1386,7 +1389,7 @@
                             ]
                           }
                         ],
-                        "ID": "43ef16be-82d8-4b80-9c47-1634126251d3"
+                        "ID": "ea0baef8-691c-4591-a9b3-09d15729bb67"
                       },
                       {
                         "CommandList": [
@@ -1400,12 +1403,12 @@
                             "Duration": 3000
                           }
                         ],
-                        "ID": "180c0697-6d44-47e3-8c2c-36188ff75a5c"
+                        "ID": "186002bc-b62b-4a85-8bb0-933d414e8a63"
                       }
                     ]
                   }
                 ],
-                "ID": "b5ddcc85-8a1e-4e51-8c5c-9d4d689e85d9"
+                "ID": "a94a1c43-44ce-4432-8bc7-d203697aa50f"
               }
             ]
           }
@@ -1463,13 +1466,292 @@
                   {
                     "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
                     "ParameterName": "纯文本",
-                    "ID": "9d38b6df03bb41b5b8f2e362ea4ce5e0"
+                    "ID": "8f62514c6ab5460cad9de276a6a4f115"
                   },
                   {
                     "$type": "Forguncy.Model.RunJavaScriptCommand, ServerDesignerCommon",
                     "JavaScript": "function getTextFromHTML(htmlString) {\r\n    var parser = new DOMParser();\r\n    var doc = parser.parseFromString(htmlString, 'text/html');\r\n    return doc.body.textContent || \"\";\r\n}\r\n\r\n// 示例使用\r\nvar htmlString =Forguncy.Page.getCell(\"内容\").getValue();\r\nvar text = getTextFromHTML(htmlString);\r\nForguncy.CommandHelper.setVariableValue(\"纯文本\", text);\r\n",
                     "ID": "864bbf0f206a478aa364a99645400ed5"
                   },
+                  {
+                    "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
+                    "ParameterName": "检测重复",
+                    "TableValue": {
+                      "TableName": "汇报记录表",
+                      "TableValueType": 1,
+                      "BindingInfos": [
+                        {
+                          "GUID": "b49bd534-6438-48f2-8f7c-e6fa076fbaab",
+                          "BindingInfo": {
+                            "TableName": "汇报记录表",
+                            "ColumnName": "ID",
+                            "GUID": "b14b57e2-77d7-4189-8452-20d764baff42"
+                          },
+                          "ColumnName": "ID"
+                        }
+                      ],
+                      "SqlCondition": {
+                        "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess",
+                        "SubConditions": [
+                          {
+                            "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+                            "ColumnBindingInfo": {
+                              "TableName": "汇报记录表",
+                              "ColumnName": "开始日期",
+                              "GUID": "c47355c0-a112-46e7-9b42-02c0455f2898"
+                            },
+                            "Value": {
+                              "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                              "SerializeProperty": "=汇报详情!B7"
+                            }
+                          },
+                          {
+                            "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+                            "ColumnBindingInfo": {
+                              "TableName": "汇报记录表",
+                              "ColumnName": "汇报人",
+                              "GUID": "728c003f-ea98-4cb0-96dd-67b9da6cab2a"
+                            },
+                            "Value": {
+                              "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                              "SerializeProperty": "=汇报详情!成员"
+                            }
+                          },
+                          {
+                            "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+                            "ColumnBindingInfo": {
+                              "TableName": "汇报记录表",
+                              "ColumnName": "汇报对象",
+                              "GUID": "139ad227-439a-4158-87c8-9f10b2b71734"
+                            },
+                            "Value": {
+                              "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                              "SerializeProperty": "=汇报详情!汇报对象"
+                            }
+                          },
+                          {
+                            "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+                            "ColumnBindingInfo": {
+                              "TableName": "汇报记录表",
+                              "ColumnName": "汇报类型",
+                              "GUID": "8c152da2-cc05-4832-b6a4-bc3579597afc"
+                            },
+                            "Value": {
+                              "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                              "SerializeProperty": "=汇报详情!汇报类型"
+                            }
+                          }
+                        ]
+                      },
+                      "NullFormulaValueQueryPolicy": 0,
+                      "TopCount": "1"
+                    },
+                    "ID": "0290fea6734445c3b87c2080d66ff111"
+                  },
+                  {
+                    "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
+                    "ConditionAndCommandPairList": [
+                      {
+                        "Condition": {
+                          "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+                          "param": {
+                            "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon",
+                            "cellLocations": [
+                              {
+                                "SerializeProperty": "=汇报详情!检测重复"
+                              }
+                            ]
+                          },
+                          "value": "%Null%"
+                        },
+                        "CommandList": [
+                          {
+                            "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon",
+                            "TableName": "汇报记录表",
+                            "UpdateType": "add",
+                            "ShowConfirm": false,
+                            "UpdateBindingValues": [
+                              {
+                                "BindingInfo": {
+                                  "TableName": "汇报记录表",
+                                  "ColumnName": "状态",
+                                  "GUID": "789d417b-1691-4625-aa80-bd3eed14b165"
+                                },
+                                "Value": "1"
+                              },
+                              {
+                                "BindingInfo": {
+                                  "TableName": "汇报记录表",
+                                  "ColumnName": "纯文本内容",
+                                  "GUID": "b7187877-d77f-4fc9-af18-3c8b49a69be4"
+                                },
+                                "Value": {
+                                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                                  "SerializeProperty": "=汇报详情!纯文本"
+                                }
+                              }
+                            ]
+                          }
+                        ],
+                        "ID": "5470e79a-d649-465d-b346-138147ec498e"
+                      },
+                      {
+                        "CommandList": [
+                          {
+                            "$type": "ElementUI.Commands.ShowMessageBox, ElementUI",
+                            "Title": "提示",
+                            "Message": {
+                              "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                              "SerializeProperty": "=TEXT(汇报详情!B7,\"yyyy-mm-dd\")&\"已经存在\"&汇报详情!汇报类型&\"，是否要更新该日报？\""
+                            },
+                            "Type": "warning",
+                            "ConfirmButtonText": "更新",
+                            "ShowCancelButton": true,
+                            "CancelButtonText": "取消",
+                            "DialogResult": "按钮结果",
+                            "AdvancedSettings": {}
+                          },
+                          {
+                            "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
+                            "ConditionAndCommandPairList": [
+                              {
+                                "Condition": {
+                                  "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+                                  "param": {
+                                    "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon",
+                                    "cellLocations": [
+                                      {
+                                        "SerializeProperty": "=汇报详情!按钮结果"
+                                      }
+                                    ]
+                                  },
+                                  "value": "confirm"
+                                },
+                                "CommandList": [
+                                  {
+                                    "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon",
+                                    "TableName": "汇报记录表",
+                                    "ShowConfirm": false,
+                                    "CheckDataValidation": false,
+                                    "RowsToUpdate": 1,
+                                    "RowsToUpdateCondition": {
+                                      "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+                                      "ColumnBindingInfo": {
+                                        "TableName": "汇报记录表",
+                                        "ColumnName": "ID",
+                                        "GUID": "ca53eef7-c8e3-431b-9244-c456552adc95"
+                                      },
+                                      "Value": {
+                                        "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                                        "SerializeProperty": "=汇报详情!检测重复.ID"
+                                      }
+                                    },
+                                    "UpdateBindingValues": [
+                                      {
+                                        "BindingInfo": {
+                                          "TableName": "汇报记录表",
+                                          "ColumnName": "状态",
+                                          "GUID": "d84f0adf-0f67-4a6e-9d6c-dd786cd8af9d"
+                                        },
+                                        "Value": "1"
+                                      },
+                                      {
+                                        "BindingInfo": {
+                                          "TableName": "汇报记录表",
+                                          "ColumnName": "纯文本内容",
+                                          "GUID": "d315a2f1-b9ce-4857-8be8-80ca3d9227cd"
+                                        },
+                                        "Value": {
+                                          "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                                          "SerializeProperty": "=汇报详情!纯文本"
+                                        }
+                                      },
+                                      {
+                                        "BindingInfo": {
+                                          "TableName": "汇报记录表",
+                                          "ColumnName": "汇报对象",
+                                          "GUID": "84025290-2cfa-464a-b47d-99f7519e2387"
+                                        },
+                                        "Value": {
+                                          "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                                          "SerializeProperty": "=汇报详情!汇报对象"
+                                        }
+                                      },
+                                      {
+                                        "BindingInfo": {
+                                          "TableName": "汇报记录表",
+                                          "ColumnName": "汇报类型",
+                                          "GUID": "3de98fe5-5785-4ea6-98a4-27304ec028b3"
+                                        },
+                                        "Value": {
+                                          "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                                          "SerializeProperty": "=汇报详情!汇报类型"
+                                        }
+                                      },
+                                      {
+                                        "BindingInfo": {
+                                          "TableName": "汇报记录表",
+                                          "ColumnName": "开始日期",
+                                          "GUID": "3c003a4c-261c-489d-94f1-e016d2f56ce4"
+                                        },
+                                        "Value": {
+                                          "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                                          "SerializeProperty": "=汇报详情!B7"
+                                        }
+                                      },
+                                      {
+                                        "BindingInfo": {
+                                          "TableName": "汇报记录表",
+                                          "ColumnName": "汇报人",
+                                          "GUID": "85d506b3-ca9a-465e-b5e9-876c46ef92ea"
+                                        },
+                                        "Value": {
+                                          "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                                          "SerializeProperty": "=汇报详情!成员"
+                                        }
+                                      },
+                                      {
+                                        "BindingInfo": {
+                                          "TableName": "汇报记录表",
+                                          "ColumnName": "内容",
+                                          "GUID": "16f847eb-9f4c-4b5b-ad86-9f19ef06bc3c"
+                                        },
+                                        "Value": {
+                                          "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                                          "SerializeProperty": "=汇报详情!内容"
+                                        }
+                                      },
+                                      {
+                                        "BindingInfo": {
+                                          "TableName": "汇报记录表",
+                                          "ColumnName": "总工时",
+                                          "GUID": "e2f6537b-31e6-4b37-87dd-dfd237516e38"
+                                        },
+                                        "Value": {
+                                          "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                                          "SerializeProperty": "=汇报详情!工时"
+                                        }
+                                      }
+                                    ]
+                                  }
+                                ],
+                                "ID": "63a44da6-e689-4ea7-b78c-a2b445a776ee"
+                              },
+                              {
+                                "CommandList": [
+                                  {
+                                    "$type": "Forguncy.Model.StopCommand, ServerDesignerCommon"
+                                  }
+                                ],
+                                "ID": "b00a0c7a-d1a8-4552-8cc9-c4f4bfd58777"
+                              }
+                            ]
+                          }
+                        ],
+                        "ID": "0f782f21-deda-4f46-aef0-13f225b2d8b9"
+                      }
+                    ]
+                  },
                   {
                     "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
                     "ConditionAndCommandPairList": [
@@ -1487,69 +1769,15 @@
                           "value": "%Null%",
                           "compareType": 1
                         },
-                        "CommandList": [
-                          {
-                            "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon",
-                            "TableName": "汇报记录表",
-                            "ShowConfirm": false,
-                            "UpdateBindingValues": [
-                              {
-                                "BindingInfo": {
-                                  "TableName": "汇报记录表",
-                                  "ColumnName": "状态",
-                                  "GUID": "a2ec275f-6d41-43cc-ad6d-4f3c8c3a80d6"
-                                },
-                                "Value": "1"
-                              },
-                              {
-                                "BindingInfo": {
-                                  "TableName": "汇报记录表",
-                                  "ColumnName": "纯文本内容",
-                                  "GUID": "e3b077fe-4e8c-420f-8d0e-6695e7c66936"
-                                },
-                                "Value": {
-                                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                                  "SerializeProperty": "=汇报详情!纯文本"
-                                }
-                              }
-                            ]
-                          }
-                        ],
-                        "ID": "0758d4a6-9130-45bf-b922-22c64ae14d91"
+                        "CommandList": [],
+                        "ID": "fbc43417-7ea0-4764-8b71-77674c94ce57"
                       },
                       {
-                        "CommandList": [
-                          {
-                            "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon",
-                            "TableName": "汇报记录表",
-                            "UpdateType": "add",
-                            "ShowConfirm": false,
-                            "UpdateBindingValues": [
-                              {
-                                "BindingInfo": {
-                                  "TableName": "汇报记录表",
-                                  "ColumnName": "状态",
-                                  "GUID": "4a648d92-9a02-43f9-af6f-002e064778d2"
-                                },
-                                "Value": "1"
-                              },
-                              {
-                                "BindingInfo": {
-                                  "TableName": "汇报记录表",
-                                  "ColumnName": "纯文本内容",
-                                  "GUID": "822dd352-8d9e-4584-a223-a4a9d41afbeb"
-                                },
-                                "Value": {
-                                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                                  "SerializeProperty": "=汇报详情!纯文本"
-                                }
-                              }
-                            ]
-                          }
-                        ],
-                        "ID": "4c1202ea-3113-4402-9fec-0d05af62059e"
+                        "CommandList": [],
+                        "ID": "5dd4c94f-8f7f-4fb7-b0b8-af7bd6fc4939"
                       }
-                    ]
+                    ],
+                    "Disabled": true
                   },
                   {
                     "$type": "ElementUI.Commands.ShowMessage, ElementUI",
@@ -1564,7 +1792,7 @@
                     "ReloadData": true
                   }
                 ],
-                "ID": "ac57faac-9a1b-4981-9637-de02ced3f3c7"
+                "ID": "cee4efd5-3ab8-49b7-be54-df034638c9f2"
               },
               {
                 "CommandList": [
@@ -1579,7 +1807,7 @@
                     "AdvancedSettings": {}
                   }
                 ],
-                "ID": "2ae76759-80c1-404b-b9a9-312021376f94"
+                "ID": "28a7e8fb-7cd1-4c63-996c-24a449d7af84"
               }
             ]
           }
@@ -2070,4 +2298,4 @@
       "Formula": "汇报详情!$B$11"
     }
   ]
-}//llmuWsDimf3skmH4pgEhV5xHOPY8RdyMt3J2qUQnwDCd+LTFhA3LvQr66SMaig+QezHhYmfMY9YqVxKCwauIVe90OooxYsOM8IxSC2cnTue1Yl4K80XwWGNAtpunvdpxfZaJv2Jsvsk+1ge7pwoYG0m1wkFVvGG1Azd3k9IwIcWHUxFtLQuBKGrI+0F7sXu43NHRsOrL5qH+ZvNpVEI95GRbUL9TimQaMRE4K6kx2QbX9QsE1WEyMFVQ5fvTgzY8vH/s2ScADzNrRAnlh4UQzhsgL1q9dhaQKrEXX8xhqSzO5Plh68qN2ZVhofstjhFVCht3a2HCR6MAkDNUP7l0fKXvAr0IUxq9yJ4iDWfVcfM8Wt9uu/EGVFOSKg9UyWDNCz+9yyhue/pU2MaCHZm3obxcr3XF07DdFroal9VF03f7M1EextGmfneH9MSjpVMSHvuIpE0EtghurJKKLU05e33et7azA2zPsdzro/6mBaXlQC8veG5JV2Jl2M9YdsbhMYbshKTjBvlqpF7qLI7t3rdfY628Xarl8WAfjU7U6N9g8fe6o6cAwLax7FarSfFfT+z58aUSjsvOqcPbUPNC0We+AuTNxfOTaKyZkZkfC6NIhEpoMkL47AuKw4gG5d5gy8lgS0hGoeJyERtA3h6v6JSjIGoKnX1KA4UORRNb3tDkAq0lnRh7KvvWXJnK8sRpIgIBCYkwxvc7o89f2kpHpBD4PMuCuo7BL6fW9foxA+SR1+kFBvUkhj856Q2LJxW5u7DCfSwlia2L7isPBoK2NcKLr4JGyioB5TXSnTFnpsP/73XEZVnAB5BoVzLG6kWLpn0dNolblFlb7HGFt0MSEEEbFr9RwxPD+rwP4hKqkOyMjKdzWpQyRdhIVUYK5lZeDWNh/6TjM9HI+oS+wRbnog==|920
\ No newline at end of file
+}//9/7R/j8eyixNw00yO0bzU0X36PELOxoUDYF+l6gY3tQP1fO/oilHGc7Snsd3o+D5sHhzAauQ/yYSM0HnnV2sKfF/jKSoi943DFvKRa4oVIJS9N39d52q86OvNEneiP2Mkfar/m9N+BafgYRjXSSuvOaTM2VE8YbcM4ZxJMC6aX1/JQay6+ucxdvsPKbGKMr5yLkVYF3OxrgUlYGnJ4xsXLiCty8x77Bge+YRUTHuFiuIXvlhvNqeNkj0jHml7NbVQrrRToLwc95Xma4ky1jugy+2FZ1VP9iYR2uvPm44eUPt0FttQSUuc9pqZlEYQW2VCj6xe9j+XF0yTLv6UGDaAihiAohuwb4VfaFiTqLR+42PDSLjxUKqNW6M82tSAtsreVGq5AeXidbDC/jh0AoiZ01z+z+Ywvs4Y5eB5rd79I8aq+vo3CaJqScPd8AMN0OV2CY6BmYQpXVPFxep1yCSKFrR+CPGpUwCVqX757RjF5occnw/bSXPm0QJO7H3jjy75AMvmyH4Tfoz/qaTCrd/g7oyGSqfuqB3B51d00BuMlMlZrMsacgEct8GzZWtv81WHvMwTHLk1SBR2atdqFB42aFnpBrP4jDLvCa3usBauB5d/TN2NlqzlrTyetPSiQLPWM6v5wb+E+Np7wG8sa7eHIdAv5YIrqJLoct/BnMuRn/4lJOETj07Fvoe4KP0GlYN0Q3oF5/f1nGb42RThcnLf9ROuPXZ94cvt1VRDrvWezds/VlaFIxYDgQsTeth8wZ8x5xrhx35uoKkZs+NKblmJl7hd4fHm9AMXK1BkyHxs+1CGzAcMSf+POwRtRr682ihUzLcD2gTI1uttUd/XNa161xJ+gj/mTiWRV2AyZ09fa6Tyzp4vgZIL8hp4C3dR/mHXIP+10NmOdSMMeq3fr0ESw==|920
\ No newline at end of file
diff --git a/Pages/汇报/个人日报/汇报详情.rd b/Pages/汇报/个人日报/汇报详情.rd
index c21c3ff4..794c775d 100644
--- a/Pages/汇报/个人日报/汇报详情.rd
+++ b/Pages/汇报/个人日报/汇报详情.rd
@@ -1,43 +1,43 @@
-{
-  "PageType": 0,
-  "ColumnCount": 29,
-  "RowCount": 19,
-  "Formulas": {
-    "6,1": "TODAY()-1",
-    "8,1": "IF(汇报对象=\"个人\",\"成员\",汇报对象)"
-  },
-  "CustomNames": [
-    {
-      "Name": "汇报ID",
-      "Formula": "汇报详情!$B$19"
-    },
-    {
-      "Name": "汇报类型",
-      "Formula": "汇报详情!$P$4"
-    },
-    {
-      "Name": "项目ID",
-      "Formula": "汇报详情!$B$12"
-    },
-    {
-      "Name": "汇报对象",
-      "Formula": "汇报详情!$B$4"
-    },
-    {
-      "Name": "成员",
-      "Formula": "汇报详情!$B$10"
-    },
-    {
-      "Name": "工时",
-      "Formula": "汇报详情!$P$7"
-    },
-    {
-      "Name": "内容",
-      "Formula": "汇报详情!$B$15"
-    },
-    {
-      "Name": "团队ID",
-      "Formula": "汇报详情!$B$11"
-    }
-  ]
+{
+  "PageType": 0,
+  "ColumnCount": 29,
+  "RowCount": 19,
+  "Formulas": {
+    "6,1": "TODAY()-1",
+    "8,1": "IF(汇报对象=\"个人\",\"成员\",汇报对象)"
+  },
+  "CustomNames": [
+    {
+      "Name": "汇报ID",
+      "Formula": "汇报详情!$B$19"
+    },
+    {
+      "Name": "汇报类型",
+      "Formula": "汇报详情!$P$4"
+    },
+    {
+      "Name": "项目ID",
+      "Formula": "汇报详情!$B$12"
+    },
+    {
+      "Name": "汇报对象",
+      "Formula": "汇报详情!$B$4"
+    },
+    {
+      "Name": "成员",
+      "Formula": "汇报详情!$B$10"
+    },
+    {
+      "Name": "工时",
+      "Formula": "汇报详情!$P$7"
+    },
+    {
+      "Name": "内容",
+      "Formula": "汇报详情!$B$15"
+    },
+    {
+      "Name": "团队ID",
+      "Formula": "汇报详情!$B$11"
+    }
+  ]
 }
\ No newline at end of file
diff --git a/Pages/汇报/汇报管理.json b/Pages/汇报/汇报管理.json
index 4c052f48..4ec71f86 100644
--- a/Pages/汇报/汇报管理.json
+++ b/Pages/汇报/汇报管理.json
@@ -347,10 +347,7 @@
             "SelectedIconColorUseItemColor": true,
             "IconColor": "Accent 1",
             "IconColorUseItemColor": true,
-            "IsOldMenuPath": false,
-            "CanVisitRoleList": [
-              "FGC_LoginUser"
-            ]
+            "IsOldMenuPath": false
           },
           {
             "Value": "菜单1",
@@ -592,7 +589,7 @@
                                   }
                                 }
                               ],
-                              "ID": "408fd82a-365b-433c-8663-b87808db13fa"
+                              "ID": "7b2c0b86-9b8d-4737-b498-a3e93362295d"
                             }
                           ]
                         }
@@ -787,7 +784,7 @@
                                   }
                                 }
                               ],
-                              "ID": "4e761acf-8ad8-4ad0-9bd4-764c3e4fcc12"
+                              "ID": "e4359f89-a199-4340-8cd5-93d3da68d085"
                             }
                           ]
                         }
@@ -1758,4 +1755,4 @@
       "Formula": "汇报管理!$R$8"
     }
   ]
-}//t67TIXZ4n1EpDgZTs6+mO92bH9/0EYlv1+T8O05ttW43U9u5FZNbrS6H0vacKYG01GT6pmeFIj4IvuqMq3N5d7v29Y7vq7Tg3eVT7spg4sd4b/Jh0ljCiPIMuTqmhzeWqN3Z3OloaB47mP4nIyu9+XLbcwUcDrY7i9FV5YpQQXzDjLvfv8hakCYoHKECVFLjxWH7IyZvR4wLDsBu2u35BAcRYxJeFj852acP0JsxOTL4Njkr6n2aCYgXV+WBvWuPsBmoToP/Do6V+YG4HSl11M5faSN/0/KGDMPBEKq0CiqWKhhr+l3loco3jvZ7vLRBxwBPKhh0YhZdiUtE7PYJh1t0jEof+TH05Yf8irhHGIEPZJh3xVEiq6MYCEA6YkyMsEKsUcQ2NiJiz2i3hF/mjzGbGJZ3PKELCoupxsLcI/uChnuuUe29/XNRHVP3sh8u4++N1kL8YcFLP4pEus/xbhYrq16fIB+Pb+gnP46sluxklbbVpKXgjfQq9YBbK3BfvIWG+OLIssV8ncwAwc5CEjpihEmdCC0MD+viCmBraB/VrdjWYnuCw/RDJYqeWJ5Q6f7H7xLxBGxFQCGA2vOjNwyyvjwS1uXD/L9j3dqsPB67jym5EnMNRg/ik+vy+bFXCYtzf+PFYe7OoiSSEez/MA8JMzJCG9W5vrS9BRRdS1kWVyz0ZepXbshSprSdRIRsII8WAcvb2yhP3naz4JFaKxToa1QxqQiaPNpZfkQPXpLn2n+jdxeOJAUD5C/4RwG+r5Agj7ClSfQeElTVvolFc1Q1RyBWtQ3vccES89h4CUpLD5gjV7QLV2hNQUclQY6kJf4+ch/KBcn8gxK3cxbpLPHHJJeIb8snt14WZ2i74YEHCbVTXCPW2NGrmdU1ezKW4YcmG+daDAJmUbIrrMr/cA==|920
\ No newline at end of file
+}//qzbfyYyZ7WCxvtIVUnCJNxfO2BeTMvVbvoTiT/y4bQ8KJ9L7NzgKmd1VS0+8mV/Ct0iagxmKGRkGQ/5NiiQKuKPg3irWV5SmZGfGpJzgXjQnNMmgm+4jXrvKxe6FTHDQqkCjhPyFzSDs/LIrJu/QtKlJB5TTFyCfUXmwALx5Nag6I0cyUWgCFCEzQnSozv93ba3Ii0wzJ+nRsgTW8NVmwmguzfhSsWwaRqhc9kBuDH6eTOYTr1kYPwjq3EUlLT+MobcLPGcMC6CAB0tjE/fhwb9R4A7lF/lLln9fcJnNukM17dGMqhKsH0JFWbtdriSAQFG48aOfOW2sJl7j6uSaPOXeru189OVLfedk7Usyt419RuqvY3ku6y4Jqh6rguvt5w2mQa0E3qR7162pMexAzwOUA3KFHh3zL0p2M8fPllFMeTWESzs+OehAgRQzc7EbSETmk1TXUm3wdH4ZkQXN/fmM5Zou8Bce33d5G2Kb94PKJ1oWhMWgegO+Q13fWaUuBmoZoKCVty2YWuDkBx5Zztfv1CplVNqbNIP9JIqpTPu3lrb+hLClkOMh0eWBC/xfqnrhPvoplVPQtBU11q1uFIp0L7dZUc7KWW/MlXuWUbvvJfpCSnnsICLCgMq+x7ijogc0/RCziu9HvKzV0sdgcbynBsCjqe3O5QgtTKdMZ9XLJugCwwj2OHPikyg33uF08FGJJXpUFBZncOm7aHVa4sa1zXaBKKSFvNDH5Ww/qyT4Ui4NJX57j4nmiVZHNk0g+QcS6O4C5wlJKzboz1V4YLhhGO2Qt24BvKKo3Wfte7gYs6YC1aHV/pMZZV6GiqrI/4mcF+WdN6jQ/VaHU+9IqLUYioRpg6Lqubc4ELqdCODsv3AHLnIk31pq08ITt4cduhhKZjarAxlIcPoyGBmC0g==|920
\ No newline at end of file
diff --git a/ServerCommands/汇报/单日自动生成工作日报.json b/ServerCommands/汇报/单日自动生成工作日报.json
index 05f3d1f2..b42d16c8 100644
--- a/ServerCommands/汇报/单日自动生成工作日报.json
+++ b/ServerCommands/汇报/单日自动生成工作日报.json
@@ -22,13 +22,13 @@
               "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
               "SerializeProperty": "=TODAY()-1"
             },
-            "ID": "bdbfea55954c4b629904086d70c6cf24"
+            "ID": "1c34a0d795bd41bdbda283acaea024f0"
           },
           {
             "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
             "ParameterName": "汇报人",
             "ParameterValue": "%CurrentUser%",
-            "ID": "ef89d90423994c52bc09de9aaef7299c"
+            "ID": "d1967a498a614945a9ed18d491e02425"
           },
           {
             "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon",
@@ -44,11 +44,13 @@
               },
               {
                 "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon",
-                "ParamName": "汇报类型"
+                "ParamName": "汇报类型",
+                "Value": "日报"
               },
               {
                 "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon",
-                "ParamName": "汇报对象"
+                "ParamName": "汇报对象",
+                "Value": "个人"
               },
               {
                 "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon",
@@ -127,7 +129,7 @@
                               "TableValueType": 1,
                               "BindingInfos": [
                                 {
-                                  "GUID": "1ecca485-8477-40bd-bc47-6dd93c597ba1",
+                                  "GUID": "54a8b66f-a6df-4645-8772-c36f7d8207c4",
                                   "BindingInfo": {
                                     "TableName": "汇报记录表",
                                     "ColumnName": "ID",
@@ -160,7 +162,7 @@
                                     },
                                     "Value": {
                                       "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                                      "SerializeProperty": "=TODAY()"
+                                      "SerializeProperty": "=汇报日期"
                                     }
                                   },
                                   {
@@ -171,12 +173,21 @@
                                       "GUID": "7d6310c4-6c2d-47ff-9742-434ee9c833f2"
                                     },
                                     "Value": "日报"
+                                  },
+                                  {
+                                    "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+                                    "ColumnBindingInfo": {
+                                      "TableName": "汇报记录表",
+                                      "ColumnName": "汇报对象",
+                                      "GUID": "e6b48d0c-2b41-4b5e-9ef4-0eaa71dd1d89"
+                                    },
+                                    "Value": "个人"
                                   }
                                 ]
                               },
                               "NullFormulaValueQueryPolicy": 0
                             },
-                            "ID": "334a23c90ea84954b786f69ed719d8f9"
+                            "ID": "bb847cc2ad724facb075f624bf0e4baa"
                           },
                           {
                             "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
@@ -204,26 +215,26 @@
                                         "BindingInfo": {
                                           "TableName": "汇报记录表",
                                           "ColumnName": "汇报类型",
-                                          "GUID": "5bcbdbb2-ab07-4e79-aa69-0ec84fbe5751"
+                                          "GUID": "35aa0d6b-99a4-4c36-86f7-fd6485eb0d7e"
                                         },
-                                        "Value": "个人日报"
+                                        "Value": "日报"
                                       },
                                       {
                                         "BindingInfo": {
                                           "TableName": "汇报记录表",
                                           "ColumnName": "开始日期",
-                                          "GUID": "d97fb1e2-b359-4b2e-b2c9-6238b5c6508a"
+                                          "GUID": "eb2d6984-be2b-40bd-abaa-e69d08fcb273"
                                         },
                                         "Value": {
                                           "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                                          "SerializeProperty": "=TODAY()"
+                                          "SerializeProperty": "=汇报日期"
                                         }
                                       },
                                       {
                                         "BindingInfo": {
                                           "TableName": "汇报记录表",
                                           "ColumnName": "汇报人",
-                                          "GUID": "b0f7abf6-320b-4e90-90d9-e787bcbb7a97"
+                                          "GUID": "ca05df5f-8360-4e4d-9f8c-3069d619f14c"
                                         },
                                         "Value": {
                                           "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -234,7 +245,7 @@
                                         "BindingInfo": {
                                           "TableName": "汇报记录表",
                                           "ColumnName": "内容",
-                                          "GUID": "dc75653c-83a6-4142-be7e-0409f81d2f54"
+                                          "GUID": "46ca2fe8-34b5-4930-acc4-a01348f64ab7"
                                         },
                                         "Value": {
                                           "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -245,17 +256,33 @@
                                         "BindingInfo": {
                                           "TableName": "汇报记录表",
                                           "ColumnName": "总工时",
-                                          "GUID": "b204ba83-7163-4bad-b1e0-ad29580a2e17"
+                                          "GUID": "73006e6c-33a7-4aeb-98c2-abee7c803125"
                                         },
                                         "Value": {
                                           "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
                                           "SerializeProperty": "=返回总工时"
                                         }
+                                      },
+                                      {
+                                        "BindingInfo": {
+                                          "TableName": "汇报记录表",
+                                          "ColumnName": "汇报对象",
+                                          "GUID": "2fdeaf58-c3cd-4b89-96de-bdce68b35800"
+                                        },
+                                        "Value": "个人"
+                                      },
+                                      {
+                                        "BindingInfo": {
+                                          "TableName": "汇报记录表",
+                                          "ColumnName": "状态",
+                                          "GUID": "cfdf16a1-dada-43a7-a888-48acad2363e9"
+                                        },
+                                        "Value": "1"
                                       }
                                     ]
                                   }
                                 ],
-                                "ID": "1b08af32-4016-4e6e-9175-8c5432816aa2"
+                                "ID": "1acec4c7-0857-4735-853c-e46e378608c2"
                               },
                               {
                                 "CommandList": [
@@ -281,7 +308,7 @@
                                         "BindingInfo": {
                                           "TableName": "汇报记录表",
                                           "ColumnName": "开始日期",
-                                          "GUID": "3a31c9e2-8140-4740-8186-78fffffeee8a"
+                                          "GUID": "a7d94978-bda4-4a9c-830e-c3f52d2f12e6"
                                         },
                                         "Value": {
                                           "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -292,7 +319,7 @@
                                         "BindingInfo": {
                                           "TableName": "汇报记录表",
                                           "ColumnName": "汇报人",
-                                          "GUID": "36bd0b71-7e49-4c55-9b9d-27caa38748bd"
+                                          "GUID": "c0cdf10e-bb0a-48c0-98c1-79d77ea5138b"
                                         },
                                         "Value": {
                                           "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -303,7 +330,7 @@
                                         "BindingInfo": {
                                           "TableName": "汇报记录表",
                                           "ColumnName": "内容",
-                                          "GUID": "6d1fc71a-8d21-49d0-b2cd-a9ed1cfd4b6d"
+                                          "GUID": "e3dd4fe3-01d4-42f0-b9b5-76c5f07852d0"
                                         },
                                         "Value": {
                                           "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -314,7 +341,7 @@
                                         "BindingInfo": {
                                           "TableName": "汇报记录表",
                                           "ColumnName": "总工时",
-                                          "GUID": "18d4f23e-c763-4c4e-a151-fb4e4112fa21"
+                                          "GUID": "63415ccd-c82a-40fe-815b-6ad1e294c952"
                                         },
                                         "Value": {
                                           "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -324,17 +351,17 @@
                                     ]
                                   }
                                 ],
-                                "ID": "bd945f6a-3075-4c0b-b406-d37e89c56e59"
+                                "ID": "82d14f26-de4c-44ec-a78c-4903ee1e3645"
                               }
                             ]
                           }
                         ],
-                        "ID": "5cdca584-f29c-4f1f-826b-52b1ff34bc25"
+                        "ID": "24e67235-6f02-4c70-82b7-0b7873d06410"
                       }
                     ]
                   }
                 ],
-                "ID": "f4c28c28-f2be-46c3-947c-b0fc575ea4d0"
+                "ID": "3003a99b-c1da-4270-99e8-9c7b13a90b6b"
               }
             ]
           }
@@ -352,7 +379,7 @@
                 "BindingInfo": {
                   "TableName": "日志表",
                   "ColumnName": "标题",
-                  "GUID": "226e0eb5-e349-400d-aadf-f1e1aaaecf75"
+                  "GUID": "078ae16b-69ec-437e-b5ba-cf5411ab760c"
                 },
                 "Value": "单日自动生成工作日报命令"
               },
@@ -360,7 +387,7 @@
                 "BindingInfo": {
                   "TableName": "日志表",
                   "ColumnName": "内容",
-                  "GUID": "f77a6239-12a7-4064-b33d-28f45eb52e09"
+                  "GUID": "974dcb58-5239-4944-bb47-ba7b617c24e2"
                 },
                 "Value": {
                   "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -371,7 +398,7 @@
                 "BindingInfo": {
                   "TableName": "日志表",
                   "ColumnName": "类型",
-                  "GUID": "8b6812b2-6240-4396-ae2e-7d35baeedb7c"
+                  "GUID": "272ff25f-8ac8-4204-a7d2-2b019ff09783"
                 },
                 "Value": "服务端命令"
               }
diff --git a/ServerCommands/汇报/根据汇报模板生成内容.json b/ServerCommands/汇报/根据汇报模板生成内容.json
index aafc5ad5..f02aee57 100644
--- a/ServerCommands/汇报/根据汇报模板生成内容.json
+++ b/ServerCommands/汇报/根据汇报模板生成内容.json
@@ -69,7 +69,7 @@
               "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
               "SerializeProperty": "=TEXT(生成日期,\"yyyy-MM-dd\")"
             },
-            "ID": "4418574915d448e8a3a0ff87bb3805e0"
+            "ID": "4ace18ec3a9544668738b0790a291a54"
           },
           {
             "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
@@ -502,7 +502,7 @@
                             ]
                           }
                         ],
-                        "ID": "f4b879c7-4e10-46c2-9ab5-7033aaf5ba1e"
+                        "ID": "7600f268-9488-46aa-aa01-b1c341053864"
                       },
                       {
                         "CommandList": [
@@ -520,19 +520,22 @@
                             ]
                           }
                         ],
-                        "ID": "d98deac5-2088-40ca-b376-488bf807a3c7"
+                        "ID": "fffe1a31-4063-43f7-a617-156b6f8f24e3"
                       }
                     ]
                   }
                 ],
-                "ID": "e2405c9c-b846-40a0-b356-13315a59b6ad"
+                "ID": "861ce463-c1f6-4bce-88cb-85fb65fbb6bb"
               },
               {
                 "CommandList": [
                   {
                     "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon",
                     "ErrorCode": "400",
-                    "Message": "无工作内容。",
+                    "Message": {
+                      "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                      "SerializeProperty": "=处理汇报日期&\"无报工内容！\""
+                    },
                     "CustomReturns": [
                       {
                         "ReturnPropertyName": "生成文本"
@@ -543,7 +546,7 @@
                     ]
                   }
                 ],
-                "ID": "86265d6f-9c96-4add-82fe-0a81ee1876e5"
+                "ID": "9b613c6d-592d-4558-b7e8-782acc3f7a46"
               }
             ]
           }
diff --git a/UserControlPages/汇报卡片.json b/UserControlPages/汇报卡片.json
index 88d14a66..d9dcf957 100644
--- a/UserControlPages/汇报卡片.json
+++ b/UserControlPages/汇报卡片.json
@@ -321,10 +321,6 @@
       "CellType": {
         "$type": "Forguncy.ImageCellType, ServerDesignerCommon",
         "CommandList": [
-          {
-            "$type": "Forguncy.Model.CallUserControlPageCommand, ServerDesignerCommon",
-            "CommandName": "编辑按钮被点击"
-          },
           {
             "$type": "Forguncy.Model.CallUserControlPageCommand, ServerDesignerCommon",
             "CommandName": "删除按钮被点击"
@@ -707,4 +703,4 @@
       "Size": "422,295"
     }
   ]
-}//9pgp90PKRhjMHaU5flANMvydUa9HQeGxf11zKVIz06O7ItQfirgyyDcTteaUkFfEwCe9fMX82NSpbADhohDuAX6ol5EF1RQ0KDxht/13TgVweLYymlmdc83sUI8676LNKt5kab2TLn39WvHHmiKPe+ylUet76naYejx4j/F77MbaJUJZodEI/wOg2pZrIXmCctwfSvbDNObNbN+DIW1freMAUqhak2/6X2xo9rrT15VeN6OlOtMeXacT5dpCGX4MvBM30hIptNVq3ntSoA6FAGDyHmSX4PwkDT1370Up3CghAUg0t2su1ax9MpGxbbAOCt5NjAE4QwWDVpwFNvzdDxoL2KcSuJMxr9RHbem1iWyyb7rXLlMwc4NfWlpeqc2FdR405ZzFYuvAl92cL4sDgd1L/0oNjI0iF5nDvH5AyDQj0HZTgMk9umF6olLgVKcgBLIz6698JBVaQYtNpj5Ug8FpF+rtkv+QPmIq0n4UCe0VF6o3G/jllLn9tI6PBIuKfFIYSlNrN69TS5qfytvhpj3lqUqH2OAzchZhyykOjPEw4tCHsOQHKT7CLXCDgvPI4RFImihLP1aVL7erQVj/T9v9QKRWCrEgqiNY3mUHHQqHQOrEhbvdXlGXd9Y68wT33Dzt/J3WPJBFjutqcFxD6bSzQnWu0D2h5KK/SI/RiwFrEnatENS3Cqlh9uWonhKy5JDH+qNBXD1GFMa9K6m84i9ZfiS879dUe94S44W9q1CPgAI5soIkXllRb9HNfecY1djSLgTrreNjfrLRt9IAf4eispeOXzKg/Rdk8vqYKYwf408g8T3PLMEOhbMidSDZ/otmKWYsQgy5lEIwvinC3ug64XC8zvAk0ujBOGAMKSbXpKbF5/ITWavlqalOiREI0D9RVjjvWHvMGInGkftN+A==|920
\ No newline at end of file
+}//kop3efNaEOtlWgX1GYcjP37ZNy2kKLheCJx71F7i6WCv24V1K+nNOgD0OmvIRBUw5do/tk8Eo+ayRR2A7EFway9u7pWUSY8nkXluz8krMW/TWMglPAj+b7OREdgoYIFaCgLiWvAy0lfjiUgAaNk1PfKsf6MTjQQmTGm5JYCPDkQv3shFFWANE4POyp84n92NXBHnrUQwaqv1nL4ydJah+EmR02eTGKyULpUDgtMCR+HQzpVhkJCndnVsKBXNqHPXr2Ljm55tdhsTmS1nk3SiAz2m9j3//pIlBAmF5MoNwicUoUp71YAMn8Mcq7AavFoAr+g8yw/Qmuc1WG0mvT9poucLgNduffbsiAOTPJFibXXRjLICKGjV8f/xP2jH6FVoBXH1VHAjRRr4ZDjaVKy6dLP5DFmNPx/b1TGzf569vbaGHQ039P/F2jkB0lXP/Kr+HfzpUVac1DB5l1LTvFca0FxUJSR90Chfa7JDQzHw0y6/8Yu4nnO/+m5Zxn42rklho5jHcFha3PtRWmcCaI55Q6F8DS8ki6LIqXjsHw6iV+lT/u60mTn8Wwrguc3bzjNx3VLDNwFXC4R3rA10/EHMNPuf1co8LjLzxCJIGO1a3htiTxBDffcp0YgUeD7mdPaow0UqPQH8GcdZq0/67UDQkEcu94PQDw6cs1Ra5scdkVYN5uCoMgdC70Htl4sq3/t4o6PuweNUcaDeQjXibuf4U1dpdje7OO6AzasxSSfIWQ4a0qVJFOWocPgPz7Ml+EPqXz6hC/yI4DDse7XwOFWm78J+6WIBlH1bEiJAHZh47o77WTv23Yp5+YCwVfTLjBPIOi/dZPocrndatoYMnlfiNwK9BijhgBQ3XUxdTMRArH73TQeh9vuJGovR8s2Gyzn3KMhQmB89OpytcLjocoi73g==|920
\ No newline at end of file
diff --git a/UserControlPages/汇报卡片.rd b/UserControlPages/汇报卡片.rd
index c462aaff..9aa30476 100644
--- a/UserControlPages/汇报卡片.rd
+++ b/UserControlPages/汇报卡片.rd
@@ -1,10 +1,10 @@
-{
-  "PageType": 3,
-  "ColumnCount": 17,
-  "RowCount": 11,
-  "Formulas": {
-    "1,15": "IF(D11,C11,B11)",
-    "2,1": "SUBSTITUTE(L11,CHAR(10),\" \")",
-    "1,1": "TEXT(I11,\"yyyy年mm月dd日\")&\"：\"&G11&\"小时\""
-  }
+{
+  "PageType": 3,
+  "ColumnCount": 17,
+  "RowCount": 11,
+  "Formulas": {
+    "1,15": "IF(D11,C11,B11)",
+    "2,1": "SUBSTITUTE(L11,CHAR(10),\" \")",
+    "1,1": "TEXT(I11,\"yyyy年mm月dd日\")&\"：\"&G11&\"小时\""
+  }
 }
\ No newline at end of file