{"Message":"1. 增加模板对应关系设置；\r\n2. 优化汇报组件显示；\r\n3. 增加日报提交提醒通知；","MessageType":2,"Modules":[{"State":1,"Type":7,"Name":"Table/汇报记录表"},{"State":1,"Type":1,"Name":"PCPage/汇报管理"},{"State":1,"Type":3,"Name":"MasterPCPage/FGC_母版页"},{"State":1,"Type":9,"Name":"Theme"},{"State":1,"Type":12,"Name":"CustomLibrary"},{"State":1,"Type":7,"Name":"Table/汇报模板"},{"State":1,"Type":1,"Name":"PCPage/模板列表"},{"State":1,"Type":1,"Name":"PCPage/模板详情"},{"State":1,"Type":15,"Name":"ServerCommand/根据汇报模板生成内容"},{"State":1,"Type":1,"Name":"PCPage/日报详情"},{"State":1,"Type":27,"Name":"ServerCommandPrivate/单日自动生成工作日报"},{"State":1,"Type":1,"Name":"PCPage/个人日报列表"},{"State":2,"Type":31,"Name":"UserControlPage/折叠卡片"},{"State":1,"Type":15,"Name":"ServerCommand/检查未提交汇报"},{"State":3,"Type":38,"Name":"Image/日报.svg"},{"State":3,"Type":38,"Name":"Image/工作报告.svg"},{"State":3,"Type":38,"Name":"Image/周报.svg"},{"State":3,"Type":38,"Name":"Image/月报.svg"},{"State":3,"Type":38,"Name":"Image/研发平台.svg"},{"State":3,"Type":38,"Name":"Image/报告管理.svg"},{"State":3,"Type":38,"Name":"Image/删除.svg"},{"State":3,"Type":38,"Name":"Image/搜索.svg"},{"State":3,"Type":31,"Name":"UserControlPage/汇报卡片"},{"State":3,"Type":7,"Name":"Table/汇报模板对应表"},{"State":3,"Type":1,"Name":"PCPage/平台设置"},{"State":3,"Type":6,"Name":"Pages/系统/平台设置"},{"State":3,"Type":1,"Name":"PCPage/汇报模板设置"},{"State":3,"Type":1,"Name":"PCPage/汇报对应关系设置"}],"Version":"v1"}

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

@@ -241,6 +241,24 @@
               },
               "ColumnName": "开始日期"
             },
+            {
+              "GUID": "5c035225-0c17-40bb-bf79-03ea85a562b5",
+              "BindingInfo": {
+                "TableName": "汇报记录表",
+                "ColumnName": "汇报类型",
+                "GUID": "862dc65f-800d-46a7-a85e-fc465ece6685"
+              },
+              "ColumnName": "汇报类型"
+            },
+            {
+              "GUID": "6c6d0663-ea50-482a-8a84-b403cfc8711f",
+              "BindingInfo": {
+                "TableName": "汇报记录表",
+                "ColumnName": "汇报对象",
+                "GUID": "c5d061ee-60fa-4c23-866c-001e0b64861c"
+              },
+              "ColumnName": "汇报对象"
+            },
             {
               "GUID": "df8f2578-5d1b-46dc-a811-1d7cb993382e",
               "BindingInfo": {
@@ -280,17 +298,99 @@
                 "GUID": "a6e09f94-3b6f-4c1c-bbda-7ee5ec121e53"
               },
               "ColumnName": "总工时"
+            },
+            {
+              "GUID": "27bd7e43-0e98-4da1-ac7b-c2caf2747981",
+              "BindingInfo": {
+                "TableName": "汇报记录表",
+                "ColumnName": "状态",
+                "GUID": "9679402b-ef92-4dc4-b9c7-9023e4632ef4",
+                "RelationBinding": {
+                  "RelatedTable": "汇报状态",
+                  "RelatedColumn": "状态码",
+                  "DisplayColumn": "状态"
+                }
+              },
+              "ColumnName": "状态"
+            },
+            {
+              "GUID": "b99f131e-0a4a-47c6-b5dc-33486cef9fc1",
+              "BindingInfo": {
+                "TableName": "汇报记录表",
+                "ColumnName": "纯文本内容",
+                "GUID": "24b4abf8-25c5-417e-82c9-b840f87c4765"
+              },
+              "ColumnName": "纯文本内容"
             }
           ],
           "SqlCondition": {
-            "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
-            "ColumnBindingInfo": {
-              "TableName": "汇报记录表",
-              "ColumnName": "汇报类型",
-              "GUID": "c224fc66-d0bd-4914-8996-f8a31bc70e09"
-            },
-            "Value": "日报"
+            "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess",
+            "SubConditions": [
+              {
+                "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+                "ColumnBindingInfo": {
+                  "TableName": "汇报记录表",
+                  "ColumnName": "汇报类型",
+                  "GUID": "c224fc66-d0bd-4914-8996-f8a31bc70e09"
+                },
+                "Value": {
+                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                  "SerializeProperty": "=个人日报列表!汇报类型"
+                }
+              },
+              {
+                "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+                "ColumnBindingInfo": {
+                  "TableName": "汇报记录表",
+                  "ColumnName": "汇报对象",
+                  "GUID": "df0c75b3-49fb-4bb1-b97c-06e5cf723362"
+                },
+                "Value": {
+                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                  "SerializeProperty": "=个人日报列表!汇报对象"
+                }
+              },
+              {
+                "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+                "ColumnBindingInfo": {
+                  "TableName": "汇报记录表",
+                  "ColumnName": "状态",
+                  "GUID": "339407de-abe0-4b93-94b4-c4568e38aa76"
+                },
+                "Value": {
+                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                  "SerializeProperty": "=汇报管理!汇报状态"
+                }
+              },
+              {
+                "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+                "CompareType": 3,
+                "ColumnBindingInfo": {
+                  "TableName": "汇报记录表",
+                  "ColumnName": "开始日期",
+                  "GUID": "4d85b79e-a854-42b2-915e-0ae47bb0c0af"
+                },
+                "Value": {
+                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                  "SerializeProperty": "=个人日报列表!开始日期"
+                }
+              },
+              {
+                "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+                "CompareType": 5,
+                "ColumnBindingInfo": {
+                  "TableName": "汇报记录表",
+                  "ColumnName": "开始日期",
+                  "GUID": "8da041bd-683b-4c24-bf9e-9132a139ac86"
+                },
+                "Value": {
+                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                  "SerializeProperty": "=个人日报列表!结束日期"
+                }
+              }
+            ]
           },
+          "NullFormulaValueQueryPolicy": 1,
           "IsListviewDataSource": true,
           "CustomColumns": []
         },
@@ -324,7 +424,7 @@
   ],
   "PageInfo": {
     "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
-    "Title": "个人日报",
+    "Title": "个人",
     "PageLoadedCommandList": [
       {
         "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy",
@@ -359,4 +459,4 @@
       "Formula": "个人日报列表!$A$2"
     }
   ]
-}//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
+}//sBj4p2dRbnb0ePKCzRHrCKDMFmU3Ype7iiDpSqdP2ABPfBTIBHmLNMIHcgOUs3l4kV6EGQz9f6kHY/Nz80Fzld59A3Lu7HLt0QcvZKwSsT7e5gKS9FgsRAje+1ODBk+Lmb9v4OZ2Jd6Ewv9G0XhBlOZlkruzHs1ldUfyG6Q0RFoynh5knAJ2EX0FjLVIM/uknWyOO1cAXXFCAEytSy5pr1ehSxY5A9gsdGKQdn5JTMqjvvACNAXr5WtYMg1C71GH1Otm5brbIk79KU0xrl7O0y6XLlXLVTTrBiGDzesMA3jqKsKU3HiOl4xw2MQbMLadbiVYLtfnAj15/dXLAtY1tJAxg2Fiz/xqgLrxKQIePLpU5kAEBxsxA51XMdDOnAgMlEBvWkN6O0WWC13imG/eOUtsIyJeH3hE/IKMUwoOIZd98PB34Qpm43V/WxyNV4JqG1HwlSKxmdwIbPFi9igiKSQjyHMGV4+Vm0G1Pjb7GO9CPcSmFGU0S5NAnhKZBdHi1vr191FPdr5V0NikfZogv9iM1uh+op5FOkjWAjlreBMhgTddCA+WyLGajv5sAbekDIZdGzto8rlFCV9gcLGk+dyqbTYGk4wBziGBkWI8GWz3DDjjMKIPCaN5XI5nDwxNSO6n/KMk825DQtOj+LCgY9xfJwGjRvSUnJCfonXcFNzt9DuZya+8fJXSPJlS3ppsyg8XUDXwWx3+Q7IT+FCYpHClg5ZhF0PrfwcfYPkD+pTWU2+iaS4HKKJYNtETh/bYo+0voMa2F530LUMqIfyh2L1Ez5/khKwYe5Ykb05ZVW9/YavSO59DmufplauCgsPZvHhImNvthNTw+TUk1ZQanEigQImu55FlZhyAn9ziY1z3LNTOD6XSsjt3/Bt0s/H12yaO2hVDHkYqR0cyFsQ8sA==|920

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

@@ -1,19 +1,43 @@
 {
   "PageType": 0,
-  "ColumnCount": 20,
-  "RowCount": 14,
+  "ColumnCount": 29,
+  "RowCount": 20,
   "Formulas": {
-    "2,4": "TODAY()-1",
-    "4,4": "IF(E5=\"\",用户名,E5)"
+    "6,1": "TODAY()-1",
+    "8,1": "IF(汇报对象=\"个人\",\"成员\",汇报对象)"
   },
   "CustomNames": [
     {
       "Name": "汇报ID",
-      "Formula": "日报详情!$B$14"
+      "Formula": "日报详情!$B$20"
     },
     {
-      "Name": "报告类型",
-      "Formula": "日报详情!$F$14"
+      "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"
     }
   ]
 }