{"Message":"优化模板及日报页面","MessageType":2,"Modules":[{"State":1,"Type":1,"Name":"PCPage/汇报管理"},{"State":1,"Type":1,"Name":"PCPage/模板列表"},{"State":1,"Type":1,"Name":"PCPage/模板详情"},{"State":1,"Type":1,"Name":"PCPage/日报详情"}],"Version":"v1"}

.collaboration

@@ -822,17 +822,7 @@
   },
   {
     "ModuleName": "PCPage/汇报管理",
-    "State": 1,
+    "ModuleType": 1
-    "LockedBy": {
-      "UserName": "TYFEIKELE\\tyfeikele",
-      "Email": "example@example.com"
-    },
-    "LockDateTime": "2024-06-14T22:37:29.7342592+08:00",
-    "ModuleType": 1,
-    "ToRemoveFiles": [
-      "Pages\\汇报\\汇报管理.json",
-      "Pages\\汇报\\汇报管理.rd"
-    ]
   },
   {
     "ModuleName": "Pages/汇报/项目周报",
@@ -1620,31 +1610,11 @@
   },
   {
     "ModuleName": "PCPage/模板列表",
-    "State": 1,
+    "ModuleType": 1
-    "LockedBy": {
-      "UserName": "TYFEIKELE\\tyfeikele",
-      "Email": "example@example.com"
-    },
-    "LockDateTime": "2024-06-14T23:08:50.7428056+08:00",
-    "ModuleType": 1,
-    "ToRemoveFiles": [
-      "Pages\\汇报\\汇报模板\\模板列表.json",
-      "Pages\\汇报\\汇报模板\\模板列表.rd"
-    ]
   },
   {
     "ModuleName": "PCPage/模板详情",
-    "State": 1,
+    "ModuleType": 1
-    "LockedBy": {
-      "UserName": "TYFEIKELE\\tyfeikele",
-      "Email": "example@example.com"
-    },
-    "LockDateTime": "2024-06-14T23:06:38.7941788+08:00",
-    "ModuleType": 1,
-    "ToRemoveFiles": [
-      "Pages\\汇报\\汇报模板\\模板详情.json",
-      "Pages\\汇报\\汇报模板\\模板详情.rd"
-    ]
   },
   {
     "ModuleName": "ServerCommand/根据汇报模板生成内容",
@@ -1652,17 +1622,7 @@
   },
   {
     "ModuleName": "PCPage/日报详情",
-    "State": 1,
+    "ModuleType": 1
-    "LockedBy": {
-      "UserName": "TYFEIKELE\\tyfeikele",
-      "Email": "example@example.com"
-    },
-    "LockDateTime": "2024-06-14T22:10:49.8728649+08:00",
-    "ModuleType": 1,
-    "ToRemoveFiles": [
-      "Pages\\汇报\\日报\\日报详情.json",
-      "Pages\\汇报\\日报\\日报详情.rd"
-    ]
   },
   {
     "ModuleName": "ServerCommandPrivate/单日自动生成工作日报",

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

@@ -181,6 +181,7 @@
   },
   "Values": {
     "4,1": "汇报人：",
+    "4,4": "%CurrentUser.UserName%",
     "6,1": "昨日工时：",
     "6,20": "小时",
     "8,1": "昨日工作：",
@@ -191,7 +192,9 @@
     "14,19": "%CurrentUser.UserName%"
   },
   "Formulas": {
-    "2,1": "TEXT(E15,\"yyyy-mm-dd\")&\"工作日报\""
+    "2,1": "IF(汇报日期=\"\",今日日期,汇报日期)&\"工作日报\"",
+    "4,4": "IF(E5=\"\",用户名,E5)",
+    "14,7": "TEXT(TODAY(),\"yyyy-mm-dd\")"
   },
   "AttachInfos": {
     "4,4": {
@@ -201,6 +204,160 @@
         "GUID": "725c94dd-5797-482d-a9d9-4b45e706a0c9"
       }
     },
+    "4,20": {
+      "CellType": {
+        "$type": "Forguncy.ImageCellType, ServerDesignerCommon",
+        "CommandList": [
+          {
+            "$type": "ElementUI.Commands.ShowMessageBox, ElementUI",
+            "Title": "提示",
+            "Message": "将为您清空当前汇报内容，由报工数据重新生成日报？",
+            "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.RequestServerCommand, ServerDesignerCommon",
+                    "ServerCommandName": "根据汇报模板生成内容",
+                    "Parameters": [
+                      {
+                        "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon",
+                        "ParamName": "汇报人",
+                        "Value": {
+                          "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                          "SerializeProperty": "=日报详情!E5"
+                        }
+                      },
+                      {
+                        "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon",
+                        "ParamName": "生成日期",
+                        "Value": {
+                          "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                          "SerializeProperty": "=IF(日报详情!汇报日期=\"\",日报详情!今日日期,日报详情!汇报日期)-1"
+                        }
+                      }
+                    ],
+                    "ResultErrorCodeTo": {
+                      "SerializeProperty": "code"
+                    },
+                    "ResultMessageTo": {
+                      "SerializeProperty": "msg"
+                    },
+                    "ReturnPropertiesTo": [
+                      {
+                        "ResultPropertyName": "生成文本",
+                        "ResultTo": {
+                          "SerializeProperty": "生成内容"
+                        }
+                      },
+                      {
+                        "ResultPropertyName": "返回总工时",
+                        "ResultTo": {
+                          "SerializeProperty": "总工时"
+                        }
+                      }
+                    ],
+                    "RefreshAfterFinish": true,
+                    "CheckDataValidation": true
+                  },
+                  {
+                    "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
+                    "ConditionAndCommandPairList": [
+                      {
+                        "Condition": {
+                          "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+                          "param": {
+                            "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon",
+                            "cellLocations": [
+                              {
+                                "SerializeProperty": "=code"
+                              }
+                            ]
+                          },
+                          "value": "0"
+                        },
+                        "CommandList": [
+                          {
+                            "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon",
+                            "PropertyItemsList": [
+                              {
+                                "TargetCells": {
+                                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                                  "SerializeProperty": "=日报详情!E7"
+                                },
+                                "Value": {
+                                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                                  "SerializeProperty": "=日报详情!总工时"
+                                }
+                              },
+                              {
+                                "TargetCells": {
+                                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                                  "SerializeProperty": "=日报详情!E9"
+                                },
+                                "Value": {
+                                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                                  "SerializeProperty": "=日报详情!生成内容"
+                                }
+                              }
+                            ]
+                          }
+                        ],
+                        "ID": "ea365cfd-f31d-4d11-97d8-3096e3d0fe60"
+                      },
+                      {
+                        "CommandList": [
+                          {
+                            "$type": "ElementUI.Commands.ShowMessageBox, ElementUI",
+                            "Title": "提示",
+                            "Message": {
+                              "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                              "SerializeProperty": "=日报详情!msg"
+                            },
+                            "Type": "warning",
+                            "ConfirmButtonText": "确定",
+                            "CancelButtonText": "取消",
+                            "ShowClose": false,
+                            "AdvancedSettings": {}
+                          }
+                        ],
+                        "ID": "4dd07cc0-b4f7-4060-8e5b-c63b1de372da"
+                      }
+                    ]
+                  }
+                ],
+                "ID": "75e2a3b3-c5a0-4b34-9c03-0e2398e4a8a4"
+              }
+            ]
+          }
+        ],
+        "ToolTip": "由报工数据重新生成日报",
+        "Size": 16,
+        "ImagePath": "Application/059_refresh_3.svg",
+        "BuiltIn": true,
+        "UseCellForeColor": true
+      }
+    },
     "6,4": {
       "BindingInfo": {
         "TableName": "汇报记录表",
@@ -269,11 +426,139 @@
     "11,18": {
       "CellType": {
         "$type": "Forguncy.ButtonCellType, ServerDesignerCommon",
+        "CommandList": [
+          {
+            "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
+            "ConditionAndCommandPairList": [
+              {
+                "Condition": {
+                  "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess",
+                  "SubConditions": [
+                    {
+                      "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+                      "param": {
+                        "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon",
+                        "cellLocations": [
+                          {
+                            "SerializeProperty": "=日报详情!E7"
+                          }
+                        ]
+                      },
+                      "value": "%Null%",
+                      "compareType": 1
+                    },
+                    {
+                      "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+                      "param": {
+                        "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon",
+                        "cellLocations": [
+                          {
+                            "SerializeProperty": "=日报详情!E9"
+                          }
+                        ]
+                      },
+                      "value": "%Null%",
+                      "compareType": 1
+                    }
+                  ]
+                },
+                "CommandList": [
+                  {
+                    "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
+                    "ConditionAndCommandPairList": [
+                      {
+                        "Condition": {
+                          "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+                          "param": {
+                            "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon",
+                            "cellLocations": [
+                              {
+                                "SerializeProperty": "=日报详情!汇报ID"
+                              }
+                            ]
+                          },
+                          "value": "%Null%",
+                          "compareType": 1
+                        },
                         "CommandList": [
                           {
                             "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon",
                             "TableName": "汇报记录表",
                             "ShowConfirm": false
+                          }
+                        ],
+                        "ID": "53add8e2-2ec2-49db-b535-3c502aceeec2"
+                      },
+                      {
+                        "CommandList": [
+                          {
+                            "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon",
+                            "TableName": "汇报记录表",
+                            "UpdateType": "add",
+                            "ShowConfirm": false,
+                            "UpdateBindingValues": [
+                              {
+                                "BindingInfo": {
+                                  "TableName": "汇报记录表",
+                                  "ColumnName": "汇报类型",
+                                  "GUID": "40e0d5ce-b9b4-47c3-a760-6cbaabce5976"
+                                },
+                                "Value": "日报"
+                              },
+                              {
+                                "BindingInfo": {
+                                  "TableName": "汇报记录表",
+                                  "ColumnName": "开始日期",
+                                  "GUID": "73a749f3-6682-43b7-99c3-60166d43d67f"
+                                },
+                                "Value": {
+                                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                                  "SerializeProperty": "=日报详情!今日日期"
+                                }
+                              },
+                              {
+                                "BindingInfo": {
+                                  "TableName": "汇报记录表",
+                                  "ColumnName": "截止日期",
+                                  "GUID": "65a8cb20-cde9-449b-9c26-3e1424f92977"
+                                }
+                              },
+                              {
+                                "BindingInfo": {
+                                  "TableName": "汇报记录表",
+                                  "ColumnName": "汇报人",
+                                  "GUID": "4bc2c076-34d4-4158-8c32-5b26cee618c1"
+                                },
+                                "Value": "%CurrentUser%"
+                              },
+                              {
+                                "BindingInfo": {
+                                  "TableName": "汇报记录表",
+                                  "ColumnName": "内容",
+                                  "GUID": "0c6e8060-cb8a-4b55-8194-448dc44a36bd"
+                                },
+                                "Value": {
+                                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                                  "SerializeProperty": "=日报详情!E9"
+                                }
+                              },
+                              {
+                                "BindingInfo": {
+                                  "TableName": "汇报记录表",
+                                  "ColumnName": "总工时",
+                                  "GUID": "17f31dda-4c40-40aa-96f4-d507d05cacd9"
+                                },
+                                "Value": {
+                                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                                  "SerializeProperty": "=日报详情!E7"
+                                }
+                              }
+                            ]
+                          }
+                        ],
+                        "ID": "612dd5b5-b060-44e7-9998-3e501fb0613c"
+                      }
+                    ]
                   },
                   {
                     "$type": "ElementUI.Commands.ShowMessage, ElementUI",
@@ -288,6 +573,26 @@
                     "ReloadData": true
                   }
                 ],
+                "ID": "80a94a82-65c6-4de0-9410-e827b3f72d97"
+              },
+              {
+                "CommandList": [
+                  {
+                    "$type": "ElementUI.Commands.ShowMessageBox, ElementUI",
+                    "Title": "提示",
+                    "Message": "请完善汇报内容！",
+                    "Type": "warning",
+                    "ConfirmButtonText": "确定",
+                    "CancelButtonText": "取消",
+                    "ShowClose": false,
+                    "AdvancedSettings": {}
+                  }
+                ],
+                "ID": "6db29dc5-d9dd-4e08-b27f-c1bd70c0b77e"
+              }
+            ]
+          }
+        ],
         "Text": "保存",
         "TemplateKey": "_RS_Main1",
         "Icon": {
@@ -342,6 +647,15 @@
         "TableName": "汇报记录表",
         "ColumnName": "汇报日期文本",
         "GUID": "eeecdca0-8fbe-471d-8d6e-5e1e7f093377"
+      },
+      "CellType": {
+        "$type": "Forguncy.TextCellType, ServerDesignerCommon",
+        "SavedValidators": [
+          {
+            "$type": "Forguncy.CellTypes.Models.UniqueValidadator, ServerDesignerCommon"
+          }
+        ],
+        "TemplateKey": "_RS_NewLittleRoundCorner"
       }
     },
     "14,13": {
@@ -372,8 +686,15 @@
         "HorizontalAlignment": 3
       },
       {
+        "FontWeight": 2,
         "HorizontalAlignment": 4
       },
+      {
+        "HorizontalAlignment": 4
+      },
+      {
+        "FontWeight": 2
+      },
       {
         "FontSize": 12.0,
         "Foreground": 5
@@ -383,6 +704,9 @@
         "FontSize": 13.333333333333332,
         "Formatter": 6
       },
+      {
+        "Formatter": 6
+      },
       {
         "FontSize": -1.0
       }
@@ -434,7 +758,7 @@
       "4,1": 4,
       "4,2": 3,
       "4,3": 3,
-      "4,4": 4,
+      "4,4": 5,
       "4,22": 3,
       "5,1": 3,
       "5,2": 3,
@@ -487,21 +811,22 @@
       "7,20": 3,
       "7,21": 3,
       "7,22": 3,
+      "8,1": 6,
       "11,18": 1,
-      "12,1": 5,
+      "12,1": 7,
-      "14,1": 6,
+      "14,1": 8,
       "14,2": 1,
       "14,3": 1,
+      "14,4": 9,
       "14,7": 0,
-      "14,8": 1,
       "14,11": 1,
       "14,12": 0,
       "14,13": 1,
-      "14,16": 7,
+      "14,16": 10,
       "14,19": 1
     },
     "RowStyles": {
-      "2": 7
+      "2": 10
     },
     "SheetStyle": {
       "FontFamily": 0,
@@ -515,10 +840,12 @@
     "11,18,1,4",
     "2,1,1,21",
     "14,1,1,3",
-    "4,4,1,18",
     "6,4,1,16",
     "8,4,2,18",
-    "14,4,1,3"
+    "4,4,1,16",
+    "4,20,1,2",
+    "14,4,1,3",
+    "14,7,1,3"
   ],
   "PageInfo": {
     "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
@@ -560,6 +887,14 @@
     {
       "Name": "用户全名",
       "Formula": "日报详情!$Q$15"
+    },
+    {
+      "Name": "今日日期",
+      "Formula": "日报详情!$H$15"
+    },
+    {
+      "Name": "汇报日期",
+      "Formula": "日报详情!$E$15"
     }
   ]
-}//LMiMk4LElRqXmo6+IX5iE+dAX35En7PGUUSbVqcG4A6lorucM4IDJdxQeN40hAezS9PL6SKcLPxEuHSqxAmkTmLJelBPIadjbM/nRYXq2Xh0nLVlGtggQO6H2kEuSx+0IVfiiDlYlPMhq5+apuJBrYW66fNv9a3Y3iXbjW75jSsuDfdC8jQe1Is7hmhOgFQiuZsQ0xfljCDcItg+UDZ70lBXMO1Px9DenoIAgvU9aTLdAdZrc36mma1w3ROmZhyx9onGPRgYGF7LVQ3fYu+u6V0XzoayfJ9VTt4bJTl6aNdxATW3XkoMqqTpEqA6v0S5P3j+bM8OW8LsN6zPQUgNJS9aEw2UOP9aDug05f4HjAc37wA4QpnDmv8lqABrPiyJdf0HwQT/l8izXiK8/CCsb14ciPa1/1enFk7mqsALJ8K5lYfecU1eARrcjBJphZpfrnzgxSAg6HS7vMCvEiwNujLM9mY1qwq8wQDSHHNtAORm+gV2ONxlJpkEWOsBLJ0Zu81OdXj20YcHcnq/plVLoO1+VRj3wP1uRb6afpyMZSXR4ELu+kyYfeRrAo5dBel8for+YiPsYIVBcTjmFEHAY8g+0jl9vvR7cXcnM0hQs5DW0IrDCyu+lqnPVrvstFh5mSZdyESTBdLfDcDruiTgGStpK27YK8GRR2aOQSqZ7XyFbENykScYWoa8tEkRJadbukY6iTVsHRcqNy6Kkpf027P9HEepWq1QC+fDhcWoksD3dUdJDfMFnJabE5ADPdXzT+H4pPPYp5lAlQEGK5D8/T1pFDuK5i6BHUZyfGPMp8kPkkx9Cs+482rHDVAYYywbEeosv4aQauxjtTDwVP77fTfLkbjkj8nc5+R/xIuPyfVE46wW1rsrGyvpUgOd+7fMCvLJJJhHR16Ak1jv/NNULw==|920
+}//JSfVQkZqZ2nc60jnnG5ynXC49ctrZ1LpLlcQc3XoiKnUyFUOeqLxs3L7Q0z6AkvjpOFOC9VszcHqX1LoWNCq9jbJoICIzzdB/zDO95/M8kSg70L1gf+Chw64EgIIyyJyB2W6+4ZugwivRzsLDIB4GB+3zAk6BI8FPC43ejCTj8XlsQKgFwqAJZlzYBDnljrU7b7ujsuHnLgiJ1N+zvMpvkXEf+CyxdmhHt3xWlCXfOTIS0kBYwRUzVu9cveeQECzsvJpkS8N955Qu5l7jbNBHxA1yQFZMxDUbbyuQWG6qrPKqQoAgNWrpbkxrpOvnh/Z/uW15ztMY9J/wVcjVG8lUnyjs4jaxjR8Xp3tkTfmXmLBpvzo9T2tWaU6qFfdbO2QCZ61tZeVF9+UKx/evd9MJ4JhGn/o0vq1PF0C3/RJ7bd10bFZ1hptkZl7MZiyTOeJDv4UJQmZ2qq6Vf4iJv6J7Y1oL6lyczIwu2NIJC8NHvysqPZuZVm3bclWfIhklmzjRAxxSfy/7s7yVu5clUxTzOWA8vgQ6frg7ZiX0PK1Gg50AWEkczBJG/d3wHaqm5bAKnfLsn/w0HZnOy649Mawi0Vwy4cnAsxwMsQRlhv5W4a0cM6/gELMetDHSRzeCI8a6mrJVfyOX6xkYYxRO4OH66JQr2d/y8BFhukRskWtoz0AcLi96bwoPVFm51bv4Tye+yklgRQJw+7eBAtpRdeST3BgM9fcE8+TD31xjpWkrn3Y1AlSzGXaAw4Sm7OECYJTTt1n5dAj5HavsPdnRLpk0dow+kIRMlG5dQLdIU47nig4ZRBX+R/UbkpM/hS+vajGEqU5DtgYpWB2k2HQGJ5cVI3TpAkyJv3iY6TEHvUUwfmYfZpRHUJXYlmKzTvPFKw8Q3PsQZDc2dkQ9TNkoP8qRA==|920

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

@@ -3,7 +3,9 @@
   "ColumnCount": 23,
   "RowCount": 15,
   "Formulas": {
-    "2,1": "TEXT(E15,\"yyyy-mm-dd\")&\"工作日报\""
+    "2,1": "IF(汇报日期=\"\",今日日期,汇报日期)&\"工作日报\"",
+    "4,4": "IF(E5=\"\",用户名,E5)",
+    "14,7": "TEXT(TODAY(),\"yyyy-mm-dd\")"
   },
   "CustomNames": [
     {
@@ -21,6 +23,14 @@
     {
       "Name": "用户全名",
       "Formula": "日报详情!$Q$15"
+    },
+    {
+      "Name": "今日日期",
+      "Formula": "日报详情!$H$15"
+    },
+    {
+      "Name": "汇报日期",
+      "Formula": "日报详情!$E$15"
     }
   ]
 }

Pages/汇报/汇报模板/模板列表.json

@@ -11,6 +11,11 @@
           "DesignLengthInPixel": 32.0
         }
       },
+      "2": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 24.0
+        }
+      },
       "3": {
         "GridRowColumnDefinition": {
           "DesignLengthInPixel": 32.0
@@ -74,11 +79,6 @@
           "DesignLengthInPixel": 29.0,
           "IsHidden": true
         }
-      },
-      "2": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 24.0
-        }
       }
     },
     "InLogicalVisibleIndexes": [
@@ -280,6 +280,23 @@
           }
         },
         "Items": [
+          {
+            "Value": "关闭",
+            "Text": "关闭",
+            "IconPath": "Mobile/456_delete_8.svg",
+            "SelectedIconColor": "Background 1",
+            "SelectedIconColorUseItemColor": true,
+            "IconColorUseItemColor": true,
+            "IsOldMenuPath": false,
+            "CommandList": [
+              {
+                "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon"
+              }
+            ],
+            "CanVisitRoleList": [
+              "FGC_LoginUser"
+            ]
+          },
           {
             "Value": "菜单1",
             "Text": "新增模板",
@@ -324,7 +341,7 @@
                               }
                             }
                           ],
-                          "ID": "a1283aab-bab5-4ada-bd09-c5a54aad9204"
+                          "ID": "74f104c5-4a3d-4980-b4d0-a90a334696c7"
                         }
                       ]
                     }
@@ -411,7 +428,7 @@
                             }
                           }
                         ],
-                        "ID": "b42359de-bee8-4a25-8404-499b9c1e99fd"
+                        "ID": "8ff5754c-d445-4462-b09b-8c08e7d9c9ba"
                       }
                     ]
                   }
@@ -636,7 +653,7 @@
                                 }
                               }
                             ],
-                            "ID": "92747c77-5d28-4b3f-b2d0-8170b1315d6b"
+                            "ID": "bbfe7540-0b31-41e4-a1d6-6e3ecdc98781"
                           }
                         ]
                       }
@@ -915,4 +932,4 @@
       "Formula": "模板列表!$B$4"
     }
   ]
-}//qJJl2ZEu7uculsiBSDqesfzvL+zU4HnMYa5GneLi2+oJJErlRslvix/rcKhYw77ojhNoS+uc84hqRWvML+s64AujnobRvV6g8cu3op47y2FmJcwVtEERkeWuAjmQTURHjeNFImzh2PBxEvmF8jV0YASRQCUExlvlTamYRODhRRUFcxGBa0p9Peetq4RJYPgJjWHEl8tmPISkxHcsf2vVqY8AEyUZLlRXsgxJ/DdwoBiu+HgP+wBTg6srP5Efj8jCBZJhX2HuJdF8EwgS0wc8t+gVcJm7AoiZDK2OPAQFJfsddj8LLciz8f+oAv3A65lnrm1FB/POsZf7eAwvVFVeZdT/o8K34hPnERhoWAmEKhBjom5u49FtpcNl28PxM6bGXWk6Oc6IZW5r9oghgUFyQnwF1vEh1GiUj3KKU+LiaLY424iDTpVvicxgmwgB+6wyZjlEcR4l6rXbQuqcYYBCvfL5j29meeCoiTwCf9nYURIYt79+kujaXpJAUuBWz/6uynp6gpkSmOQh0K8Wrno+4FYuid0x4SwKNd9zZDO6T7efZzkzYVG/l89Xd2BTqdom94tHI9Cgh8CW1wLjv/rwo2LCyeQPefOXbu1lmg2UhIccLiGzTPZz4D1gnieF7s361NxDu3fFg8x8ZfUNMe7GrAU89JULFKFWgS1VmpCLKf9gXao7MC21l1slySAk6twbRxOkrvjlmrlq7leENpSl3yxAtT/baffrh9en5zRPXeSOwhPKROV7Rt+xXJZ0m61c64ApU1trAXc3fxW2bX2eDPtdbD8h7aquZ/B9z+3KAqlW37uj8f3I7kOoat0+NHe6CRMXTL8IcvKVli299V4GPTrfZQbBs4PE6Crp65C5JGXuoLuvlJTy8Q6h6FlC/uDnofGzzAM6pFIPR59Wi5kcfA==|920
+}//ee+d2ZQbAsZcgA9eD3MuWDl1LpN5a7CInQOnNOu50nSTkvB/dCYjXKjFZ2tCJb44PIbNlbONe1AlCZM20W0SbGqFntqD5yIPEYhtfuyuiJLbxCKIk46JiGVFJwzwoEf12izTAQAEEUkwrfmE7os+Zfz8E0wDh+HywUcMz06EbMbwq4Iol0yrzbXBsdy/55lwmakD4RGQWU2D8g4sbdHmHuqtCELTHjpyJdIWIzMI90rU16dTWRiL/QSCMDgMTVUMZxyal1cXzPm433o5B3rT6+hZ7tp4yzT1k4TqG1jpTguwMZy9Z01JL9rltiuO0n7nO635PrZrmkVeliKQXMsjCVTtviMJEO5heKLflXZcTFYt+eGfBNO0BfOsg0S2lPieKgroPDpWFFvoFIarNh6Dj6WRvkV7Rw5mrGXGB+dKx3aKmB95ZihvqGdeHLCY4IECUgJD2aH+XJvKpfsLd9T9l9p9HqxxZm0eRnWs6iu4xTsvKtzSYLGXkths3e4vk9pVIraJd1bbwX01s72ZAU4czzlVzFkng+/v5WxCJSjND2AC4O4e0Jq5+y1IO3+xKfJZ78w+YRZwfYI3Sh5FO7yKwg/QHMeCXYOPBld9JZMvL6Vsfp8MBhkIAAJ24ViwcZxdQ07KR8vsvSPQUbj92+ZyrUeKkw58nNkdByy1NknreffTN8emJdEXvsC7f1/uqkE4kFpYe8iJYuwesXMTM8O+lkL2/U/46/RrFwXM7LTKTPvc0dA9PF1IAiNyG4p2Hp2Ix/GwUqSdCeLBV21PZyz8fYL2wE9As6eTOSFQXfQxIKkbTdJ2BaxBMpyuIwHtk1z+P3BgpiZdfGkR06C8BdyH8xCbk5KeTUaMIr+SuxTIoGe+Jpw2t+iXC4BUCl/yRt+Z3e/AmyLTstxWynGjg371hQ==|920

Pages/汇报/汇报模板/模板详情.json

@@ -6,28 +6,28 @@
           "DesignLengthInPixel": 32.0
         }
       },
-      "4": {
+      "5": {
         "GridRowColumnDefinition": {
           "DesignLengthInPixel": 358.0
         }
       },
-      "5": {
+      "6": {
         "GridRowColumnDefinition": {
           "DesignLengthInPixel": 67.0,
           "Mode": 1
         }
       },
-      "6": {
+      "7": {
         "GridRowColumnDefinition": {
           "DesignLengthInPixel": 16.0
         }
       },
-      "8": {
+      "9": {
         "GridRowColumnDefinition": {
           "DesignLengthInPixel": 16.0
         }
       },
-      "11": {
+      "12": {
         "GridRowColumnDefinition": {
           "DesignLengthInPixel": 32.0,
           "IsHidden": true
@@ -35,9 +35,9 @@
       }
     },
     "InLogicalVisibleIndexes": [
-      11
+      12
     ],
-    "Count": 12,
+    "Count": 13,
     "DefaultSize": 32.0
   },
   "Cols": {
@@ -148,16 +148,16 @@
   },
   "Values": {
     "1,1": "模板名称：",
-    "3,1": "模板内容：",
+    "4,1": "模板内容：",
-    "7,1": "是否禁用",
+    "8,1": "是否禁用",
-    "9,16": "取消",
+    "10,16": "取消",
-    "9,21": "保存"
+    "10,21": "保存"
   },
   "Formulas": {
-    "7,1": "IF(C8=1,\"禁用\",\"启用\")"
+    "8,1": "IF(C9=1,\"禁用\",\"启用\")"
   },
   "AttachInfos": {
-    "1,4": {
+    "2,1": {
       "BindingInfo": {
         "TableName": "汇报模板",
         "ColumnName": "模板名称",
@@ -193,7 +193,7 @@
         "IgnoreBlank": false
       }
     },
-    "4,1": {
+    "5,1": {
       "BindingInfo": {
         "TableName": "汇报模板",
         "ColumnName": "模板内容",
@@ -226,12 +226,12 @@
         "resize": "none"
       }
     },
-    "7,1": {
+    "8,1": {
       "RulesGuidList": [
         "2444e692-9a55-4c10-9996-1db345c2cddf"
       ]
     },
-    "7,2": {
+    "8,2": {
       "BindingInfo": {
         "TableName": "汇报模板",
         "ColumnName": "是否禁用",
@@ -242,7 +242,7 @@
         "Style": 2
       }
     },
-    "9,16": {
+    "10,16": {
       "CellType": {
         "$type": "Forguncy.ButtonCellType, ServerDesignerCommon",
         "CommandList": [
@@ -261,7 +261,7 @@
         "IconSize": 14.0
       }
     },
-    "9,21": {
+    "10,21": {
       "CellType": {
         "$type": "Forguncy.ButtonCellType, ServerDesignerCommon",
         "CommandList": [
@@ -278,7 +278,7 @@
                         "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon",
                         "cellLocations": [
                           {
-                            "SerializeProperty": "=模板详情!E2"
+                            "SerializeProperty": "=模板详情!B3"
                           }
                         ]
                       },
@@ -291,7 +291,7 @@
                         "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon",
                         "cellLocations": [
                           {
-                            "SerializeProperty": "=模板详情!B5"
+                            "SerializeProperty": "=模板详情!B6"
                           }
                         ]
                       },
@@ -311,7 +311,7 @@
                             "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon",
                             "cellLocations": [
                               {
-                                "SerializeProperty": "=模板详情!B12"
+                                "SerializeProperty": "=模板详情!B13"
                               }
                             ]
                           },
@@ -325,7 +325,7 @@
                             "ShowConfirm": false
                           }
                         ],
-                        "ID": "d2911751-6bd1-4978-9a54-0527854b1e53"
+                        "ID": "ac7ab395-d1f6-4f86-9af3-066c4ac008a6"
                       },
                       {
                         "CommandList": [
@@ -335,7 +335,7 @@
                             "ShowConfirm": false
                           }
                         ],
-                        "ID": "a19e211e-b223-47e4-bf1d-8b9c0935cd73"
+                        "ID": "de2b4c2a-8ac6-4258-a37d-e9c897ab2d0d"
                       }
                     ]
                   },
@@ -344,7 +344,7 @@
                     "ReloadData": true
                   }
                 ],
-                "ID": "7d2cdf6d-aa46-4eda-8163-b7d2c28ceb50"
+                "ID": "286fe8bd-8427-4976-9e9c-df4665eb7502"
               },
               {
                 "CommandList": [
@@ -359,7 +359,7 @@
                     "AdvancedSettings": {}
                   }
                 ],
-                "ID": "7b0d1ef3-4d9b-4820-92fd-20dda826f75c"
+                "ID": "786b0c0c-00ab-433c-bf76-3712c5856775"
               }
             ]
           }
@@ -375,7 +375,7 @@
         "IconSize": 14.0
       }
     },
-    "11,1": {
+    "12,1": {
       "BindingInfo": {
         "TableName": "汇报模板",
         "ColumnName": "ID",
@@ -389,12 +389,12 @@
         "FontSize": 13.333333333333332
       },
       {
-        "FontSize": 13.333333333333332,
+        "FontFamily": 0
-        "Foreground": 0,
-        "HorizontalAlignment": 1
       },
       {
-        "FontFamily": 2
+        "FontSize": 13.333333333333332,
+        "Foreground": 1,
+        "HorizontalAlignment": 2
       },
       {
         "FontSize": 13.333333333333332,
@@ -403,33 +403,34 @@
     ],
     "Types": {
       "Strs": [
+        "Body",
         "Accent 2 0",
         "Left",
-        "Body",
         "Text 1 50"
       ]
     },
     "CellStyles": {
       "1,1": 0,
-      "3,1": 0,
+      "2,1": 1,
-      "7,1": 1,
+      "4,1": 0,
-      "7,2": 2,
+      "8,1": 2,
-      "7,3": 2,
+      "8,2": 1,
-      "7,4": 2,
+      "8,3": 1,
-      "9,16": 3,
+      "8,4": 1,
-      "9,21": 0
+      "10,16": 3,
+      "10,21": 0
     },
     "SheetStyle": {
-      "FontFamily": 2
+      "FontFamily": 0
     }
   },
   "Spans": [
-    "9,21,1,4",
+    "10,21,1,4",
-    "4,1,2,24",
+    "5,1,2,24",
-    "9,16,1,4",
+    "10,16,1,4",
-    "11,1,1,4",
+    "12,1,1,4",
-    "1,4,1,21",
+    "8,2,1,3",
-    "7,2,1,3"
+    "2,1,1,24"
   ],
   "PageInfo": {
     "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
@@ -455,7 +456,7 @@
           "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon",
           "Formula": {
             "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-            "SerializeProperty": "=模板详情!$C$8"
+            "SerializeProperty": "=模板详情!$C$9"
           },
           "GUID": "2444e692-9a55-4c10-9996-1db345c2cddf",
           "StyleInfo": {
@@ -471,4 +472,4 @@
     "PaperSize": {},
     "Margin": {}
   }
-}//iVyuI5ZkHr8Yau37XJb2I5ZbOiK6lEH+yxjXRa4F+qsmeM0JYD+MV1eip0Eop2jLvhxLL6KY90WVuXAgrWUakAFy9ZU5myhAWtN/cJTzlcUe4v/EZLaUItBuXVCzWGoksjkcmPbE7Raxl6E1w492KIl7kjvyz5kbczv2W7tn7KKacT+P70t7gb8+cEIcE7yq7Em3S8T7ADzOImX3zh0euepwCRqe78X40ibJl9eTvhdu/QfJJJ00nMaD0lvvRxo/H6BPlR2nQhmlMdXjdpQhBxbz94BU+zBhf2REMyVVnOVKQ9TwgPGMKsOklEium5DTJXSAYiNXXZMtw3jHxAXXDvTm1p51y2X1zdpLcoZM741JWX24jecIOzlvoz+b/vzNKTFxJj9+7xbzblFSiM26TT8PcLFI5pP1QuZSQie+mMmD/ACTpksezikEJHjwpSokqlVPIwcawNrzeoh6SmK5qdk5psiahLU02ogmeyyzl/ldTPqzxPFmu0lzwq/x6q7bhoMh1vyxw08D7Yn2JqidsgEBZpJWChijSBwbKYQxXcMgISufkhY2VwUQPl6c6Z3jyyuVlJazJSmPoVsw/yq/lnmo3rfTrRVtSi3xYKf65plND7S7VAKXIwhARvFyDu2vRx3TGLJNSZ3vaPm8tjZyRccw2FZyYYQ6RE+E4UoHcCrzJ+V+wBlI8Mw2AOT4Zjg+EZN0m6BdC/QVxzqu74OgF07/2DjV2Rl9sBehXkdwzZp8eWFPlhZ0mZj97FmDHQCY4bJ3eTm+tYCJX1r6kX1bAGUyL28QgKQbEBuMOBpBmJ/l/luQiMx2kpVCFw7s8q2UAFXHNZAxvcEsndbe71pVpGwotqoNjPHC7QzQZEA3aQEA/4pHIP+sbZdd0Lb4vlOYzKDquafgcKos1c7vocKuDA==|920
+}//qQa2BbJaV/NFrYnknqbFe7OjqMLxApAi3nrDrb/kEVS7lW0SXrSzsLrYIx1aNA8V9NBNX6A1dNqpIKeOPDTrk1s6wWJkZcGQoBVAV/OARF4WKm0YgIwtJzE/hlulhJSYAnnv9eLmDoZ/HjVAjrrFWw0ikqmAsOg7A84gxHeQdkkecG1CXggxTm/5gys03a57YDxkyxB+E3WiiHWI/pXzW1zUSnXX3hCc73ADK1YQlEMkTWKLTATBy+CBEC/cyL5XMLjI+MjqezW5YteaSgEOF6Ry7UBDR7kLZm4C3PR+CSzUU1EmXkac3dzEvif8idjIPgvRDWZHA1NQdel7XZZ7++6YLpt7ypLV+9blPWB266Oi8xE+pUGyjPiM2MYBrzaQ5A8xL2NqAYd3g8osw/DjWRk2fZw+aTqhdiHZ93+nErgwCcp9QD7Oi2gTa/q+43duIE32QCBr4l1ViMJkt1+Y1BCfO+9oEXnO/uvfvvTN4iyjtly23EVByYC0fwgR74vaz9wNlQyNLbTc5/XHxnCPpwHfKLxgCC/PUA4aa5F3jml7hY5OE5LSIS9IMLQjaWJpJOgfcV9h0txauNh5ZXHJeiXCsvnotel2wqW53Qw5sit7RI6kuqHu6x5AGkwk9xZIA5wZ8++Av64r9IeMtofWds+UaG5dXVIkRGzFupKFoYW33p9FrzSxKFNTE0QRis7BHi1yJz5/aB2bBvX5yXMNfOQC+/WRC31iIFhNNPJwz6gu0HG0bHYhU96UF/kaY1NjpwQfwQTj17PD2JbXqiaw49q8Vi0a23D0eDKRYsGiYGuVNijJRAMXrUYPYbvjWE4jChzBC5PeBVr7filI9LEDg+H1KbCVtBom/fqIDnzhOioKUPVHz9z71eEBmvVn/EVlB3/PXu31mDNOdkFpQtCYaA==|920

Pages/汇报/汇报模板/模板详情.rd

@@ -1,8 +1,8 @@
 {
   "PageType": 0,
   "ColumnCount": 26,
-  "RowCount": 12,
+  "RowCount": 13,
   "Formulas": {
-    "7,1": "IF(C8=1,\"禁用\",\"启用\")"
+    "8,1": "IF(C9=1,\"禁用\",\"启用\")"
   }
 }

Pages/汇报/汇报管理.json

@@ -352,6 +352,11 @@
             "IconColorUseItemColor": true,
             "IsOldMenuPath": false,
             "CommandList": [
+              {
+                "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon",
+                "PageName": "日报详情",
+                "LoadBindingDataOption": 2
+              },
               {
                 "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon",
                 "ClosePopupCallbackCommand": {
@@ -387,7 +392,7 @@
                               }
                             }
                           ],
-                          "ID": "9f8a054a-6ef2-480e-8a3e-9915820525ba"
+                          "ID": "0fc4e3b5-af54-47fd-8d6b-d25ad4ab3a9a"
                         }
                       ]
                     }
@@ -397,7 +402,8 @@
                   }
                 },
                 "PageName": "汇报详情",
-                "LoadBindingDataOption": 2
+                "LoadBindingDataOption": 2,
+                "Disabled": true
               }
             ],
             "CanVisitRoleList": [
@@ -448,7 +454,7 @@
                               }
                             }
                           ],
-                          "ID": "2359200c-f0a1-4c82-80a0-feb014e34529"
+                          "ID": "e39b9d54-4013-4d8c-9773-0791717c0082"
                         }
                       ]
                     }
@@ -478,7 +484,6 @@
               {
                 "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon",
                 "PopupDisplayMode": 4,
-                "ShowDrawerHeader": true,
                 "PageName": "模板列表"
               }
             ],
@@ -1123,4 +1128,4 @@
       "Formula": "汇报管理!$B$19"
     }
   ]
-}//L20qOsltrsSluS87Xjjq4isrQfQaRwZccka5VunLKvgfYvPYt88Ky2Fs9jizKT/gKBS2txHS1URfRZ4s68PQ3F15My2RSV6i4zPxSwffHQbi5V73h5UOhy5LO9YXIRRopFrwxqbLWKiQ1NHVMXr8/tdZKGoI7qoEcNAVPoD1MtuMLmULlTFqVUfmaxFUPgDfDUqrEB20zA06aVezms2b/dUhU1+7Ak4um4+G+ucGW2rYcGVI9vrLZvf2KCNRxK/1HgKY25qyC+GDJLOJvNLmK2D0+QcKWY7goAyLRtbuvM0Zd+rDNHF4sQhYu4KUF4Cy/Mzf4f547zwLAw74rEeZqTow1tcS9pxOqCeqHLC5mImwH7WrGzIETLaSE13PmGHuUr4vYwcDKW/swwixwK9NYiWXB9lCVLaTzJg7F6vUzfWpLRit+kWubQ8sdfhP99bAw5ChL4tZxQH5TtEpKyUbRiJakR2MPBAAyvprI7AQ4FD+D9uvRyn5kKn0PzjOL2f/XJ/i2iFrDygcSqBDNPDIn7EgaG3+EVhdsNhGnduYf0/NPatUx5oX4lD9i/XfQEXxyBvxGBmTWMaNk3h+1AjUUF7ZdJSvs6xYVAKbgLqJleKJ3iU6x08O+jFZiDIWYroIx7M+T35c50c37kVkawUfndiKw8/Tm0VMKmXAiT0HK8IQHVjbKxbngAtw1PztUs4dxCIKdLPGAe01NCzNqubSoZSQ7x0v8A4huoZBAvWzZOhZhmyi5wmzyAeVK9dgLIieSRZlBxT7gT83QeYh6QmzUzpKTOesB3f7gII0RwBqw1oKVQHHQntoJ+JhgT6EIgeRuMbKpw5CHWMfidJ1az67eBEZOKg02lxuB6x3bj3HKEHe3y5K7ZmBkR0z5zSi6qbbT9GEFUzs6ShI7YD3PBRPGA==|920
+}//+YM6SyX6BAkMdPllyjRlG8UKuVhzC/vzAfkcwXkxLbB/Oneg15DwFhl92bLQCB0UdB57KpT55q9lqMNICgz0z+0T2P/SjXGxPbC/7H4zIGCoYaLg/sB8T8Myxg35x4KL5VtxwwHKBG5S54TkDU4glr3thl/RRmNbyuhYqyOf31RgpW/r+ZYxTM1YkBfkcbS9GUcJhgiFwwlqrbLrxVbVmRDg388W0X8uNUqktKkMyFBDL7cOGpZnSdVQXr1ZR3/wQC39PmChsbv1DsOmMBGZdu3MN1UaP71dKKIOQXn+bb1T3tP4BQCIFmFcadcZ14ZuN5sYZCIx+bG+jybpYXipv+fUfb4D3RM0Lc0j919N1DiFleXhPEaOf/bapq9R85UrzApYXcJ3AX0cBNPG+QqsZccOKa6aowwDAhR+mzmtk+pADyoh0a3foR65in/HR1KQMaPXMjsz8q32O5+MS864kdzkJi+CyO/GVPrfFp8Ko5CnIqWqYHbMEXIj+2daL83uTvnDGdPHdCE02nrQ/fYb0XbkvgboWgjeBMes6I2cLEINrBPYPhbWZ7ApRPdNOnbbLucsmAo5bsA5GGMSSuqWiQ1hLxU9HBJtmgAstzQWqmvtrSvX2yewYF0P8ELQgsV8aDaBFrieMxBE6ZSRBvgc4z0QJiv3B/XsYVQPXigxE5NKXJeO/Y94X+eSoyCDzYpDA3LrDXVmiGaY1ilyf4J8paG5mdNVtW0/Z9BNklMKbiAHLjNgTjMgdMo1hc1uMPuk1sfp8v3kFqDKIr2G2gYVIriNE9Ve6emg56sMcBngL0W0rFIpNrzWsZu8no/eyTnEgfF4Sui3Oj2iQe9BIIkw2cOGpJSiq117YB/X1lpWOFsXfrlVsmVo2aCc3TQk1cYeD2BfdtyfhQKXY3zg1O0+dA==|920