{"Message":"1","MessageType":2,"Modules":[{"State":1,"Type":7,"Name":"Table/汇报记录表"},{"State":1,"Type":1,"Name":"PCPage/FGC_登录"},{"State":1,"Type":1,"Name":"PCPage/汇报管理"},{"State":1,"Type":1,"Name":"PCPage/汇报详情预览"},{"State":1,"Type":3,"Name":"MasterPCPage/FGC_母版页"},{"State":1,"Type":1,"Name":"PCPage/日报详情"},{"State":1,"Type":1,"Name":"PCPage/个人日报列表"},{"State":1,"Type":1,"Name":"PCPage/登录画面"},{"State":2,"Type":38,"Name":"Image/有头有绪.png"},{"State":2,"Type":38,"Name":"Image/Clue-Logo.png"},{"State":3,"Type":38,"Name":"Image/Clue-Logo1.png"},{"State":3,"Type":38,"Name":"Image/有头有绪1.png"},{"State":3,"Type":7,"Name":"Table/汇报状态"},{"State":3,"Type":15,"Name":"ServerCommand/检查未提交汇报"},{"State":3,"Type":34,"Name":"Notification/汇报提交提醒"}],"Version":"v1"}

.collaboration

@@ -257,16 +257,7 @@
   },
   {
     "ModuleName": "Table/汇报记录表",
-    "State": 1,
-    "LockedBy": {
-      "UserName": "超哥",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-06-16T11:29:06.0646654+08:00",
-    "ModuleType": 7,
-    "ToRemoveFiles": [
-      "Tables\\汇报\\汇报记录表.json"
-    ]
+    "ModuleType": 7
   },
   {
     "ModuleName": "Table/汇报子表",
@@ -407,17 +398,7 @@
   },
   {
     "ModuleName": "PCPage/FGC_登录",
-    "State": 1,
-    "LockedBy": {
-      "UserName": "超哥",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-06-16T11:16:36.5314543+08:00",
-    "ModuleType": 1,
-    "ToRemoveFiles": [
-      "Pages\\内建页面\\FGC_登录.json",
-      "Pages\\内建页面\\FGC_登录.rd"
-    ]
+    "ModuleType": 1
   },
   {
     "ModuleName": "PCPage/FGC_维护中",
@@ -841,17 +822,7 @@
   },
   {
     "ModuleName": "PCPage/汇报管理",
-    "State": 1,
-    "LockedBy": {
-      "UserName": "超哥",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-06-16T11:32:42.2956878+08:00",
-    "ModuleType": 1,
-    "ToRemoveFiles": [
-      "Pages\\汇报\\汇报管理.json",
-      "Pages\\汇报\\汇报管理.rd"
-    ]
+    "ModuleType": 1
   },
   {
     "ModuleName": "Pages/汇报/项目周报",
@@ -867,17 +838,7 @@
   },
   {
     "ModuleName": "PCPage/汇报详情预览",
-    "State": 1,
-    "LockedBy": {
-      "UserName": "超哥",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-06-16T11:29:40.0262081+08:00",
-    "ModuleType": 1,
-    "ToRemoveFiles": [
-      "Pages\\汇报\\个人日报\\汇报详情预览.json",
-      "Pages\\汇报\\个人日报\\汇报详情预览.rd"
-    ]
+    "ModuleType": 1
   },
   {
     "ModuleName": "PCPage/导入汇报数据",
@@ -985,17 +946,7 @@
   },
   {
     "ModuleName": "MasterPCPage/FGC_母版页",
-    "State": 1,
-    "LockedBy": {
-      "UserName": "超哥",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-06-16T11:53:04.9692818+08:00",
-    "ModuleType": 3,
-    "ToRemoveFiles": [
-      "MasterPages\\FGC_母版页.json",
-      "MasterPages\\FGC_母版页.rd"
-    ]
+    "ModuleType": 3
   },
   {
     "ModuleName": "MasterPages/流程母版页面文件夹",
@@ -1663,17 +1614,7 @@
   },
   {
     "ModuleName": "PCPage/日报详情",
-    "State": 1,
-    "LockedBy": {
-      "UserName": "超哥",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-06-16T11:34:01.1962811+08:00",
-    "ModuleType": 1,
-    "ToRemoveFiles": [
-      "Pages\\汇报\\个人日报\\日报详情.json",
-      "Pages\\汇报\\个人日报\\日报详情.rd"
-    ]
+    "ModuleType": 1
   },
   {
     "ModuleName": "ServerCommandPrivate/单日自动生成工作日报",
@@ -1845,19 +1786,7 @@
   },
   {
     "ModuleName": "PCPage/个人日报列表",
-    "State": 1,
-    "LockedBy": {
-      "UserName": "超哥",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-06-16T11:33:03.7149939+08:00",
-    "ModuleType": 1,
-    "ToRemoveFiles": [
-      "Pages\\汇报\\个人日报\\个人日报列表.json",
-      "Pages\\汇报\\个人日报\\个人日报列表.rd",
-      "Pages\\3609617039444daea57da1978344c4f.json",
-      "Pages\\3609617039444daea57da1978344c4f.rd"
-    ]
+    "ModuleType": 1
   },
   {
     "ModuleName": "UserControlPage/折叠卡片",
@@ -1937,92 +1866,26 @@
   },
   {
     "ModuleName": "PCPage/登录画面",
-    "State": 1,
-    "LockedBy": {
-      "UserName": "超哥",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-06-16T11:15:40.3894556+08:00",
-    "ModuleType": 1,
-    "ToRemoveFiles": [
-      "Pages\\内建页面\\登录画面.json",
-      "Pages\\内建页面\\登录画面.rd"
-    ]
-  },
-  {
-    "ModuleName": "Image/有头有绪.png",
-    "State": 2,
-    "LockedBy": {
-      "UserName": "超哥",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-06-16T11:15:40.3893544+08:00",
-    "ModuleType": 38,
-    "ToRemoveFiles": [
-      "image\\图片\\有头有绪.png"
-    ]
-  },
-  {
-    "ModuleName": "Image/Clue-Logo.png",
-    "State": 2,
-    "LockedBy": {
-      "UserName": "超哥",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-06-16T11:14:51.2082906+08:00",
-    "ModuleType": 38,
-    "ToRemoveFiles": [
-      "image\\图片\\Clue-Logo.png"
-    ]
+    "ModuleType": 1
   },
   {
     "ModuleName": "Image/Clue-Logo1.png",
-    "State": 3,
-    "LockedBy": {
-      "UserName": "超哥",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-06-16T11:14:44.0973965+08:00",
     "ModuleType": 38
   },
   {
     "ModuleName": "Image/有头有绪1.png",
-    "State": 3,
-    "LockedBy": {
-      "UserName": "超哥",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-06-16T11:15:45.88438+08:00",
     "ModuleType": 38
   },
   {
     "ModuleName": "Table/汇报状态",
-    "State": 3,
-    "LockedBy": {
-      "UserName": "超哥",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-06-16T11:36:32.7908737+08:00",
     "ModuleType": 7
   },
   {
     "ModuleName": "ServerCommand/检查未提交汇报",
-    "State": 3,
-    "LockedBy": {
-      "UserName": "超哥",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-06-16T11:44:00.9339243+08:00",
     "ModuleType": 15
   },
   {
     "ModuleName": "Notification/汇报提交提醒",
-    "State": 3,
-    "LockedBy": {
-      "UserName": "超哥",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-06-16T11:52:05.2890202+08:00",
     "ModuleType": 34
   }
 ]

MasterPages/FGC_母版页.json

@@ -937,6 +937,44 @@
           "rtl": false
         }
       },
+      {
+        "$type": "Forguncy.Model.SubscribeNotificationCommand, ServerDesignerCommon",
+        "Name": "汇报提交提醒",
+        "CommandList": [
+          {
+            "$type": "ElementUI.Commands.ShowNotification, ElementUI",
+            "Title": {
+              "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+              "SerializeProperty": "=FGC_母版页!标题"
+            },
+            "Message": {
+              "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+              "SerializeProperty": "=FGC_母版页!内容"
+            },
+            "Type": "success",
+            "Duration": 4500,
+            "Position": "bottom-right",
+            "Offset": "15"
+          }
+        ],
+        "ID": "f4adea7b08a64e3a9d11ba3f5e4512a8"
+      },
+      {
+        "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon",
+        "ServerCommandName": "检查未提交汇报",
+        "Parameters": [
+          {
+            "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon",
+            "ParamName": "用户名",
+            "Value": {
+              "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+              "SerializeProperty": "=FGC_母版页!母版_当前用户"
+            }
+          }
+        ],
+        "RequestAsync": true,
+        "CheckDataValidation": false
+      },
       {
         "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon",
         "ServerCommandName": "获取版本号",
@@ -997,4 +1035,4 @@
       "Formula": "FGC_母版页!$B$2"
     }
   ]
-}//J5XRcjkKOiWW0E99whLgu9EyxE58a3TGz944VEIRPRVs390ovF/F2SBT/yuI4ZlxGewrHB8DV7B5en7YuEHbnkjeud0tGuF/JR49gc+O/WMIdyasREir1wbsbXCt+yO+MShPmguh6f2zWSFJC9dG94HyLptIHKl2py1ROGBE9HZK0HJIHV8BYYFXxNL6O2ZjYJrgP5NJkzR4jxx7BEz5VgIIkAWYqsRyKGmbwwPtE7mQA1KuvDExLY3ap/rbPCIPZgnT4mV3wMaqpl9XTWLYkqAb2B9WrhZMNebh6+ucsVuvy7F2Ldw8GbhHh7qtB0a3Mxep52FOExjOc+fy4ampyVwIOTCJruITxsXaCNpGZCIw7VGwGsOSeCVNzvCA/KdsGq2hg3Fwfe8h5Riza78oCTSL7fFb4ofjyOSZoRoWL7WvB2DitorXmASu5GjUPxDYJy3PemSIbZCg35i/TPoAY2utNt8523M+BdfSHQOx0aT6ehIEM9PHA27zN+gpStl+CWuXHluUfe4R5LNZpct0+KG/PXoxIf0tmSbExA/W262XY/uStkU9fdHa5jeK9LiqAmtrD7s2NQ4SejDUlSMMQvB8hmALRGXUCawNNCBpQ5dvFPnnDrwsQ/+pSQHl3poxw5QFZRhY4ruo3TLG6r5zkeFRaQixrGFdc6hdfW+s+7+Shy73fX2wurZDQjPI1An8h4rVBZFHvEAiBnjWn7mdSAIGwg39IlfpxUpIZbrUfVzJD8E4VFL4P0DGoCqw9Wl64r9j6X9vz3DGKuTsB6KxPr4YsBCT9Tkgx0SWx9kKXt2fQYoBX29z42leOZaQTu6Uj1sjUPW0WSorFhCFhKJLZ5VM6EUqy6VDX3/5INkiPFubo5u+7i2BWfL6uNPC2HLMS6wvIrgdQFhR/C2BQHa3/A==|920
+}//9mqJ8dcK4FukkQ99juUXeCul/0V3Uc60n9Rzdhwh0p97JO19zooS7xU7vNDSlx3kVQBexFDpML8dvi/UnHotqeIlyvt6Frs4E3+um1H9kbXdw1ixvQDtyFCNSqIzzdOEykql2ayfgkY1O8jut1pUQvxhkIflmt0XaTT9VnPR8j0bobSrEManrvkG01sQ3FHZ6f8NrH5Wlne6x+SlXJuhcae4+S9WU5Uoec9C7ioOwwlAmkk4nOfnFEPVsgT9zkFtHlfZ5tN2ghTTZplTbXpPOiE3JwP3OJ/+4Vnkvr2aGstFKGH6HqB8KwmE50abM3lTBszUdbXhBQ3D05xF0bih1DWg7ZUXhdTOxIoaNZPOObBBUxVvWNO8hJj0s68sURcy/4PvmW9mhOi1NcmAVFw+zUOymhELsN2nKodIjJ0qslc3OrrI1IICSnAcaGbm5uCxXcoPYgv3O6xz+r6QIk/iktzFZHSXHNhxiHWmtFMEL+5omXTzzHRSDixgMxC8uL62RBS4ZwdAJ09Xb29ImtMNE84xDee3gixCvZNQusUU5Wm+8hqWBzQXabIqMljZqhHYXBzkP6S3rQXPh2nlohp91ZKUlGkJmqYLofjoboTaYi0buGhz2pGsSVkO4boehRHLanBWk+vEWxPB+Ah/ffVB07LP5ZzrXsIFR2JrG1F72LAwothR2pcUAKQnekSEMwxeurnq4QL5Imlus1C6lio9ZnIc7qlBNgqSNpK6Rh3lGOWlyVe4ZaBilCvjUVrpUSxIkWjCpXSnd/gNHGdd1hfKkAJYG7NMLZZidvvDBwqgTv0tf25fJo77ym7PxEUhdA29RU2r3FPvQbmg5PDH0jm30vBaFHTL9L6IO5/mcRx/Vh85zBSNOehCOBO9/SlNvWzR6qx3iRmLEdSJDFb0Xv44zw==|920

Notifications/汇报提交提醒.json

@@ -0,0 +1,25 @@
+{
+  "Name": "汇报提交提醒",
+  "Params": [
+    {
+      "Name": "标题"
+    },
+    {
+      "Name": "内容"
+    }
+  ],
+  "PermissionData": {
+    "$type": "Forguncy.RbacPermission.Core.Impl.ServerNotification.ServerNotificationPermissionData, Forguncy.RbacPermission.Core",
+    "permissionResource": {
+      "$type": "Forguncy.RbacPermission.Core.Impl.ServerNotification.ServerNotificationPermissionResource, Forguncy.RbacPermission.Core"
+    },
+    "permissionBindings": [
+      {
+        "$type": "Forguncy.RbacPermission.Core.Impl.ServerNotification.ServerNotificationPermissionBinding, Forguncy.RbacPermission.Core",
+        "roleNames": [
+          "FGC_LoginUser"
+        ]
+      }
+    ]
+  }
+}

Pages/内建页面/FGC_登录.json

@@ -18,6 +18,11 @@
           "DesignLengthInPixel": 42.0
         }
       },
+      "2": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 52.0
+        }
+      },
       "3": {
         "GridRowColumnDefinition": {
           "DesignLengthInPixel": 36.0
@@ -33,11 +38,26 @@
           "DesignLengthInPixel": 40.0
         }
       },
+      "7": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 15.0
+        }
+      },
+      "9": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 42.0
+        }
+      },
       "10": {
         "GridRowColumnDefinition": {
           "DesignLengthInPixel": 40.0
         }
       },
+      "11": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 37.0
+        }
+      },
       "12": {
         "GridRowColumnDefinition": {
           "DesignLengthInPixel": 20.0
@@ -86,26 +106,6 @@
         "GridRowColumnDefinition": {
           "DesignLengthInPixel": 30.0
         }
-      },
-      "2": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 52.0
-        }
-      },
-      "7": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 15.0
-        }
-      },
-      "9": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 42.0
-        }
-      },
-      "11": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 37.0
-        }
       }
     },
     "Count": 20
@@ -124,11 +124,31 @@
           }
         }
       },
+      "1": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 20.0
+        }
+      },
       "2": {
         "GridRowColumnDefinition": {
           "DesignLengthInPixel": 85.0
         }
       },
+      "3": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 141.0
+        }
+      },
+      "4": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 96.0
+        }
+      },
+      "5": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 141.0
+        }
+      },
       "6": {
         "GridRowColumnDefinition": {
           "DesignLengthInPixel": 85.0
@@ -145,26 +165,6 @@
             "Value": 1.0
           }
         }
-      },
-      "1": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 20.0
-        }
-      },
-      "3": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 141.0
-        }
-      },
-      "4": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 96.0
-        }
-      },
-      "5": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 141.0
-        }
       }
     },
     "Count": 8,
@@ -191,6 +191,7 @@
     "4,3": {
       "CellType": {
         "$type": "ElementUI.InputCellType, ElementUI",
+        "CommandList": [],
         "UIPermissions": [
           {
             "Scope": 2,
@@ -221,6 +222,7 @@
     "6,3": {
       "CellType": {
         "$type": "ElementUI.InputCellType, ElementUI",
+        "CommandList": [],
         "UIPermissions": [
           {
             "Scope": 2,
@@ -521,4 +523,4 @@
       "BoxShadowString": "0 20 0 50 #0C1D2AA5"
     }
   ]
-}//5gencIOFjDWidxMknFgnS+8EB/kUHIUx+w+/1nJkkohfSXXeA8hPWLuziI/JYcRrY3AIfYdE9MNxw/LQOD1xIEh1xcGNlh/l9azj+VICWYFgwnVm0hz4EUfZTFeejgrD3wk64bNSAaTbbbt5KqIoKAoMjl5taSFCETcV7UeDdN/KBYhwjr4LywSByLrYnkToKh76EspNdApXbsnwluAKHpm/i7v5g4h/ew1LSM2T3e/pvxS14G/8NCHHKqQGJ/FpB7WF8YSyvcNl3XhpX6CnPWAJ59aN33i6HZ4PAhiGVC8NQL2cOPgZH3i9TBYgsFmBIN0vyOM/cdXpkh9p/1827GF4btt2yow8uJY0h06kPbu/pkCxID7vLkU/1g+xSzsByX34gyAWol6kEqkYsIusxSCINudnQbgz0opr8stRgwIHDV2upHu+GySlLXWR2QL24Zx8AY35uCr1H/t7K3a5EXorZZZvc/PaGmjIEXDFHe3hlAPykj5c4V3lukSEIgXpIaKrcH5IywsDNWO0WuxAAky+YlU7kSviTzdSLtZxN0uScsLH5DdHNHrTOQY3UCgq7KoiwOPh+AvZ2k3kgGKoxBmXLcQqgJMc57vUh/cEiERj8fBAPX28G16znneAUxrKUlpanCi4t6yxGJ8eM9CDqYkRsND62vKbQFrGMo4kqEpWXqCQzvyu0BUrJJbgcnp5RVlSGQDsb8feGIMJCyEGgve7xwAhtC4Umvy2eoUXXFzzTlOGPEJg3UW2OFa8N4XZu0DWvf+j2xvVidy5tOnCrtymxMm3UvmOrN4j9qwldZebUF9487h2c90DW6cJicVc5AJ3p1tJ8PEOQ0/xzm4HWVQuNHJuQe+5NTI6Vms6sph7bypNtF0LBhvE4b4lNMrsz+1Kv5xJa8avYdUXu1Ocbg==|920
+}//FkZQ3vaRkzprkWcehpzMxsSKBszdU6JhAPOh/1MYHWaJhW4+ZMlDSpsyic76ec+kisa7hCCOfRlvwu7M9yfCvQrfR5NzK9wM2/QM6CfprH5zuqyfLcRo4qSbb2s5zExg5UgM01x8Sc4BBZ7+vX023MBCpg4lVMhzwm8q5J5cOXPpQuSnm4I0yXP1e8OSJDlnr2RTKDUGuNhC8zh4nM3JECuV+bSBPiyIQWbUwkwmxhXbetMy/++PKzlp/lVVywnn05mCw3qRyQeCgWo0n1Wd/gdUdPZK2FWA9oMCubfdgBGhwB6wjTtfjjhHEmG6+lnaq7GP/6QiR45lNeWG/K86P5H+pJm4zP94t+Wnjv7b/iTOwKZVEzWE0XTUYAkBW3+6ZOrRbnCHkyqO/yQtH1LP7FKGMw4s/hGXwgIpT9dwW57TZCdk9nGGMzsRqyIMkzHmpVWkN35t8L1/Ov0kQfS7f46qIbAJlq0cbQpKFN71WvTkqKSvvZbqZbw1SYT1wZlClvE1H7iIQkIhBWczkeCr/xVuAA6XVazXMudmJweocJQI7WgHUrH4ul7oPVLtswRxviOu8fDHlZEc254UB33vu6z3iNFS0C2WwfwGTNN8dNU2zZtWG9s6Ehc8ctCfI9G+PN1maXrQTyQed8mXjubsALLVij0Bi4uDRq888E5buMZsqF1MtrDoX9/EYjPAX7YdRMvWzc0K5qE9ol/J7m9ECpJE9fdO6YqU9OQXO9CBVnTT0WvQ6HxobGwcNQmoWapc51CLZuLBIIkoih3n1wi4LAZ/NRxxhmY7M/8ePI1WjjkTcTRwD7veYWyWPls+zvtxAzXUouLH7ArOiIJvy8k+WjMET1SZyLqi+RmNPEYTE9J4Uo+F0W2husqGIFXMymf4/NHY6pVsZt+yh7LJnkdgsg==|920

Pages/内建页面/登录画面.json

@@ -80,7 +80,12 @@
       },
       "16": {
         "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 97.0
+          "DesignLengthInPixel": 67.0
+        }
+      },
+      "17": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 82.0
         }
       },
       "18": {
@@ -94,11 +99,6 @@
             "Value": 1.0
           }
         }
-      },
-      "17": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 82.0
-        }
       }
     },
     "Count": 19,
@@ -106,6 +106,11 @@
   },
   "Cols": {
     "RowColumnAttachedInfos": {
+      "0": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 53.0
+        }
+      },
       "1": {
         "GridRowColumnDefinition": {
           "DesignLengthInPixel": 107.0
@@ -123,12 +128,7 @@
           }
         }
       },
-      "3": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 32.0
-        }
-      },
-      "8": {
+      "4": {
         "GridRowColumnDefinition": {
           "DesignLengthInPixel": 32.0
         }
@@ -184,6 +184,11 @@
         }
       },
       "19": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "20": {
         "GridRowColumnDefinition": {
           "DesignLengthInPixel": 129.0,
           "Mode": 2,
@@ -195,17 +200,17 @@
           }
         }
       },
-      "0": {
+      "3": {
         "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 53.0
+          "DesignLengthInPixel": 124.0
         }
       }
     },
-    "Count": 20,
+    "Count": 21,
     "DefaultSize": 32.0
   },
   "AttachInfos": {
-    "3,3": {
+    "3,4": {
       "CellType": {
         "$type": "LottiePlayer.LottiePlayerDiv, LottiePlayer",
         "Src": "https://hos-1257098086.cos.ap-chengdu.myqcloud.com/Lottie/programer.json",
@@ -225,7 +230,7 @@
     }
   },
   "Spans": [
-    "3,3,13,16"
+    "3,4,13,16"
   ],
   "PageInfo": {
     "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
@@ -251,21 +256,21 @@
     "Margin": {}
   },
   "Pictures": [
-    {
-      "Name": "b3758ea0-256b-438a-873d-3edce4225269.png",
-      "ForguncyPictureName": "有头有绪.png",
-      "ForguncyPictureSourceType": 0,
-      "Stretch": 2,
-      "Location": "285,634",
-      "Size": "464,115"
-    },
     {
       "Name": "7df344de-6e71-45c9-a221-bf54aa5fd777.png",
-      "ForguncyPictureName": "Clue-Logo.png",
+      "ForguncyPictureName": "Clue-Logo1.png",
       "ForguncyPictureSourceType": 0,
       "Stretch": 2,
       "Location": "53,37",
       "Size": "107,40"
+    },
+    {
+      "Name": "b4c2f884-b5a8-4026-bc55-8d49cab82cc6.png",
+      "ForguncyPictureName": "有头有绪1.png",
+      "ForguncyPictureSourceType": 0,
+      "Stretch": 2,
+      "Location": "197,124",
+      "Size": "348,115"
     }
   ]
-}//ehUY+olzLrtw5Iqfcmn6ykaTikEAf3rmBBcdQeY77q77by7Tft+ns4DdBrWSYndCNFZoChGFvMu1cKDia+JaF3o9dDljejIua8s2lf7Bd3FBLjCbTWaQMzj8ixCUEJpN5BFKDwLYx6ukV5F7ZtYBL51Iywz/r0ontLlACA44880zQ8yReR/v/aL7hHq1Hy5t0EfB9MXsQqFgfi6NnyM1/M9tQQcdnfEkSGcXG6pGQMhSUx0KBfIFcw3X8r0gLVYHArtGmo08A/GMs85rJF6/cezeZa0q2/sVNrzKPSWUBWgugpM4mDbC1HLacu4xapLXPTVKCIvFDCt7WgxX+95ZyzgVDwuoxSpX0uD9iFC0UJKrQuW9RGj1BtrMkrIbVJMwLdfHoeGjw+knmkBWQhsWDF2Jf6xFqy7q70fEn0L+joORKBnTC9sC2/8AWpdxp0yrYvA7paZjtZLENo9YwLroM9tGirfdrqDq5FuZ4aCWO6FlHUn9dgUR1n9OF4zbmdmgL64XH/zsN0tOELJ4IVAiTpJjAYj0GsFsm2q/+UDBCkuxa9vMTt2YiYhQSIvdc18Lo1KP9KAmnmVFFFeKosmgkxB1vQ/xpBJ4tthIljJHR1sk1R4zi0/Pa4VnDMbdJb5c3/ed9S80ogxi2S2/P3SxLlVsO3mqrbOYmbvsvGqMVN9qWlXfx5MYkcYU4r+ZEdm9hIfYfGcmFmbnI/L8NZZDd40TH79prPEiXRTna5SjOzGZVQRG6c0tST7hFpzSp9//Z8X9fjtjMyaBBIzA2y6QoeejKCnPNmAOYjJAt/atHaNTANupZR95qj8Y7FDCOCUzBUltS+jzVtc2iEQ7iP1vUjhApLfK1W9I3Mdfqf8bK7LcSlEPAlzctjsAA3X81VwAe6fAenqnWpTEKEg8jHdelQ==|920
+}//SmVV0SacV+E3/dCxiN6Axlw0FS4dTBZeQTX5LXrgTzGN9bObtcN9FHBPDlCXY66UdZFoHzX+YKnLcEiuvY22AG44v23uekhLQy7hCSJF8Sc428Yyn3wCmVOgKPVqdIzgsbDAzrjlyFm9xnaqEoNLzwqSROET+sNtokQ37HjTwaPCZkaNiT2qgJ5DJl6Pxlxvwr39DMfrn2GVaXDPmcoX9zDWgaXr8NTn8bR4qhu+zLl967rUOMJVJ6n2KpiLBHiyd0YaE9Gvu9SnjTaNpsW2cWuI3HcoPyyl9DOe58QC1oQXbwo28ScY/F/fgFnzx8XG4+AHQv5cB61cnnWIK/p4IvGkH7N+yu3pfdpZlBNbFxf4410rsLYSYSBRT4tIKUvlDwpjPoXzglLnR9wmSMO4W+lkC/Nm0f7lVTPEfn6uLR0NY1gP9pLxTbHq7qqF/2QiczGdz2/vi8qrcbXAArCzqs2jNW74ajBxzO9BVldQXSgr6JYw+nvtEPGEe6fiKkVlc9QwUGwvJM8c9pa2UWXXnfaFf/0cer3EMqzYU9FgZv8gQmRlsAoxkbbE5T6sATiMnEjTkRg+2BEnfOG6hsLZe78tFoYV4mlKZv+hLkrLmqHCBfwQTHFEETZpH4rJumsJtFCmuOSsT0g80kxB7Ayo12HCc5HlamFj4koAS0iTU05Drw332Dz18h44+M/0s4XacdwEWVqtMFATgho1JCZsgaV01uHmlTfdPiTUpGbiAgIlfKaX63A29UdulV7Kcpr8UJFqwOrCrK8wc1l7/u80rSvn2ejh6IjRphB5WbXxUc5TO6ZL/k8CobBU7hzudGeGAcf3r2ek1O32fnzvKp12VJrsKPwl3KYKCwXzg/anDGobtHzPSITqzvyhKj5CtAuvd+kVZEkAXEs42jXlG2KRYg==|920

Pages/内建页面/登录画面.rd

@@ -1,5 +1,5 @@
 {
   "PageType": 0,
-  "ColumnCount": 20,
+  "ColumnCount": 21,
   "RowCount": 19
 }

Pages/汇报/个人日报/个人日报列表.json

@@ -2,6 +2,11 @@
   "Rows": {
     "RowColumnAttachedInfos": {
       "0": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 24.0
+        }
+      },
+      "1": {
         "GridRowColumnDefinition": {
           "DesignLengthInPixel": 523.0,
           "Mode": 2,
@@ -13,12 +18,6 @@
           }
         }
       },
-      "1": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 32.0,
-          "IsHidden": true
-        }
-      },
       "2": {
         "GridRowColumnDefinition": {
           "DesignLengthInPixel": 32.0,
@@ -30,14 +29,20 @@
           "DesignLengthInPixel": 32.0,
           "IsHidden": true
         }
+      },
+      "4": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0,
+          "IsHidden": true
+        }
       }
     },
     "InLogicalVisibleIndexes": [
-      1,
       2,
-      3
+      3,
+      4
     ],
-    "Count": 4,
+    "Count": 5,
     "DefaultSize": 32.0
   },
   "Cols": {
@@ -209,7 +214,7 @@
     "DefaultSize": 32.0
   },
   "AttachInfos": {
-    "0,0": {
+    "1,0": {
       "CellType": {
         "$type": "Forguncy.RepeaterCellType, ServerDesignerCommon",
         "TemplatePageName": "3609617039444daea57da1978344c4f",
@@ -308,14 +313,14 @@
       ]
     },
     "CellStyles": {
-      "0,0": 0
+      "1,0": 0
     },
     "SheetStyle": {
       "FontFamily": 0
     }
   },
   "Spans": [
-    "0,0,1,31"
+    "1,0,1,31"
   ],
   "PageInfo": {
     "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
@@ -351,7 +356,7 @@
   "CustomNames": [
     {
       "Name": "个人日报表格",
-      "Formula": "个人日报列表!$A$1"
+      "Formula": "个人日报列表!$A$2"
     }
   ]
-}//X63lVnKrDzwbDnW/pqEG2pAAJZHMCP7Z8Hz5Dbl7u1Cp9ioWnYytSuv6p6ShR72ji9UBMNiCzXUIC3GQ9yaRoQ3yGVUrMgHUFcZIRp35YquhIGyxOXVgugzl3K4Igitqw1id19HS9tRsbSUkJ7T+E+UM86W8gMC9PFR8A5+9M/NLTJgci9GaaozLYLzMI1oweEM88YNL4mQRL6nQck4VV7u974iWyrDEPxaPQBYYCyhTA4FOd6SFN4dnmgE97qkt6YyfynXbnfU7DyIs9p/mNoeet+s7AVlwd3tY8qKZpFiEpzSxJa7Hq8tPnHNEj5nIqXpmlEyamb7uHrjBKH3p9N8bixHR6esQ2LXl7XMo9j8dPathtj2fnbdJXjhmAGUjP2xn8w0Yja+h0254De78SwshgxMsyEH7ea/f3e8GRTsaoA7J4pAILteX9yw/XuA642qjFXL8yqgZzW0TAEs0frTfN/ivuTVIYsFiI7mxYhMgnRQU8A3Lg9fflBmHQjZI3zU3icBADxekORCgP/fJjgVfck6tZL2ZgW09cXbs43OjiwASh2h9y2A887Z1VoQrFG/lgz6aEx9r8/7Rtzq8320irw27Li1Uyp5aHD6QyDU7WkM3BkuLiPV2ice2i1cMsP6PQgPshXIHypLdAZIPf8NrcFAWWVnZe3TIbv5Qm4MukbPMiK5spa5eKXM6avmMGjGl854DoTeEIiuHvHrQ+KfX9ZQuDCJUU71XJ5eivVion2FFRlE1qsiGtLu2WGkBA7/FzYDqIKQKl0X/4JuFKHVMtIBBaNIKVSrhKzbbW16hTYrVMeolraMgfXMy4ZFb3JbNfxIipiogSYQFuuwcoSdRz77O365ExsKkXSSGV1ZPUBVW1eOE/zkqkaUYVgo1R1VFW9M/IHUblzF0PtDQxQ==|920
+}//MKrop552FaDWDsn3st5M1IANg5yBYrVxwTZdEmsikbePXdxY5JC38E4qHByE0pmaRrRwszm1IMseEnA2OG3v6+OVnAw2Ko5XhnqB8CoYs+XrSzJt5/o3N+Jcc+Kjrcqg4GeqXaUUl5Zc5OYvNK5x63M1aRbSP/zb9nKv4k34Dqll4yoUiKDMuvS2hzfBN1SfNDYboFNGjxK2j9dnvTPtFIUdCeQpwjw3BgpBgkIKPYyiHZ3RC86IC8IzXr8Kf4ORcevsLaQ8W1EE6cXs4yN3I71Zvsx4E/SbaHAwgu8Mg9olIZmR2ye+3YAGOtneUks4cShWVr61Ermt/9PuVhy+htvApapb6/BvqpHXsehR4EFo3aJJmX9yfYSZzyQ0wTjSBzlCww4q//oujk6WqwMNirJu0v+/HuBfziosoNdHfnxK/IyPd4RrbHKvJj6pwwlDdly/0YByw+xmvwyaorO6MKWLpLCRtmtcvlX9M5Gc2umgBRpA5a89E7b7BEvNaYTQPY0RKETSqC+N/cdO7p0Hmzl9BUCqPZe1rZV9n/imqhBjiWjCJlxWYf9IKjyVKzCT67CcYkfXJXazVcR17vhLck28dla31SYDYYEU4GUtRccfuFzdHNs4MlrgPQ/wEY1xOSxRRhI9FZoS1/P39ATHbfg2U5/LpaVttuoluWnhs3ZblQUuWR+uT6H+hwB+1R8sNIgCmXaX+vjnKvp+DP5mVem3s3urcQKhKWUJbq6JRq/wM3RyExZZQRYuZSO1CUHMBDwwO917aVWbcKHxqnVOqpuBuT0sKl+xL3qKkjTJlVva5kVp8HtpcStlhKCHYgflBC8wHNXin8BUGOC47QmnC0keSzebNlkhxZBnGcuE7NtJzqoBa58ADmFMCtoq5TfuNfxMHENwpD7vkrQpgQh3Ng==|920

Pages/汇报/个人日报/个人日报列表.rd

@@ -1,11 +1,11 @@
 {
   "PageType": 0,
   "ColumnCount": 31,
-  "RowCount": 4,
+  "RowCount": 5,
   "CustomNames": [
     {
       "Name": "个人日报表格",
-      "Formula": "个人日报列表!$A$1"
+      "Formula": "个人日报列表!$A$2"
     }
   ]
 }

Pages/汇报/个人日报/日报详情.json

@@ -173,7 +173,7 @@
     "4,4": "%CurrentUser.UserName%",
     "6,1": "工时",
     "11,1": "*日报指的是昨日的工作总结。",
-    "11,12": "重新生成",
+    "11,12": "自动生成",
     "11,16": "保存",
     "13,5": "个人日报"
   },
@@ -374,7 +374,7 @@
           }
         ],
         "type": "textarea",
-        "placeholder": "请输入",
+        "placeholder": "请输入要汇报的内容",
         "resize": "none"
       },
       "DataValidationInfo": {
@@ -500,7 +500,7 @@
                             ]
                           }
                         ],
-                        "ID": "a726aee6-0028-416c-b468-d89e8c8715a7"
+                        "ID": "5b1e06c5-9bc9-4aae-90ce-465c54bf0dae"
                       },
                       {
                         "CommandList": [
@@ -518,17 +518,17 @@
                             "AdvancedSettings": {}
                           }
                         ],
-                        "ID": "dce2dc6b-3b15-42dc-bef3-d0868cc356ff"
+                        "ID": "9a1d146d-2013-40b7-aee3-1ed38502b8a2"
                       }
                     ]
                   }
                 ],
-                "ID": "baec5a5f-d563-4dc1-921e-d63b4d23fc50"
+                "ID": "e081a51c-7eb5-44db-bc3a-f65d4bf3e71e"
               }
             ]
           }
         ],
-        "Text": "重新生成",
+        "Text": "自动生成",
         "TemplateKey": "_RS_Information3",
         "Icon": {
           "Name": "Application/058_refresh_2.svg",
@@ -602,7 +602,7 @@
                             "ShowConfirm": false
                           }
                         ],
-                        "ID": "63f2bd68-d011-41d0-a546-3ac2c638864c"
+                        "ID": "23150284-f6fe-437e-864b-5d0b1389b89c"
                       },
                       {
                         "CommandList": [
@@ -623,7 +623,7 @@
                             ]
                           }
                         ],
-                        "ID": "23c1a79c-6a55-434f-8270-a95d4bd54dd3"
+                        "ID": "c7e35bb0-22bf-4403-8a10-371bde7765a4"
                       }
                     ]
                   },
@@ -640,7 +640,7 @@
                     "ReloadData": true
                   }
                 ],
-                "ID": "6260bdc6-b04d-4eae-84d9-553e8afcbe0f"
+                "ID": "5451d1bd-af5e-41c8-a186-91a424ec1372"
               },
               {
                 "CommandList": [
@@ -655,7 +655,7 @@
                     "AdvancedSettings": {}
                   }
                 ],
-                "ID": "c998072e-2d95-4b06-9b1b-bf0a65753e34"
+                "ID": "5decc7b4-24c7-41b4-81c9-aeaf16073a37"
               }
             ]
           }
@@ -962,4 +962,4 @@
       "Formula": "日报详情!$F$14"
     }
   ]
-}//JaOTgw1mrWbHNSdlp+MREOkAMNkrQ4ugpijUQ89sI9Oaldd90OAnvNKXLOfFVn4ylKuoWgCsUkc9ixk2kY8zuZEblz0nE/2QEGbO+a9Ug35miD7huJaJk2SsYQKVsf3fZrjonj+0jVIR03Ar6D5vM6iFpYn4YsLmbt5o096GPT1Ub+y1cmGwdAPF/4kt2N/1Vwj9fLb0H5JMbQiExRCYAynFEYxtjF5mwPwP5SgMRdFBNSnzJ0EVDz/k4DdquxJPtHyVKeONMnudUABSmDddgmo1PCbgaKUZudDBrEuLgXZzoaa6RW9XxuwecijPMFI1cVRQuxX2wV01Umjd4AP2xYkVnfZ3WTgivLVWuf4e6VgA0xZBcOMYcw8yZF/fAcnbGZPdLcGMaQbKFqN60CfWWpBf+v/ztZDh4vDyqBNgFtQv7/ZNeTcAaYKsLY9/fwGskD8WEIiZKK+2TCOgFkmi2IsEtRjXUjXsbc3GH+8eWKKPRCUWtdiBIhKIzfugrYoIKCvERICBiHq9G4pDNRY6RpC/2oJv4T2JW+tE/eTEd6tCbAdWiQQ1OVqMDGoJ68MkXNF+BfQcpTuctpmDSo2BzlnwpQk92QiFdbh/2L8weOyb3Cm97jgybcHzyYbFsylE14b7zaTL3ERKct69pDy2OCVM265M8ah0WOqZ5Q4/TXIe+hoQYKBh9yUvjRNOeJ3t2tteth5J1h4d0wZFkjEHDAI4PZhZl7FwJB6rqXgzMO3hl3RaimMdvhUB+Zk6Stuq/bXu4kqTbWVFSJr0nqTa21cg/H4z27n23iP7/xy3dZoZipBK2B3yksxJhRSZm6GaJLQvGn9XUxu2TXp1as/R2FEkpx6F7FtMR9/ewEICSWu6MA8oVgolTSG02ZhCatgAIChgjnIBc8vC0ZzpSsFhdQ==|920
+}//0qttZdeETRLJQG7tRbqeS4ZR65o7CntF2k1AFu96fkThmYGPE9j734+TNik9+l/KofGUnTEpEHKjC124T8uveM1AK3mZTYBN+lnUUJ1vvRujZrEk4AfnQklgNvHWNtoOtzZn7jKAiXhIRMC3NAC/TdMuOvuCoOwTdlaZVrP39gr3LVeUYpSLRzA/0QrYt2ZmjTa12unIjOjawDr39Sk0NAHMhRMruLj/v00ssIK9a8NbuUQeldJZS31V8k7mh/Kp/DRJNkcUCkAVSboPtD8CwB5m2iCb/G+fpPlVAT4crKzO+2URzsTHQQku6wctWLkREOHhi1Qo3UaUWmayO/VJS+OfIlh+Nix/+Pg7gOrwfgN6y39I2bVfyxGzOH0EPYgApBZw9pGkouSr6eYGVWWWWX1VdqP8/34SfYDJc4Ukq/vHGXL6MS2zcc+qZNpyGhcup10GwpsMhelEcWl1lV80RpWpKLelWQ0IphFI82QZiOAcXagXQE/26nQKn5IEWJwBbou+2tXXJ4kBpmWs0Ckv96hGtSF3zyLN1pe1JqQLgNbLsU0CrQexHJvr28FhsN1lp34aBx9ma4Z8VXWaZW6IwuH8YrLAkTYI8KS3qYsIy9nnwmmnwsziJPpiZ5HhSamp9+SkA6vOlR8UtTinShZfvsHU3BSsMuS6Jhh1zoSid42CJ4YV8n2PBJUeSXzbZ9FFvsOJv428e3F253EtnTZAelXhRpnYfyExjTqLzvx9ZHOsFiItr6pgQql5YFny68uXUUlall+V0TgIi5tzseMbouZ6uGYdHWpIpkkHesM25FWbO+6VK289qvCWMgvggOmy6JcDpexd76+yWUHYosG+b0zQ1BqYoXcvv7SMj+X40zGEq9BFllURwmPrf/uRo2UZ8YkH9BxGs4Qpd3eQV3W/Jg==|920

Pages/汇报/个人日报/汇报详情预览.json

@@ -46,27 +46,15 @@
           "DesignLengthInPixel": 35.0
         }
       },
-      "14": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 24.0
-        }
-      },
       "15": {
         "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 224.0,
-          "Mode": 2,
-          "MinLength": {
-            "Value": 200.0,
-            "Unit": 1
-          },
-          "MaxLength": {
-            "Value": 1.0
-          }
+          "DesignLengthInPixel": 24.0
         }
       },
       "16": {
         "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 24.0
+          "DesignLengthInPixel": 35.0,
+          "Mode": 1
         }
       }
     },
@@ -148,7 +136,8 @@
     "3,1": "ID",
     "6,1": "日期",
     "9,1": "汇报人",
-    "12,1": "汇报数量"
+    "12,1": "工时",
+    "15,1": "内容"
   },
   "AttachInfos": {
     "4,1": {
@@ -179,113 +168,15 @@
     "13,1": {
       "BindingInfo": {
         "TableName": "汇报记录表",
-        "ColumnName": "汇报数量",
-        "GUID": "7b5edd14-2e35-43e7-bd76-a42ceb9d5d35"
+        "ColumnName": "总工时",
+        "GUID": "cb24ad86-f3ca-4e59-a42c-254c4fe54cbe"
       }
     },
-    "15,1": {
-      "CellType": {
-        "$type": "ElementUI.TableCellType, ElementUI",
-        "ElTableName": "EL表格1",
-        "bindingOptions": {
-          "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon",
-          "TableName": "汇报子表",
-          "BindingInfos": [
-            {
-              "GUID": "5586d219-f052-431e-9299-ad774c9bff34",
-              "BindingInfo": {
-                "TableName": "汇报子表",
-                "ColumnName": "汇报内容简要",
-                "GUID": "a87b1e31-db0b-4463-a4bb-fdc8e1800232"
-              },
-              "ColumnName": "汇报内容简要"
-            }
-          ],
-          "SqlCondition": {
-            "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
-            "ColumnBindingInfo": {
-              "TableName": "汇报子表",
-              "ColumnName": "汇报ID",
-              "GUID": "36713f95-0ae9-4ddf-aba5-aabdca5fb509"
-            },
-            "Value": {
-              "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-              "SerializeProperty": "=汇报详情预览!B5"
-            }
-          },
-          "CustomColumns": []
-        },
-        "autoGenerateColumnsByDataSource": false,
-        "columns": [
-          {
-            "$type": "ElementUI.ColumnSetting, ElementUI",
-            "dataColumnName": "汇报内容简要",
-            "label": "汇报内容简要",
-            "align": "left",
-            "headerAlign": "left",
-            "colfixed": "false",
-            "type": "Default",
-            "tagType": "info",
-            "imgType": "cover",
-            "key": "b2bee9b1-a314-4ae3-b990-a403b9ccc644",
-            "UIPermissions": [
-              {
-                "Scope": 1,
-                "AllowRoles": [
-                  "FGC_Anonymous"
-                ]
-              }
-            ]
-          }
-        ],
-        "actionButtons": [
-          {
-            "$type": "ElementUI.ActionButton, ElementUI",
-            "UIPermissions": [
-              {
-                "Scope": 2,
-                "AllowRoles": [
-                  "FGC_Anonymous"
-                ]
-              },
-              {
-                "Scope": 1,
-                "AllowRoles": [
-                  "FGC_Anonymous"
-                ]
-              }
-            ],
-            "type": "button",
-            "Name": "编辑",
-            "shape": "default"
-          },
-          {
-            "$type": "ElementUI.ActionButton, ElementUI",
-            "UIPermissions": [
-              {
-                "Scope": 2,
-                "AllowRoles": [
-                  "FGC_Anonymous"
-                ]
-              },
-              {
-                "Scope": 1,
-                "AllowRoles": [
-                  "FGC_Anonymous"
-                ]
-              }
-            ],
-            "type": "button",
-            "Name": "删除",
-            "styleType": "Accent 5",
-            "shape": "default"
-          }
-        ],
-        "sumText": "合计",
-        "size": "default",
-        "showHeader": false,
-        "border": false,
-        "stripe": false
+    "16,1": {
+      "BindingInfo": {
+        "TableName": "汇报记录表",
+        "ColumnName": "内容",
+        "GUID": "35352fba-b345-46dd-a543-9e7bc5afac57"
       }
     }
   },
@@ -320,6 +211,11 @@
         "FontSize": 13.333333333333332,
         "Foreground": 2,
         "Formatter": 4
+      },
+      {
+        "FontFamily": 1,
+        "FontSize": 14.666666666666666,
+        "WordWrap": true
       }
     ],
     "Types": {
@@ -392,29 +288,29 @@
       "13,1": 3,
       "13,10": 1,
       "14,0": 1,
-      "14,1": 3,
-      "14,2": 3,
-      "14,3": 3,
-      "14,4": 3,
-      "14,5": 3,
-      "14,6": 3,
-      "14,7": 3,
-      "14,8": 3,
-      "14,9": 3,
+      "14,1": 1,
+      "14,2": 1,
+      "14,3": 1,
+      "14,4": 1,
+      "14,5": 1,
+      "14,6": 1,
+      "14,7": 1,
+      "14,8": 1,
+      "14,9": 1,
       "14,10": 1,
       "15,0": 1,
-      "15,1": 3,
+      "15,1": 6,
+      "15,2": 1,
+      "15,3": 1,
+      "15,4": 1,
+      "15,5": 1,
+      "15,6": 1,
+      "15,7": 1,
+      "15,8": 1,
+      "15,9": 6,
       "15,10": 1,
       "16,0": 1,
-      "16,1": 3,
-      "16,2": 3,
-      "16,3": 3,
-      "16,4": 3,
-      "16,5": 3,
-      "16,6": 3,
-      "16,7": 3,
-      "16,8": 3,
-      "16,9": 3,
+      "16,1": 7,
       "16,10": 1
     },
     "SheetStyle": {
@@ -423,11 +319,11 @@
     }
   },
   "Spans": [
-    "15,1,1,9",
     "4,1,1,9",
     "7,1,1,9",
     "10,1,1,9",
-    "13,1,1,9"
+    "13,1,1,9",
+    "16,1,1,9"
   ],
   "PageInfo": {
     "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
@@ -464,4 +360,4 @@
       "Size": "3,18"
     }
   ]
-}//y8S5UavUL0E2kwFCwGcEnj6HeuMPK/POQZEmyUoqrgdMAKDsANiBKITRBTzaPN3lhnJc+1h7B+cR08dQWFBwbNVxF9fY+Jm3BUkWK0SJoPHNQqpYXS5nbkpiKs3UMgBKE9bwP+UVEWL1Mqljia17jdePekOPQfbTKzQkr2yvc5J7Fnc1m2msd86P7E+NMOcw5p5xon4ZqfXm871koVcj0L1SxIeEiu4z0l/Q8fOXnve78l/YXFEB8C/m90ca9VEdYX8Q7VQS67tSpMw4YJ0Ga3hR8DwyuT0VSlwemaqgIFN6LT4GPvBYjypSvbAgiPlnpDOXWAjnl7XHIisgKI0fYz1ojExkMFfBCffYzKUOMfdftsoYtJJpT6z8FHe7QdE4BnkFqYz+J3GpvmWO01yyVn0+CIoGhUxLxr8Ysxd5e7q6aOKRxzGdrowENJaBuJy6IYwNG4+K/MPMO4WQQt8wIAKdrsxyGO1Pjaoawh8siZiJ5fjJjuJ/9YfR5iKy26VnSmI0wVzo+XU+CveFlEyhx4epHTEXDu5E9saxULGqsmU8tv5HJD7XKXmUyPWdH7GmsafA5Sd86oWIASBipSZy/Mi362MJvRTWwlRQjSqbVkPhHAwfRAHXPQ/GLjpwCYbifdC3UprLA5oc1ou/7krCTf34LFou8YQD8sWDVFHfziLI9CAV0GkHxj0ie93O4s0TijL8Js6abnoIUGxc2T5rzheUmXUxzFxEgD8Om2/MLAdddGWDaQXI/hk/TSMLf8TL5AniwYAkdHdKEYpODzZmlbRATjajnh8iOTc2dF8pRZGvQhY2JmSBEQiZaZMxpKRVK+tt6ZWbjprtc7Pzq/nLisrhedJ6xNyC/eYTSRXgjKfo6l3vah/Hl6Jqqa06+KLL6IoKjpYMHpBnQuiT7LOkcA==|920
+}//R+Ve7RR7srepg7RdIwACI1Bm3zrPvPoTmLH4tKW+vWX5FoPQNwIqU0N/R+/XfzaBedRtrvW99xl5J7WNd4b+MehyOz0rDtnZupn3SI7KU6oFb3eFEHeH2Ovh1/SubaWJeVwn9OirbNGaVy3Kv1mFUz/vcJokCQAO6zGXUrx7KYkXGFoNOQ7jOGKhRCZOjYa5anNayiwscoZGuo3d4ENwbzpjAJ+lfyrGIBuszN8j3jTqv4pqKCHncTmMnYUXN95B5l3D8jXpnF7Noc9wvhVbtOea3QN6/PsPbJiuoiw9nt8WfAuYeLPJguB2Zn8a26nVUTg7kX2eLX1Kixlvq8/ZZCF0vz8mDNcuO9HaawyQp7GySeHWyJ12KRraJ1cf6uOyN9neaVMU0KEyrtyweBaz/VceRbe8HKCI1ctkthQBf4pP4AZOF+TVxo+kf135QP+isC0BxKKElPcmbC2bkzXJ4KuvD0y0CKHJFY5kpKCQQLwroysvE4CkRuBRTNS2tg9gwWR0IndPW2rY3NF1OQa1b7EpMZptYo0tJekvkCd8wweE7AWwVvAPi5wGdneUZVNsIMn6RaUCytDBZF5Tcz2f2CXi/S86T6MD1pLbNuguyNBryeuQ6hkU6NCZirN+nGxf3TzgjM6bbP97Zc4Dh1YcQQoKOdP2uavchn9sUpTkkE/CyxUkuYmjm8YQPWA86o0wKQdwmvoeM8eA6C440teMfOWsuMTUs+DtuhEPG1yu5pXojCjp6ZJaHdmJa+Mz4nz/GPthGFlqlT7SeFfb+sjNYFz/NSuUgDuNdJRHacH4FjcEbz6MwJAuZHdZ6s/yuv8pVzZ2zp8jenJ7jg12izZXTw21Hy7uqrIo5G7qK4wicvvOrsnnFvrv5qzEXBNrA8ssDZkJJ6GBhlOBLOwpO/1jFQ==|920

Pages/汇报/汇报管理.json

@@ -439,7 +439,7 @@
                               }
                             }
                           ],
-                          "ID": "9c04a08f-9a55-43f4-a5f0-312add25e5b3"
+                          "ID": "32e0bb65-5ba4-477f-bd21-c4e24114a494"
                         }
                       ]
                     }
@@ -681,8 +681,12 @@
     },
     "10,1": {
       "CellType": {
-        "$type": "Forguncy.ContentContainerCellType, ServerDesignerCommon",
-        "PageName": "个人日报列表",
+        "$type": "Forguncy.TabControlCellType, ServerDesignerCommon",
+        "TemplateKey": "_RS_NewFashionStyle1",
+        "Tabs": [
+          "个人日报列表"
+        ],
+        "LazyLoading": true,
         "OverflowMode": 1
       }
     },
@@ -1054,8 +1058,8 @@
     "5,17,1,12",
     "3,4,1,25",
     "1,17,1,24",
-    "10,1,7,40",
-    "1,6,1,7"
+    "1,6,1,7",
+    "10,1,7,40"
   ],
   "PageInfo": {
     "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
@@ -1115,4 +1119,4 @@
       "Formula": "汇报管理!$B$19"
     }
   ]
-}//ER5dT0xrPLtQrujE/+eDOC7sJWiYARRImOqgnVj6gnaCiRxy5RPTwzSJkz6yQ5nONL8YJlqzWwhqwZVoyn6dbRAs68rKNwOVWxMFBoC1HOwBuxLQcDeg3ehSYO3lYJvBdL1gh+67yl83pO6Z/X+0zKFqeHwr7NuEr4hyi9JwCYQpCLRQ44yPThIerH2rBXwL8iU255KwSmfxLM3DW0C4V2lr75zpGqmcyLgiS8qSyjTEWrsTFDYtLbZr2/65tNicWUyDZqpje0SQFCk0QxD0k5uKlJJr5yb09+TsORpeEAdVd0ZzbT2CPPsdUqNOWBtmfQrmYYh5AT8CNfFStIstzYTxZXFPgqYOq/wKlTC/tReIDHnyqJyuVa+VWsZcefyU9AMx88oabRgW+eOMMqy95dRkbGQdxZoaKvC1CyzSFss5MnCHKM1DrpjsTa04HTUGQa+EpI7mL8sVhn72noGwHEEPNe6OzIoS4sE/PKGHZI1meABEqztR79NSF3UCPd8aMN8PSyWEBnx6jJY2S4kEJjE/L+TngVhzWpZRDwjkUIqc6JTwABJXbWDoz32iMRX9j3IwygD3oqvA9UuIE0KeE8kOXFXZ7ugPf9M0kPn0gA1f1nFRVd6kuyNCKpGZfJWNZTgrE/4jtaUnSGtbmu7d/juhR0VcF4p17crEUk4mxWBMpqTYfyzqNcJvCRoLQQ9DGrdlSxcpBCNbuhqgsQimQQXteQsGlmirWPgYJ2tT11+ic9CZwt+POe6CF8nExKnqISCyqpm96ZSNgpMI3YhJFCjvzeawySGbViEe4FAZxKAVN5y/UhUsBs5Zo5J5KQIymiEQ7r2PBqFIpISPWfKUG8VOjOufmmuawuWTjiJIEfPXm2NDFbTgIQSUANSqChTGPCdQfiJajBVEDpSUD6CJKw==|920
+}//3r9k+OuMafwKOI4LPNubBQuiGfhzjLHFUlLbZBWnn3wAqAE52BX2N3GhUBjtj0T5j8wk+uVsJnN+drJhuG0jnolnvli1rJ3RvTwwUBCis/AWYyj9jgPmTBhqRb8sgfFXs4yDVzQH33DyZaNtctBf+19ejJHTHDlvh65dTDWPfIxndR+WpfPGVtL6QGMqr8I0XSPyyFTLPheUlLEsvPVW2zr8VTbUSYCql2CaDHe9Se1ISdMEulFbBiFIvoHKdAjn/P2PfwKNIMbF2rvyM0PUaRt6dXNGIEh/XrYBE8pVXsKh3hRZFOGzKPLTjSdW2DqB0WhhylYoZU/RvbGmTFXw4WerP4nov6FYhlXllWJvepxhSauh79WL9BdvDzgiEz36IKtPx/5rUNxyC7x4oRHOxfv6cLgYC9eQRaVZ+hb4Sawf+YxY5IHK42tyEwbA3aY/IquFDGxvTYylnW23bd5nzie9OkCKkNf8OQEOQRozGQvlq2LkThVgF85frd7AM5jNLUrjbMjtrW7cAVs3oqS+GYXMNIf5mL64TYQAqmVtM0mnZZOb6hyFUvAzB0+sgteYX+NyWWiZXL7i307MKnscrVQ69X+6vbYWhvB2LJ5YugIgwIi8BliYUlPT9JFvNAwP/nLP56FJHL1y95DQeKc6ubM4YNqGaZdc7axWGMexj6/fv8r0g66yefdK2mC+EpgQdathP/PNTrpRNHvKeF77RC6B1UcdrbOx9dltQyeprTkGhXkVzgUEOpvr4QWKF3o4cMlzk1+bLe9hcCk0cyKzY7DM+pq0ZV1Bb/m534/LCy8rNiPml10m8b6MZC7td4BbraqJi5IAttbK2XemfPO436eCUdUcP/j9zxYfPnes63O32APaBiIoFipimCfQgN5yZMPQIagznzCBT0qu9BTXjA==|920

ServerCommands/汇报/检查未提交汇报.json

@@ -0,0 +1,198 @@
+{
+  "Name": "检查未提交汇报",
+  "Enabled": true,
+  "Triggers": [
+    {
+      "$type": "Forguncy.SaveLoad.PostRequestTriggerSaveData, ServerDesignerCommon",
+      "Permission": {
+        "PermissionData": {
+          "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionData, Forguncy.RbacPermission.Core",
+          "permissionResource": {
+            "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionResource, Forguncy.RbacPermission.Core"
+          },
+          "permissionBindings": [
+            {
+              "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionBinding, Forguncy.RbacPermission.Core",
+              "roleNames": [
+                "FGC_LoginUser"
+              ]
+            }
+          ]
+        }
+      },
+      "Parameters": [
+        {
+          "Name": "用户名",
+          "DataValidationInfo": {
+            "IgnoreBlank": false
+          }
+        }
+      ]
+    }
+  ],
+  "Commands": [
+    {
+      "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
+      "ParameterName": "汇报分类",
+      "TableValue": {
+        "TableName": "汇报记录表",
+        "BindingInfos": [
+          {
+            "GUID": "8c7fefdd-89ba-4046-9610-2eb651f01924",
+            "BindingInfo": {
+              "TableName": "汇报记录表",
+              "ColumnName": "汇报类型",
+              "GUID": "3af46d9c-128e-4759-ac26-7b44ff526d26"
+            },
+            "ColumnName": "汇报类型"
+          },
+          {
+            "GUID": "b3ce8f5a-ec2f-48df-a581-0b8b0a70d931",
+            "BindingInfo": {
+              "TableName": "汇报记录表",
+              "ColumnName": "行数",
+              "GUID": "93ad164e-0580-4c69-8080-a20159915eb2"
+            },
+            "ColumnName": "行数"
+          }
+        ],
+        "SqlCondition": {
+          "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess",
+          "SubConditions": [
+            {
+              "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+              "ColumnBindingInfo": {
+                "TableName": "汇报记录表",
+                "ColumnName": "汇报人",
+                "GUID": "ca3d940a-80e2-4bef-bc57-81a892e404f2"
+              },
+              "Value": {
+                "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                "SerializeProperty": "=用户名"
+              }
+            },
+            {
+              "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+              "ColumnBindingInfo": {
+                "TableName": "汇报记录表",
+                "ColumnName": "状态",
+                "GUID": "003daade-1d10-428e-97c7-871c4a5463ab"
+              },
+              "Value": "0"
+            }
+          ]
+        },
+        "NullFormulaValueQueryPolicy": 0
+      },
+      "ID": "504ba365e40345e58ed4330479f11fc7"
+    },
+    {
+      "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
+      "ConditionAndCommandPairList": [
+        {
+          "Condition": {
+            "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+            "param": {
+              "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon",
+              "ParamObject": {
+                "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                "SerializeProperty": "=汇报分类.Count"
+              }
+            },
+            "value": "0",
+            "compareType": 2
+          },
+          "CommandList": [
+            {
+              "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
+              "ParameterName": "汇报模板",
+              "TableValue": {
+                "TableName": "汇报模板",
+                "TableValueType": 1,
+                "BindingInfos": [
+                  {
+                    "GUID": "6ef63570-9dbd-4eed-b248-27314bd25091",
+                    "BindingInfo": {
+                      "TableName": "汇报模板",
+                      "ColumnName": "模板内容",
+                      "GUID": "92c1dd1b-a89b-477b-bff6-045c5f40654b"
+                    },
+                    "ColumnName": "模板内容"
+                  }
+                ],
+                "SqlCondition": {
+                  "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+                  "ColumnBindingInfo": {
+                    "TableName": "汇报模板",
+                    "ColumnName": "ID",
+                    "GUID": "ebddb57d-c0c8-4377-bfdd-70f4a77d6bda"
+                  },
+                  "Value": "4"
+                },
+                "NullFormulaValueQueryPolicy": 0,
+                "TopCount": "1"
+              },
+              "ID": "25ee65bc622248a18bc56bce614dd21a"
+            },
+            {
+              "$type": "CollectionOperationKit.ServerSideObjectOp, CollectionOperationKit",
+              "OperationParamaterPairs": [
+                {
+                  "Name": "汇报列表",
+                  "Value": {
+                    "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                    "SerializeProperty": "=汇报分类"
+                  }
+                }
+              ],
+              "OutParamaterName": "数据源"
+            },
+            {
+              "$type": "MustachePlugin.Render, MustachePlugin",
+              "DataSrouce": {
+                "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                "SerializeProperty": "=汇报模板.模板内容"
+              },
+              "UseCustomsDataHash": true,
+              "CustomsDataHash": {
+                "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                "SerializeProperty": "=数据源"
+              },
+              "SetMaxRecursionDepth": 512,
+              "ResultTo": "输出结果"
+            },
+            {
+              "$type": "Forguncy.Model.NotificationMessageCommand, ServerDesignerCommon",
+              "NotificationName": "汇报提交提醒",
+              "SendType": 1,
+              "UserNames": {
+                "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                "SerializeProperty": "=用户名"
+              },
+              "Params": [
+                {
+                  "Name": "标题",
+                  "Value": "汇报等待提交"
+                },
+                {
+                  "Name": "内容",
+                  "Value": {
+                    "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                    "SerializeProperty": "=输出结果"
+                  }
+                }
+              ],
+              "ID": "da6f51a2bf2c4ae3a857efb985c30fb7"
+            }
+          ],
+          "ID": "990de595-2c5e-4431-9e9d-6a5bec691b53"
+        }
+      ]
+    },
+    {
+      "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon",
+      "ErrorCode": "0",
+      "Message": "完成"
+    }
+  ]
+}

Tables/字典表/汇报状态.json

@@ -0,0 +1,59 @@
+{
+  "Name": "汇报状态",
+  "Columns": [
+    {
+      "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon",
+      "Required": true,
+      "Unique": true,
+      "AutoIncrement": true,
+      "DatabaseColumnType": "bigint",
+      "MaxLength": -1,
+      "Name": "ID",
+      "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
+    },
+    {
+      "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon",
+      "DatabaseColumnType": "bigint",
+      "MaxLength": -1,
+      "Name": "状态码",
+      "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
+    },
+    {
+      "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon",
+      "DatabaseColumnType": "nvarchar",
+      "Name": "状态",
+      "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
+    },
+    {
+      "$type": "Forguncy.SaveLoad.UserExtraBingingColumnSaveData, ServerDesignerCommon",
+      "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e",
+      "Name": "FGC_Creator"
+    },
+    {
+      "$type": "Forguncy.SaveLoad.DateExtraBingingColumnSaveData, ServerDesignerCommon",
+      "ColumnType": "System.DateTime, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e",
+      "Name": "FGC_CreateDate"
+    },
+    {
+      "$type": "Forguncy.SaveLoad.UserExtraBingingColumnSaveData, ServerDesignerCommon",
+      "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e",
+      "Name": "FGC_LastModifier"
+    },
+    {
+      "$type": "Forguncy.SaveLoad.DateExtraBingingColumnSaveData, ServerDesignerCommon",
+      "ColumnType": "System.DateTime, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e",
+      "Name": "FGC_LastModifyDate"
+    }
+  ],
+  "ExternalDatabaseInfo": {
+    "DataBaseType": "6db454c0-531c-4395-9122-921a18942902",
+    "AllowModifySchema": true,
+    "ConnectionId": "业务表",
+    "SourceTableName": "汇报状态",
+    "SourceTableSchema": "dbo"
+  },
+  "PrimaryKey": [
+    "ID"
+  ],
+  "Indexes": []
+}

Tables/汇报/汇报记录表.json

@@ -21,16 +21,16 @@
     },
     {
       "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon",
-      "DatabaseColumnType": "datetime",
+      "DatabaseColumnType": "bigint",
       "MaxLength": -1,
-      "Name": "开始日期",
-      "ColumnType": "System.DateTime, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
+      "Name": "项目ID",
+      "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
     },
     {
       "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon",
       "DatabaseColumnType": "datetime",
       "MaxLength": -1,
-      "Name": "截止日期",
+      "Name": "开始日期",
       "ColumnType": "System.DateTime, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
     },
     {
@@ -47,19 +47,6 @@
       "Name": "内容",
       "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
     },
-    {
-      "$type": "Forguncy.SaveLoad.StatisticColumnSaveData, ServerDesignerCommon",
-      "BindingInfo": {
-        "TableName": "汇报子表",
-        "ColumnName": "汇报内容简要",
-        "GUID": "d9f08423-949b-4a13-9405-64554735e2b9"
-      },
-      "AggregateFunction": 5,
-      "DataColumnName": "汇报内容简要",
-      "DetailTableName": "汇报子表",
-      "Name": "所有描述",
-      "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
-    },
     {
       "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon",
       "DefaultValue": 0.0,
@@ -68,25 +55,32 @@
       "Name": "总工时",
       "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
     },
-    {
-      "$type": "Forguncy.SaveLoad.StatisticColumnSaveData, ServerDesignerCommon",
-      "BindingInfo": {
-        "TableName": "汇报子表",
-        "ColumnName": "ID",
-        "GUID": "a22dbff4-1213-4842-ad4b-d68ece0a25cc"
-      },
-      "AggregateFunction": 1,
-      "DataColumnName": "ID",
-      "DetailTableName": "汇报子表",
-      "Name": "汇报数量",
-      "ColumnType": "System.Int32, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
-    },
     {
       "$type": "Forguncy.SaveLoad.FormulaColumnSaveData, ServerDesignerCommon",
       "Formula": "YEAR([FGC_CreateDate])&\"-\"&MONTH([FGC_CreateDate])&\"-\"&DAY([FGC_CreateDate])",
       "Name": "汇报日期文本",
       "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
     },
+    {
+      "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon",
+      "DefaultValue": 0,
+      "DatabaseColumnType": "bigint",
+      "MaxLength": -1,
+      "Name": "状态",
+      "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
+    },
+    {
+      "$type": "Forguncy.SaveLoad.StatisticColumnSaveData, ServerDesignerCommon",
+      "BindingInfo": {
+        "TableName": "汇报记录表",
+        "ColumnName": "ID",
+        "GUID": "2d3c8a6f-2425-4598-b883-82081ad6f99f"
+      },
+      "AggregateFunction": 1,
+      "DataColumnName": "ID",
+      "Name": "行数",
+      "ColumnType": "System.Int32, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
+    },
     {
       "$type": "Forguncy.SaveLoad.UserExtraBingingColumnSaveData, ServerDesignerCommon",
       "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e",
@@ -118,5 +112,14 @@
   "PrimaryKey": [
     "ID"
   ],
+  "Relations": [
+    {
+      "PrimaryTable": "项目表",
+      "PrimaryColumn": "ID",
+      "ForeignTable": "汇报记录表",
+      "ForeignColumn": "项目ID",
+      "IsDetailTableRelation": true
+    }
+  ],
   "Indexes": []
 }